Merge "Move AccessPointPreference.generateApKey."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bf241d3..d637ac7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -36,6 +36,7 @@
<uses-permission android:name="com.android.certinstaller.INSTALL_AS_USER" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.TETHER_PRIVILEGED" />
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -90,6 +91,7 @@
<uses-permission android:name="android.permission.READ_PRINT_SERVICES" />
<uses-permission android:name="android.permission.NETWORK_SETTINGS" />
<uses-permission android:name="android.permission.TEST_BLACKLISTED_PASSWORD" />
+ <uses-permission android:name="android.permission.USE_RESERVED_DISK" />
<application android:label="@string/settings_label"
android:icon="@drawable/ic_launcher_settings"
@@ -144,7 +146,7 @@
android:parentActivityName="Settings">
</activity>
- <activity android:name="CreateShortcut"
+ <activity android:name=".shortcut.CreateShortcut"
android:label="@string/settings_shortcut">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT"/>
@@ -156,7 +158,7 @@
<activity android:name=".Settings$NetworkDashboardActivity"
android:taskAffinity="com.android.settings"
android:label="@string/network_dashboard_title"
- android:icon="@drawable/ic_settings_wireless"
+ android:icon="@drawable/ic_homepage_network"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -182,7 +184,7 @@
<activity android:name=".Settings$ConnectedDeviceDashboardActivity"
android:taskAffinity="com.android.settings"
android:label="@string/connected_devices_dashboard_title"
- android:icon="@drawable/ic_devices_other"
+ android:icon="@drawable/ic_homepage_connected_device"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.NFC_SETTINGS" />
@@ -208,7 +210,7 @@
android:enabled="false"
android:taskAffinity="com.android.settings"
android:label="@string/connected_devices_dashboard_title"
- android:icon="@drawable/ic_devices_other"
+ android:icon="@drawable/ic_homepage_connected_device"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.NFC_SETTINGS" />
@@ -241,13 +243,6 @@
</intent-filter>
</activity>
- <activity android:name=".search.SearchActivity"
- android:label="@string/search_settings"
- android:icon="@drawable/ic_search_24dp"
- android:parentActivityName="Settings"
- android:theme="@style/Theme.Settings.NoActionBar">
- </activity>
-
<activity android:name=".search.SearchResultTrampoline"
android:theme="@android:style/Theme.NoDisplay"
android:excludeFromRecents="true"
@@ -482,7 +477,7 @@
</intent-filter>
</activity>
- <service android:name=".TetherService"
+ <service android:name=".wifi.tether.TetherService"
android:exported="true"
android:permission="android.permission.TETHER_PRIVILEGED" />
@@ -908,7 +903,7 @@
<activity android:name="Settings$DisplaySettingsActivity"
android:label="@string/display_settings"
- android:icon="@drawable/ic_settings_display"
+ android:icon="@drawable/ic_homepage_display"
android:taskAffinity="">
<intent-filter android:priority="1">
<action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -1005,11 +1000,39 @@
<meta-data android:name="com.android.settings.title"
android:resource="@string/about_settings" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.DeviceInfoSettings" />
+ android:value="com.android.settings.deviceinfo.DeviceInfoSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
+
+ <activity android:name=".Settings$MyDeviceInfoActivity"
+ android:label="@string/device_info_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" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.VOICE_LAUNCH" />
+ </intent-filter>
+ <intent-filter android:priority="270">
+ <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.title"
+ android:resource="@string/about_settings" />
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment" />
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
+ </activity>
+
<activity android:name="SettingsLicenseActivity"
android:label="@string/settings_license_activity_title"
android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
@@ -1063,9 +1086,6 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="3">
- <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.ProcessStatsSummary" />
</activity>
@@ -1205,7 +1225,6 @@
</activity>
<activity android:name="Settings$NotificationStationActivity"
- android:theme="@style/Theme.NotificationStation"
android:label="@string/notification_log_title"
android:taskAffinity="">
<intent-filter>
@@ -1262,7 +1281,7 @@
<activity android:name="Settings$SecuritySettingsActivity"
android:label="@string/security_settings_title"
- android:icon="@drawable/ic_settings_security"
+ android:icon="@drawable/ic_homepage_security"
android:configChanges="orientation|keyboardHidden|screenSize"
android:taskAffinity=""
android:parentActivityName="Settings">
@@ -1290,7 +1309,7 @@
<!-- TODO(32953042) Merge with Settings$SecuritySettingsActivity -->
<activity android:name="Settings$SecuritySettingsActivityV2"
android:label="@string/security_settings_title"
- android:icon="@drawable/ic_settings_security"
+ android:icon="@drawable/ic_homepage_security"
android:enabled="false"
android:configChanges="orientation|keyboardHidden|screenSize"
android:taskAffinity=""
@@ -1453,7 +1472,7 @@
<activity android:name="Settings$AccessibilitySettingsActivity"
android:label="@string/accessibility_settings"
- android:icon="@drawable/ic_settings_accessibility"
+ android:icon="@drawable/ic_homepage_accessibility"
android:configChanges="orientation|keyboardHidden|screenSize"
android:taskAffinity="">
<intent-filter android:priority="1">
@@ -1781,48 +1800,9 @@
<activity android:name=".EncryptionInterstitial"
android:theme="@style/GlifTheme.Light" />
- <activity android:name=".Settings$StatusActivity"
- android:label="@string/device_status_activity_title"
- android:taskAffinity="com.android.settings"
- android:parentActivityName="Settings$DeviceInfoSettingsActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE_LAUNCH" />
- </intent-filter>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.deviceinfo.Status" />
- </activity>
-
- <!-- Runs in the phone process since it needs access to the Phone object -->
- <activity android:name=".Settings$SimStatusActivity"
- android:label="@string/sim_status_title"
- android:process="com.android.phone">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE_LAUNCH" />
- </intent-filter>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.deviceinfo.SimStatus" />
- </activity>
-
- <!-- Runs in the phone process since it needs access to the Phone object -->
- <activity android:name=".Settings$ImeiInformationActivity"
- android:label="@string/imei_information_title"
- android:process="com.android.phone">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE_LAUNCH" />
- </intent-filter>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.deviceinfo.ImeiInformation" />
- </activity>
-
<activity android:name=".Settings$StorageDashboardActivity"
android:label="@string/storage_settings"
- android:icon="@drawable/ic_settings_storage"
+ android:icon="@drawable/ic_homepage_storage"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
@@ -1960,7 +1940,7 @@
<action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="50">
+ <intent-filter android:priority="40">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
@@ -2244,14 +2224,17 @@
<activity android:name="Settings$PowerUsageSummaryActivity"
android:label="@string/power_usage_summary_title"
- android:icon="@drawable/ic_settings_battery"
+ android:icon="@drawable/ic_homepage_battery"
android:enabled="false">
- <!-- TODO(b/69867246): add priority for this intent-filter -->
- <intent-filter>
+ <intent-filter android:priority="1">
<action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <!-- TODO(b/69867246): add shortcut intent-filter -->
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.android.settings.SHORTCUT" />
+ </intent-filter>
<intent-filter android:priority="8">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
@@ -2272,16 +2255,11 @@
<activity android:name=".Settings$PowerUsageSummaryLegacyActivity"
android:label="@string/power_usage_summary_title"
- android:icon="@drawable/ic_settings_battery">
- <intent-filter android:priority="1">
+ android:icon="@drawable/ic_homepage_battery">
+ <intent-filter>
<action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="com.android.settings.SHORTCUT" />
- </intent-filter>
<intent-filter android:priority="8">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
@@ -2351,7 +2329,7 @@
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/header_add_an_account"
android:taskAffinity="com.android.settings"
- android:parentActivityName="Settings$UserAndAccountDashboardActivity">
+ android:parentActivityName=".Settings$AccountDashboardActivity">
<intent-filter android:priority="1">
<action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -2506,11 +2484,11 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="8">
+ <intent-filter android:priority="45">
<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.accounts" />
+ android:value="com.android.settings.category.ia.system" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.users.UserSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2662,7 +2640,7 @@
<!-- Keep compatibility with old shortcuts. -->
<activity android:name="Settings$SoundSettingsActivity"
android:label="@string/sound_settings"
- android:icon="@drawable/ic_settings_sound"
+ android:icon="@drawable/ic_homepage_sound"
android:taskAffinity=""
android:exported="true">
<intent-filter android:priority="1">
@@ -2708,8 +2686,6 @@
<intent-filter android:priority="150">
<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.notifications" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.NotificationApps" />
</activity>
@@ -2732,10 +2708,6 @@
<!-- Show channel group-level notification settings (group passed in as extras) -->
<activity android:name="Settings$ChannelGroupNotificationSettingsActivity"
android:exported="true">
- <intent-filter android:priority="1">
- <action android:name="android.settings.CHANNEL_GROUP_NOTIFICATION_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
@@ -3084,9 +3056,6 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
- <intent-filter android:priority="60">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
<meta-data android:name="com.android.settings.summary"
android:resource="@string/summary_empty"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -3109,7 +3078,7 @@
<!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->
<activity android:name=".Settings$AppAndNotificationDashboardActivity"
android:label="@string/app_and_notification_dashboard_title"
- android:icon="@drawable/ic_apps">
+ android:icon="@drawable/ic_homepage_apps">
<intent-filter android:priority="9">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
@@ -3121,9 +3090,9 @@
android:resource="@string/app_and_notification_dashboard_summary"/>
</activity>
- <activity android:name=".Settings$UserAndAccountDashboardActivity"
+ <activity android:name=".Settings$AccountDashboardActivity"
android:label="@string/account_dashboard_title"
- android:icon="@drawable/ic_settings_accounts">
+ android:icon="@drawable/ic_homepage_accounts">
<intent-filter android:priority="3">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
@@ -3132,16 +3101,14 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.accounts.UserAndAccountDashboardFragment"/>
+ 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>
<activity android:name=".Settings$SystemDashboardActivity"
android:label="@string/header_category_system"
- android:icon="@drawable/ic_settings_about">
+ android:icon="@drawable/ic_homepage_system_dashboard">
<intent-filter android:priority="-1">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
@@ -3155,7 +3122,7 @@
<activity android:name=".support.SupportDashboardActivity"
android:label="@string/page_tab_title_support"
- android:icon="@drawable/ic_help"
+ 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">
@@ -3219,6 +3186,26 @@
<action android:name="android.service.quicksettings.action.QS_TILE" />
</intent-filter>
</service>
+ <service
+ android:name=".development.qstile.DevelopmentTiles$WindowTrace"
+ android:label="@string/window_trace_quick_settings_title"
+ android:icon="@drawable/tile_icon_window_trace"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+ android:enabled="false">
+ <intent-filter>
+ <action android:name="android.service.quicksettings.action.QS_TILE" />
+ </intent-filter>
+ </service>
+ <service
+ android:name=".development.qstile.DevelopmentTiles$LayerTrace"
+ android:label="@string/layer_trace_quick_settings_title"
+ android:icon="@drawable/tile_icon_layer_trace"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+ android:enabled="false">
+ <intent-filter>
+ <action android:name="android.service.quicksettings.action.QS_TILE" />
+ </intent-filter>
+ </service>
<activity android:name=".HelpTrampoline"
android:exported="true"
@@ -3226,99 +3213,6 @@
android:permission="android.permission.DUMP"
android:enabled="@bool/config_has_help" />
-
- <!-- Activities for moves/gestures suggestions -->
- <activity
- android:name=".Settings$DoubleTapPowerSuggestionActivity"
- android:label="@string/double_tap_power_for_camera_title"
- android:icon="@drawable/ic_settings_gestures">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="com.android.settings.suggested.category.GESTURE" />
- </intent-filter>
- <meta-data android:name="com.android.settings.dismiss"
- android:value="4,8,30" />
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.gestures.DoubleTapPowerSettings"/>
- <meta-data android:name="com.android.settings.title"
- android:resource="@string/double_tap_power_for_camera_suggestion_title" />
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/double_tap_power_for_camera_suggestion_summary" />
- </activity>
-
- <activity
- android:name=".Settings$DoubleTwistSuggestionActivity"
- android:label="@string/double_twist_for_camera_mode_title"
- android:icon="@drawable/ic_settings_gestures">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="com.android.settings.suggested.category.GESTURE" />
- </intent-filter>
- <meta-data android:name="com.android.settings.dismiss"
- android:value="4,8,30" />
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.gestures.DoubleTwistGestureSettings"/>
- <meta-data android:name="com.android.settings.title"
- android:resource="@string/double_twist_for_camera_suggestion_title" />
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/double_twist_for_camera_suggestion_summary" />
- </activity>
-
- <activity
- android:name=".Settings$AmbientDisplaySuggestionActivity"
- android:label="@string/ambient_display_title"
- android:icon="@drawable/ic_settings_gestures">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="com.android.settings.suggested.category.GESTURE" />
- </intent-filter>
- <meta-data android:name="com.android.settings.dismiss"
- android:value="9,13,30" />
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.gestures.DoubleTapScreenSettings"/>
- <meta-data android:name="com.android.settings.title"
- android:resource="@string/ambient_display_title" />
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/ambient_display_suggestion_summary" />
- </activity>
-
- <activity
- android:name=".Settings$AmbientDisplayPickupSuggestionActivity"
- android:label="@string/ambient_display_pickup_title"
- android:icon="@drawable/ic_settings_gestures">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="com.android.settings.suggested.category.GESTURE" />
- </intent-filter>
- <meta-data android:name="com.android.settings.dismiss"
- android:value="9,13,30" />
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.gestures.PickupGestureSettings"/>
- <meta-data android:name="com.android.settings.title"
- android:resource="@string/ambient_display_pickup_title" />
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/ambient_display_pickup_suggestion_summary" />
- </activity>
-
- <activity
- android:name=".Settings$SwipeToNotificationSuggestionActivity"
- android:label="@string/fingerprint_swipe_for_notifications_title"
- android:icon="@drawable/ic_settings_gestures">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="com.android.settings.suggested.category.GESTURE" />
- </intent-filter>
- <meta-data android:name="com.android.settings.dismiss"
- android:value="9,13,30" />
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.gestures.SwipeToNotificationSettings"/>
- <meta-data android:name="com.android.settings.title"
- android:resource="@string/fingerprint_swipe_for_notifications_suggestion_title" />
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/fingerprint_swipe_for_notifications_suggestion_summary" />
- </activity>
- <!-- End activities for moves/gestures suggestions -->
-
<activity android:name=".applications.autofill.AutofillPickerActivity"
android:excludeFromRecents="true"
android:launchMode="singleInstance"
@@ -3337,6 +3231,36 @@
</intent-filter>
</activity>
+ <activity android:name="Settings$AdvancedConnectedDeviceActivity"
+ android:label="@string/connected_device_connections_title"
+ android:taskAffinity="com.android.settings"
+ android:parentActivityName="Settings$ConnectedDeviceDashboardActivity"
+ android:enabled="false">
+ <intent-filter android:priority="1">
+ <action android:name="com.android.settings.ADVANCED_CONNECTED_DEVICE_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment" />
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
+ </activity>
+
+ <activity android:name="Settings$DirectoryAccessSettingsActivity"
+ android:label="@string/directory_access"
+ android:taskAffinity="">
+ <intent-filter>
+ <action android:name="android.settings.STORAGE_VOLUME_ACCESS_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.applications.manageapplications.ManageApplications" />
+ </activity>
+
<provider android:name=".slices.SettingsSliceProvider"
android:authorities="com.android.settings.slices"
android:exported="true">
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 6fa2042..f3050c4 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -2,18 +2,6 @@
<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"
@@ -105,7 +93,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout-land/choose_lock_pattern.xml"
- line="160"
+ line="170"
column="17"/>
</issue>
@@ -757,11 +745,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="switch_bar_background">#ff80868B</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="84"
+ 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="message_text_incoming">#ffffffff</color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="85"
+ line="87"
column="5"/>
</issue>
@@ -777,7 +781,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="86"
+ line="88"
column="5"/>
</issue>
@@ -793,7 +797,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="87"
+ line="89"
column="5"/>
</issue>
@@ -809,7 +813,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="88"
+ line="90"
column="5"/>
</issue>
@@ -825,7 +829,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="89"
+ line="91"
column="5"/>
</issue>
@@ -841,7 +845,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="90"
+ line="92"
column="5"/>
</issue>
@@ -857,7 +861,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="91"
+ line="93"
column="5"/>
</issue>
@@ -873,7 +877,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="92"
+ line="94"
column="5"/>
</issue>
@@ -889,7 +893,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="93"
+ line="95"
column="5"/>
</issue>
@@ -905,7 +909,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="94"
+ line="96"
column="5"/>
</issue>
@@ -921,7 +925,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="95"
+ line="97"
column="5"/>
</issue>
@@ -937,7 +941,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="98"
+ line="100"
column="5"/>
</issue>
@@ -953,7 +957,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="100"
+ line="102"
column="5"/>
</issue>
@@ -969,7 +973,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="103"
+ line="105"
column="5"/>
</issue>
@@ -985,7 +989,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="105"
+ line="107"
column="5"/>
</issue>
@@ -1001,7 +1005,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="108"
+ line="110"
column="5"/>
</issue>
@@ -1017,7 +1021,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="111"
+ line="113"
column="5"/>
</issue>
@@ -1033,7 +1037,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="114"
+ line="116"
column="5"/>
</issue>
@@ -1049,7 +1053,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="117"
+ line="119"
column="5"/>
</issue>
@@ -1065,7 +1069,215 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="118"
+ line="120"
+ 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="homepage_network_background">#2196F3</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="123"
+ 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="homepage_connected_device_background">#71A234</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="124"
+ 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="homepage_app_and_notification_background">#FF7E0F</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="125"
+ 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="homepage_battery_background">#258982</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="126"
+ 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="homepage_display_background">#FFB600</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="127"
+ 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="homepage_sound_background">#01B1AF</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="homepage_storage_background">#C14CE6</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="129"
+ 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="homepage_security_background">#0F9D58</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="130"
+ 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="homepage_accounts_background">#F15B8D</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="131"
+ 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="homepage_accessibility_background">#5011C1</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="132"
+ 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="homepage_system_background">#757575</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="133"
+ 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="homepage_support_background">#26459C</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="134"
+ 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="homepage_generic_icon_background">#1A73E8</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="135"
column="5"/>
</issue>
@@ -1305,7 +1517,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/drawable/ic_color_inversion.xml"
- line="17"
+ line="32"
column="23"/>
</issue>
@@ -1321,7 +1533,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/drawable/ic_color_inversion.xml"
- line="18"
+ line="33"
column="23"/>
</issue>
@@ -1337,7 +1549,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/drawable/ic_color_inversion.xml"
- line="32"
+ line="47"
column="23"/>
</issue>
@@ -1353,7 +1565,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/drawable/ic_color_inversion.xml"
- line="33"
+ line="48"
column="23"/>
</issue>
@@ -1369,7 +1581,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/drawable/ic_daltonizer.xml"
- line="16"
+ line="31"
column="27"/>
</issue>
@@ -1385,7 +1597,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/drawable/ic_daltonizer.xml"
- line="17"
+ line="32"
column="27"/>
</issue>
@@ -1401,7 +1613,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/drawable/ic_daltonizer.xml"
- line="36"
+ line="51"
column="23"/>
</issue>
@@ -1417,7 +1629,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/drawable/ic_daltonizer.xml"
- line="37"
+ line="52"
column="23"/>
</issue>
@@ -1445,6 +1657,214 @@
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_accessibility_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_accessibility.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_accounts_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_accounts.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_app_and_notification_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_apps.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_battery_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_battery.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_connected_device_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_connected_device.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_display_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_display.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_generic_icon_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_generic_background.xml"
+ line="20"
+ 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:color="@color/homepage_network_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_network.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_security_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_security.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_sound_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_sound.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_storage_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_storage.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
+ file="res/drawable/ic_homepage_support.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_system_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_system_dashboard.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:tint="#db4437""
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
<location
@@ -2069,27 +2489,11 @@
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=" <string name="sync_plug" msgid="3905078969081888738">""<font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are."</string>"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~">
- <location
- file="res/values-en-rXC/strings.xml"
- line="2333"
- column="168"/>
- </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=" <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rAU/strings.xml"
- line="2334"
+ line="2354"
column="64"/>
</issue>
@@ -2105,7 +2509,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rCA/strings.xml"
- line="2334"
+ line="2354"
column="64"/>
</issue>
@@ -2121,7 +2525,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rGB/strings.xml"
- line="2334"
+ line="2354"
column="64"/>
</issue>
@@ -2137,7 +2541,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rIN/strings.xml"
- line="2334"
+ line="2354"
column="64"/>
</issue>
@@ -2149,11 +2553,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=" <string name="sync_plug" msgid="3905078969081888738">""<font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are."</string>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values-en-rXC/strings.xml"
+ line="2396"
+ column="168"/>
+ </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=" <string name="sync_plug"><font fgcolor="#ffffffff">Welcome to Google sync!</font>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/strings.xml"
- line="5512"
+ line="5651"
column="36"/>
</issue>
@@ -2181,27 +2601,11 @@
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:colorAccent">#ff009688</item>"
- errorLine2=" ^">
- <location
- file="res/values/styles.xml"
- line="366"
- column="42"/>
- </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="*android:regularColor">@color/lock_pattern_view_regular_color</item>"
errorLine2=" ^">
<location
file="res/values/styles.xml"
- line="443"
+ line="442"
column="44"/>
</issue>
@@ -2217,7 +2621,7 @@
errorLine2=" ^">
<location
file="res/values/styles.xml"
- line="449"
+ line="448"
column="44"/>
</issue>
@@ -2233,7 +2637,7 @@
errorLine2=" ^">
<location
file="res/values/styles.xml"
- line="450"
+ line="449"
column="44"/>
</issue>
@@ -2249,7 +2653,7 @@
errorLine2=" ^">
<location
file="res/values/styles.xml"
- line="473"
+ line="472"
column="41"/>
</issue>
@@ -2393,7 +2797,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="139"
+ line="154"
column="43"/>
</issue>
@@ -2409,7 +2813,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="140"
+ line="155"
column="42"/>
</issue>
@@ -2425,7 +2829,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="141"
+ line="156"
column="45"/>
</issue>
@@ -2437,11 +2841,11 @@
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="switchBarBackgroundColor">@color/material_grey_200</item>"
+ errorLine1=" <item name="switchBarBackgroundColor">@color/switch_bar_background</item>"
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="147"
+ line="233"
column="47"/>
</issue>
@@ -2453,27 +2857,11 @@
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:colorControlActivated">@color/material_blue_500</item>"
- errorLine2=" ^">
- <location
- file="res/values/themes.xml"
- line="148"
- column="52"/>
- </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="android:statusBarColor">#00000000</item>"
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="298"
+ line="308"
column="45"/>
</issue>
@@ -2489,7 +2877,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="299"
+ line="309"
column="49"/>
</issue>
@@ -2505,7 +2893,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="307"
+ line="317"
column="45"/>
</issue>
@@ -2521,7 +2909,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="308"
+ line="318"
column="49"/>
</issue>
diff --git a/res/xml/zen_mode_calls_settings.xml b/res/color/switchbar_switch_thumb_tint.xml
similarity index 72%
copy from res/xml/zen_mode_calls_settings.xml
copy to res/color/switchbar_switch_thumb_tint.xml
index aa84216..4c75a7e 100644
--- a/res/xml/zen_mode_calls_settings.xml
+++ b/res/color/switchbar_switch_thumb_tint.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,7 +15,6 @@
limitations under the License.
-->
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="zen_mode_calls_settings"
- android:title="@string/zen_mode_calls" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="#FFFFFF" />
+</selector>
\ No newline at end of file
diff --git a/res/xml/zen_mode_calls_settings.xml b/res/color/switchbar_switch_track_tint.xml
similarity index 72%
rename from res/xml/zen_mode_calls_settings.xml
rename to res/color/switchbar_switch_track_tint.xml
index aa84216..141f977 100644
--- a/res/xml/zen_mode_calls_settings.xml
+++ b/res/color/switchbar_switch_track_tint.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,7 +15,7 @@
limitations under the License.
-->
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="zen_mode_calls_settings"
- android:title="@string/zen_mode_calls" />
+<selector
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="#BFFFFFFF" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_apps.xml b/res/drawable/ic_apps.xml
index 9f00141..841c25a 100644
--- a/res/drawable/ic_apps.xml
+++ b/res/drawable/ic_apps.xml
@@ -17,8 +17,7 @@
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:tint="?android:attr/colorControlNormal">
+ android:viewportHeight="24.0">
<path
android:pathData="M6 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 12c1.1 0 2-.9 2-2s-.9-2-2-2-2
.9-2 2 .9 2 2 2zm-6 0c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0-6c1.1 0 2-.9
diff --git a/res/drawable/ic_attach_money_black_24dp.xml b/res/drawable/ic_attach_money_black_24dp.xml
new file mode 100644
index 0000000..12605fd
--- /dev/null
+++ b/res/drawable/ic_attach_money_black_24dp.xml
@@ -0,0 +1,25 @@
+<?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.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.78,0 2.44,0.85 2.5,2.1h2.21c-0.07,-1.72 -1.12,-3.3 -3.21,-3.81V3h-3v2.16c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -2.06,0 -2.87,-0.92 -2.98,-2.1h-2.2c0.12,2.19 1.76,3.42 3.68,3.83V21h3v-2.15c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml
index b22e483..b40aceb 100644
--- a/res/drawable/ic_devices_other.xml
+++ b/res/drawable/ic_devices_other.xml
@@ -17,8 +17,7 @@
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:tint="?android:attr/colorControlNormal">
+ android:viewportHeight="24.0">
<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
diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml
index 6add484..841de58 100644
--- a/res/drawable/ic_help.xml
+++ b/res/drawable/ic_help.xml
@@ -17,8 +17,7 @@
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:tint="?android:attr/colorControlNormal">
+ android:viewportHeight="24.0">
<path
android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 16.81c-.72
0-1.3-.58-1.3-1.3s.58-1.3 1.3-1.3 1.3 .58 1.3 1.3-.58 1.3-1.3
diff --git a/res/drawable/ic_help_24dp.xml b/res/drawable/ic_help_24dp.xml
deleted file mode 100644
index d80b717..0000000
--- a/res/drawable/ic_help_24dp.xml
+++ /dev/null
@@ -1,31 +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.0"
- android:viewportHeight="24.0"
- android:tint="?android:attr/colorAccent">
- <path
- android:fillColor="#FF000000"
- android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2
- 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0
- -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66
- 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_homepage_accessibility.xml b/res/drawable/ic_homepage_accessibility.xml
new file mode 100644
index 0000000..07c9ef2
--- /dev/null
+++ b/res/drawable/ic_homepage_accessibility.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_accessibility_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_accessibility" />
+</layer-list>
diff --git a/res/drawable/ic_homepage_accounts.xml b/res/drawable/ic_homepage_accounts.xml
new file mode 100644
index 0000000..ee33505
--- /dev/null
+++ b/res/drawable/ic_homepage_accounts.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_accounts_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_accounts" />
+</layer-list>
diff --git a/res/drawable/ic_homepage_apps.xml b/res/drawable/ic_homepage_apps.xml
new file mode 100644
index 0000000..3d18d09
--- /dev/null
+++ b/res/drawable/ic_homepage_apps.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_app_and_notification_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_apps" />
+</layer-list>
diff --git a/res/drawable/ic_homepage_battery.xml b/res/drawable/ic_homepage_battery.xml
new file mode 100644
index 0000000..abafdcb
--- /dev/null
+++ b/res/drawable/ic_homepage_battery.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_battery_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_battery_white" />
+</layer-list>
diff --git a/res/drawable/ic_homepage_connected_device.xml b/res/drawable/ic_homepage_connected_device.xml
new file mode 100644
index 0000000..483427c
--- /dev/null
+++ b/res/drawable/ic_homepage_connected_device.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_connected_device_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_devices_other" />
+</layer-list>
diff --git a/res/drawable/ic_homepage_display.xml b/res/drawable/ic_homepage_display.xml
new file mode 100644
index 0000000..893a583
--- /dev/null
+++ b/res/drawable/ic_homepage_display.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_display_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_display_white" />
+</layer-list>
diff --git a/res/xml/zen_mode_messages_settings.xml b/res/drawable/ic_homepage_generic_background.xml
similarity index 61%
copy from res/xml/zen_mode_messages_settings.xml
copy to res/drawable/ic_homepage_generic_background.xml
index 4b4a1e2..37273a0 100644
--- a/res/xml/zen_mode_messages_settings.xml
+++ b/res/drawable/ic_homepage_generic_background.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.
@@ -14,8 +14,11 @@
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"
- android:title="@string/zen_mode_messages" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="oval">
+ <solid
+ android:color="@color/homepage_generic_icon_background" />
+ <size
+ android:width="@dimen/dashboard_tile_image_size"
+ android:height="@dimen/dashboard_tile_image_size" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/ic_homepage_network.xml b/res/drawable/ic_homepage_network.xml
new file mode 100644
index 0000000..5ed023a
--- /dev/null
+++ b/res/drawable/ic_homepage_network.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_network_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_wireless_white" />
+</layer-list>
diff --git a/res/drawable/ic_homepage_security.xml b/res/drawable/ic_homepage_security.xml
new file mode 100644
index 0000000..5a6ed97
--- /dev/null
+++ b/res/drawable/ic_homepage_security.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_security_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_security_white" />
+</layer-list>
diff --git a/res/drawable/ic_homepage_sound.xml b/res/drawable/ic_homepage_sound.xml
new file mode 100644
index 0000000..4991656
--- /dev/null
+++ b/res/drawable/ic_homepage_sound.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_sound_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_sound_white" />
+</layer-list>
diff --git a/res/drawable/ic_homepage_storage.xml b/res/drawable/ic_homepage_storage.xml
new file mode 100644
index 0000000..4922844
--- /dev/null
+++ b/res/drawable/ic_homepage_storage.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_storage_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_storage_white" />
+</layer-list>
diff --git a/res/drawable/ic_homepage_support.xml b/res/drawable/ic_homepage_support.xml
new file mode 100644
index 0000000..0936304
--- /dev/null
+++ b/res/drawable/ic_homepage_support.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_support_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_help" />
+</layer-list>
diff --git a/res/drawable/ic_homepage_system_dashboard.xml b/res/drawable/ic_homepage_system_dashboard.xml
new file mode 100644
index 0000000..60f0476
--- /dev/null
+++ b/res/drawable/ic_homepage_system_dashboard.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_system_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_system_dashboard_white" />
+</layer-list>
diff --git a/res/drawable/ic_perm_device_information_green_24dp.xml b/res/drawable/ic_perm_device_information_green_24dp.xml
new file mode 100644
index 0000000..a2b9354
--- /dev/null
+++ b/res/drawable/ic_perm_device_information_green_24dp.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.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#0F9D58"
+ android:pathData="M13,7h-2v2h2L13,7zM13,11h-2v6h2v-6zM17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,
+ 1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14z"/>
+</vector>
diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml
index 4cf5182..67b6c9a 100644
--- a/res/drawable/ic_settings_accessibility.xml
+++ b/res/drawable/ic_settings_accessibility.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="M20.75,6.99c-0.14,-0.55 -0.69,-0.87 -1.24,-0.75C17.13,6.77 14.48,7 12,7S6.87,6.77 4.49,6.24c-0.55,-0.12 -1.1,0.2 -1.24,0.75l0,0C3.11,7.55 3.45,8.12 4,8.25C5.61,8.61 7.35,8.86 9,9v12c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1v-5h2v5c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1V9c1.65,-0.14 3.39,-0.39 5,-0.75C20.55,8.12 20.89,7.55 20.75,6.99L20.75,6.99zM12,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,6 12,6z"/>
diff --git a/res/drawable/ic_settings_accounts.xml b/res/drawable/ic_settings_accounts.xml
index 154c09c..d152b14 100644
--- a/res/drawable/ic_settings_accounts.xml
+++ b/res/drawable/ic_settings_accounts.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="M3.0,5.0
diff --git a/res/drawable/ic_settings_battery_white.xml b/res/drawable/ic_settings_battery_white.xml
new file mode 100644
index 0000000..255b75e
--- /dev/null
+++ b/res/drawable/ic_settings_battery_white.xml
@@ -0,0 +1,24 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT 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="#FFFFFF"
+ android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C17,4.6 16.4,4 15.67,4z"/>
+</vector>
diff --git a/res/drawable/ic_settings_display_white.xml b/res/drawable/ic_settings_display_white.xml
new file mode 100644
index 0000000..4a41691
--- /dev/null
+++ b/res/drawable/ic_settings_display_white.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="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M20,15.31l2.6-2.6c0.39-0.39,0.39-1.02,0-1.41L20,8.69V5c0-0.55-0.45-1-1-1h-3.69l-2.6-2.6c-0.39-0.39-1.02-0.39-1.41,0
+L8.69,4H5C4.45,4,4,4.45,4,5v3.69l-2.6,2.6c-0.39,0.39-0.39,1.02,0,1.41l2.6,2.6V19c0,0.55,0.45,1,1,1h3.69l2.6,2.6
+c0.39,0.39,1.02,0.39,1.41,0l2.6-2.6H19c0.55,0,1-0.45,1-1V15.31z
+M12,18V6c3.31,0,6,2.69,6,6S15.31,18,12,18z"/>
+</vector>
diff --git a/res/drawable/ic_settings_security_white.xml b/res/drawable/ic_settings_security_white.xml
new file mode 100644
index 0000000..d6c5b64
--- /dev/null
+++ b/res/drawable/ic_settings_security_white.xml
@@ -0,0 +1,24 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT 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">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>
+</vector>
diff --git a/res/drawable/ic_settings_sound_white.xml b/res/drawable/ic_settings_sound_white.xml
new file mode 100644
index 0000000..4737349
--- /dev/null
+++ b/res/drawable/ic_settings_sound_white.xml
@@ -0,0 +1,29 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT 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">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M3 10v4c0 .55 .45 1 1 1h3l3.29 3.29c.63 .63 1.71 .18
+1.71-.71V6.41c0-.89-1.08-1.34-1.71-.71L7 9H4c-.55 0-1 .45-1 1zm13.5 2A4.5 4.5 0
+0 0 14 7.97v8.05c1.48-.73 2.5-2.25 2.5-4.02zM14 4.46v.19c0 .38 .25 .71 .61
+.85C17.18 6.54 19 9.06 19 12s-1.82 5.46-4.39 6.5c-.36 .14 -.61 .47 -.61 .85
+v.19c0 .63 .63 1.08 1.22 .86 a8.995 8.995 0 0 0 0-16.8c-.59-.23-1.22 .23 -1.22
+.86 z"/>
+</vector>
diff --git a/res/drawable/ic_settings_storage_white.xml b/res/drawable/ic_settings_storage_white.xml
new file mode 100644
index 0000000..8f662f3
--- /dev/null
+++ b/res/drawable/ic_settings_storage_white.xml
@@ -0,0 +1,24 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT 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="#FFFFFF"
+ android:pathData="M20,16L4,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,19.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1zM4,8h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2L4,4c-1.1,0 -2,0.9 -2,2s0.9,2 2,2zM5,4.9c0.61,0 1.1,0.49 1.1,1.1 0,0.61 -0.49,1.1 -1.1,1.1S3.9,6.61 3.9,6c0,-0.61 0.49,-1.1 1.1,-1.1zM20,10L4,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,13.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1z"/>
+</vector>
diff --git a/res/drawable/ic_settings_system_dashboard_white.xml b/res/drawable/ic_settings_system_dashboard_white.xml
new file mode 100644
index 0000000..5308cb0
--- /dev/null
+++ b/res/drawable/ic_settings_system_dashboard_white.xml
@@ -0,0 +1,30 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT 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">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M12,17L12,17c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1l0,0c-0.55,0 -1,0.45 -1,1v4C11,16.55 11.45,17 12,17z"/>
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M12,2c-5.52,0 -10,4.48 -10,10s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20z"/>
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M12,9.1L12,9.1c0.61,0 1.1,-0.49 1.1,-1.1l0,0c0,-0.61 -0.49,-1.1 -1.1,-1.1l0,0c-0.61,0 -1.1,0.49 -1.1,1.1l0,0C10.9,8.61 11.39,9.1 12,9.1z"/>
+</vector>
diff --git a/res/drawable/ic_settings_wireless_white.xml b/res/drawable/ic_settings_wireless_white.xml
new file mode 100644
index 0000000..8dedb0d
--- /dev/null
+++ b/res/drawable/ic_settings_wireless_white.xml
@@ -0,0 +1,24 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT 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">
+ <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"/>
+</vector>
diff --git a/res/drawable/ic_suggestion_close_button.xml b/res/drawable/ic_suggestion_close_button.xml
new file mode 100644
index 0000000..615b215
--- /dev/null
+++ b/res/drawable/ic_suggestion_close_button.xml
@@ -0,0 +1,25 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M18.3,5.71a0.996,0.996 0,0 0,-1.41 0L12,10.59 7.11,5.7A0.996,0.996 0,1 0,5.7 7.11L10.59,12 5.7,16.89a0.996,0.996 0,1 0,1.41 1.41L12,13.41l4.89,4.89a0.996,0.996 0,1 0,1.41 -1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z"/>
+</vector>
diff --git a/res/drawable/tile_icon_layer_trace.xml b/res/drawable/tile_icon_layer_trace.xml
new file mode 100644
index 0000000..21dafd3
--- /dev/null
+++ b/res/drawable/tile_icon_layer_trace.xml
@@ -0,0 +1,29 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:pathData="M11.709,11.712 L7.061,8.098 6.039,8.893l5.676,4.415 5.676,-4.415 -1.028,-0.801zM11.716,10.11 L16.357,6.496 17.392,5.695 11.716,1.281 6.039,5.695 7.067,6.496Z"
+ android:fillColor="#FFFFFFFF"/>
+ <path
+ android:pathData="m20.27,15.235c0,0.82 -0.671,1.491 -1.491,1.491 -0.134,0 -0.261,-0.015 -0.38,-0.052l-2.654,2.646C15.782,19.439 15.797,19.573 15.797,19.708c0,0.82 -0.671,1.491 -1.491,1.491 -0.82,0 -1.491,-0.671 -1.491,-1.491 0,-0.134 0.015,-0.268 0.052,-0.388L10.966,17.419C10.847,17.456 10.713,17.471 10.579,17.471 10.444,17.471 10.31,17.456 10.191,17.419L6.799,20.818C6.836,20.938 6.851,21.064 6.851,21.199 6.851,22.019 6.18,22.689 5.36,22.689 4.54,22.689 3.869,22.019 3.869,21.199c0,-0.82 0.671,-1.491 1.491,-1.491 0.134,0 0.261,0.015 0.38,0.052L9.14,16.368C9.103,16.249 9.088,16.114 9.088,15.98 9.088,15.16 9.759,14.489 10.579,14.489c0.82,0 1.491,0.671 1.491,1.491 0,0.134 -0.015,0.268 -0.052,0.388l1.901,1.901C14.038,18.232 14.172,18.217 14.306,18.217c0.134,0 0.268,0.015 0.388,0.052L17.34,15.615C17.303,15.496 17.288,15.369 17.288,15.235c0,-0.82 0.671,-1.491 1.491,-1.491 0.82,0 1.491,0.671 1.491,1.491z"
+ android:fillColor="#FFFFFFFF"/>
+</vector>
+
diff --git a/res/drawable/tile_icon_window_trace.xml b/res/drawable/tile_icon_window_trace.xml
new file mode 100644
index 0000000..2563049
--- /dev/null
+++ b/res/drawable/tile_icon_window_trace.xml
@@ -0,0 +1,29 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:pathData="M17.115,1.535L9.984,1.535C9.38,1.535 8.887,2.029 8.887,2.632L8.887,5.923L7.241,5.923C6.638,5.923 6.144,6.417 6.144,7.021l0,5.486c0,0.603 0.494,1.097 1.097,1.097l7.131,0c0.603,0 1.097,-0.494 1.097,-1.097l0,-3.291l1.646,0c0.603,0 1.097,-0.494 1.097,-1.097L18.212,2.632C18.212,2.029 17.718,1.535 17.115,1.535ZM14.372,12.506L7.241,12.506l0,-4.388l7.131,0zM17.115,8.118L15.469,8.118L15.469,7.021C15.469,6.417 14.976,5.923 14.372,5.923L9.984,5.923L9.984,3.729l7.131,0z"
+ android:fillColor="#FFFFFFFF"/>
+ <path
+ android:pathData="m20.27,15.235c0,0.82 -0.671,1.491 -1.491,1.491 -0.134,0 -0.261,-0.015 -0.38,-0.052l-2.654,2.646C15.782,19.439 15.797,19.573 15.797,19.708c0,0.82 -0.671,1.491 -1.491,1.491 -0.82,0 -1.491,-0.671 -1.491,-1.491 0,-0.134 0.015,-0.268 0.052,-0.388L10.966,17.419C10.847,17.456 10.713,17.471 10.579,17.471 10.444,17.471 10.31,17.456 10.191,17.419L6.799,20.818C6.836,20.938 6.851,21.064 6.851,21.199 6.851,22.019 6.18,22.689 5.36,22.689 4.54,22.689 3.869,22.019 3.869,21.199c0,-0.82 0.671,-1.491 1.491,-1.491 0.134,0 0.261,0.015 0.38,0.052L9.14,16.368C9.103,16.249 9.088,16.114 9.088,15.98 9.088,15.16 9.759,14.489 10.579,14.489c0.82,0 1.491,0.671 1.491,1.491 0,0.134 -0.015,0.268 -0.052,0.388l1.901,1.901C14.038,18.232 14.172,18.217 14.306,18.217c0.134,0 0.268,0.015 0.388,0.052L17.34,15.615C17.303,15.496 17.288,15.369 17.288,15.235c0,-0.82 0.671,-1.491 1.491,-1.491 0.82,0 1.491,0.671 1.491,1.491z"
+ android:fillColor="#FFFFFFFF"/>
+</vector>
+
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index b54a245..cba6173 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -84,10 +84,20 @@
android:id="@+id/headerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="10dp"
android:gravity="?attr/suwGlifHeaderGravity"
android:textSize="18sp"/>
+ <Button
+ android:id="@+id/screen_lock_options"
+ style="@style/SuwGlifButton.Tertiary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:gravity="?attr/suwGlifHeaderGravity"
+ android:text="@string/setup_lock_settings_options_button_label"
+ android:visibility="gone" />
+
</LinearLayout>
</ScrollView>
diff --git a/res/layout-sw320dp/settings_entity_header.xml b/res/layout-sw320dp/settings_entity_header.xml
index 951961c..481a9c4 100644
--- a/res/layout-sw320dp/settings_entity_header.xml
+++ b/res/layout-sw320dp/settings_entity_header.xml
@@ -45,6 +45,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:orientation="vertical">
@@ -57,8 +58,7 @@
android:singleLine="false"
android:ellipsize="marquee"
android:gravity="start"
- android:textDirection="locale"
- android:paddingTop="8dp" />
+ android:textDirection="locale" />
<TextView
android:id="@+id/install_type"
diff --git a/res/layout/app_high_usage_item.xml b/res/layout/app_high_usage_item.xml
new file mode 100755
index 0000000..473315f
--- /dev/null
+++ b/res/layout/app_high_usage_item.xml
@@ -0,0 +1,48 @@
+<?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:layout_margin="4dp"
+ android:paddingStart="?android:dialogPreferredPadding"
+ android:paddingEnd="?android:dialogPreferredPadding"
+ android:orientation="horizontal">
+ <ImageView
+ android:id="@+id/app_icon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center_vertical"/>
+ <TextView
+ android:id="@+id/app_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginStart="24dp"
+ android:textColor="?android:textColorPrimary"
+ android:paddingEnd="7dp"/>
+ <TextView
+ android:id="@+id/app_screen_time"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="center_vertical"
+ android:paddingEnd="16dp"
+ android:textAlignment="viewEnd"
+ android:textColor="?android:textColorPrimary"/>
+</LinearLayout>
diff --git a/res/layout/condition_container.xml b/res/layout/condition_container.xml
new file mode 100644
index 0000000..808c4ac
--- /dev/null
+++ b/res/layout/condition_container.xml
@@ -0,0 +1,44 @@
+<?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="16dp"
+ android:paddingEnd="16dp"
+ android:paddingBottom="@dimen/dashboard_padding_bottom">
+
+ <android.support.v7.widget.CardView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:cardUseCompatPadding="true"
+ app:cardElevation="2dp">
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/data"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/material_grey_300"
+ android:scrollbars="none"/>
+
+ </android.support.v7.widget.CardView>
+
+</FrameLayout>
diff --git a/res/layout/condition_header_icon.xml b/res/layout/condition_header_icon.xml
index 4f93f54..e5cbdc9 100644
--- a/res/layout/condition_header_icon.xml
+++ b/res/layout/condition_header_icon.xml
@@ -17,8 +17,8 @@
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/icon"
- android:layout_width="@dimen/dashboard_tile_image_size"
- android:layout_height="@dimen/dashboard_tile_image_size"
+ 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
index 3e2f9b4..7d1db40 100644
--- a/res/layout/condition_tile.xml
+++ b/res/layout/condition_tile.xml
@@ -30,8 +30,8 @@
<ImageView
android:id="@android:id/icon"
- android:layout_width="@dimen/dashboard_tile_image_size"
- android:layout_height="@dimen/dashboard_tile_image_size"
+ 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"
diff --git a/res/layout/dialog_firmware_version.xml b/res/layout/dialog_firmware_version.xml
index e49255f..874d7af 100644
--- a/res/layout/dialog_firmware_version.xml
+++ b/res/layout/dialog_firmware_version.xml
@@ -47,7 +47,9 @@
style="@style/device_info_dialog_value"
android:id="@+id/security_patch_level_value"
android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
+ android:layout_height="wrap_content"
+ android:background="?android:attr/selectableItemBackground"
+ android:textColor="?android:attr/colorAccent"/>
<TextView
style="@style/device_info_dialog_label"
diff --git a/res/layout/dialog_sim_status.xml b/res/layout/dialog_sim_status.xml
index 66b17d7..66d583b 100644
--- a/res/layout/dialog_sim_status.xml
+++ b/res/layout/dialog_sim_status.xml
@@ -141,5 +141,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/device_info_not_available"/>
+
+ <TextView
+ style="@style/device_info_dialog_label"
+ android:id="@+id/esim_id_label"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/status_esim_id"/>
+ <TextView
+ style="@style/device_info_dialog_value"
+ android:id="@+id/esim_id_value"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/device_info_not_available"/>
</LinearLayout>
</ScrollView>
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index 779e504..d328478 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.xml
@@ -93,7 +93,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:paddingEnd="8dp"
+ android:paddingEnd="@dimen/reset_checkbox_padding_end"
android:focusable="false"
android:clickable="false"
android:duplicateParentState="true" />
@@ -104,17 +104,21 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="12dp"
- android:textSize="18sp"
+ android:paddingTop="@dimen/reset_checkbox_title_padding_top"
+ android:textSize="@dimen/reset_checkbox_title_text_size"
android:text="@string/erase_external_storage" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="4sp"
- android:textSize="14sp"
+ android:paddingTop="@dimen/reset_checkbox_summary_padding_top"
+ android:textSize="@dimen/reset_checkbox_summary_text_size"
android:text="@string/erase_external_storage_description" />
</LinearLayout>
</LinearLayout>
+ <include layout="@layout/reset_esim_checkbox"
+ android:id="@+id/erase_esim_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>
<Button
diff --git a/res/layout/preference_app.xml b/res/layout/preference_app.xml
index 8cbb6f2..f9dd6b2 100644
--- a/res/layout/preference_app.xml
+++ b/res/layout/preference_app.xml
@@ -29,9 +29,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
- android:minWidth="60dp"
+ android:minWidth="56dp"
android:orientation="horizontal"
- android:paddingEnd="12dp"
+ android:paddingEnd="8dp"
android:paddingTop="4dp"
android:paddingBottom="4dp">
<android.support.v7.internal.widget.PreferenceImageView
diff --git a/res/xml/zen_mode_messages_settings.xml b/res/layout/recycler_view.xml
similarity index 69%
rename from res/xml/zen_mode_messages_settings.xml
rename to res/layout/recycler_view.xml
index 4b4a1e2..a7dabe5 100644
--- a/res/xml/zen_mode_messages_settings.xml
+++ b/res/layout/recycler_view.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.
@@ -14,8 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<PreferenceScreen
+<android.support.v7.widget.RecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="zen_mode_messages_settings"
- android:title="@string/zen_mode_messages" />
+ android:id="@+id/recycler_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="8dp"
+ android:scrollbars="vertical"/>
diff --git a/res/layout/reset_esim_checkbox.xml b/res/layout/reset_esim_checkbox.xml
new file mode 100644
index 0000000..d830bf4
--- /dev/null
+++ b/res/layout/reset_esim_checkbox.xml
@@ -0,0 +1,55 @@
+<?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:orientation="horizontal"
+ android:focusable="true"
+ android:clickable="true"
+ android:visibility="gone">
+
+ <CheckBox
+ android:id="@+id/erase_esim"
+ 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">
+
+ <TextView
+ android:id="@+id/erase_esim_title"
+ 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" />
+
+ <TextView
+ 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" />
+ </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/reset_network.xml b/res/layout/reset_network.xml
index be966dd..1850bb2 100644
--- a/res/layout/reset_network.xml
+++ b/res/layout/reset_network.xml
@@ -14,7 +14,8 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
@@ -27,7 +28,8 @@
android:layout_marginTop="12dp"
android:layout_weight="1">
- <LinearLayout android:layout_width="match_parent"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -38,6 +40,11 @@
android:textDirection="locale"
android:text="@string/reset_network_desc" />
+ <include layout="@layout/reset_esim_checkbox"
+ android:id="@+id/erase_esim_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
</LinearLayout>
</ScrollView>
diff --git a/res/layout/running_processes_header.xml b/res/layout/running_processes_header.xml
index aa106ac..ac31543 100644
--- a/res/layout/running_processes_header.xml
+++ b/res/layout/running_processes_header.xml
@@ -36,7 +36,7 @@
android:gravity="left|center_vertical"
android:text="@string/running_processes_header_title" />
- <view class="com.android.settings.applications.LinearColorBar"
+ <view class="com.android.settings.widget.LinearColorBar"
android:id="@+id/color_bar"
android:layout_width="match_parent"
android:layout_height="16sp"
diff --git a/res/layout/settings_main_prefs.xml b/res/layout/settings_main_prefs.xml
index 4f08679..c4c0af5 100644
--- a/res/layout/settings_main_prefs.xml
+++ b/res/layout/settings_main_prefs.xml
@@ -31,15 +31,12 @@
<com.android.settings.widget.SwitchBar android:id="@+id/switch_bar"
android:layout_height="?android:attr/actionBarSize"
android:layout_width="match_parent"
- android:background="@drawable/switchbar_background"
- android:theme="?attr/switchBarTheme"
- />
+ android:theme="?attr/switchBarTheme" />
<FrameLayout
android:id="@+id/main_content"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- />
+ android:layout_height="match_parent" />
</LinearLayout>
@@ -54,8 +51,7 @@
android:layout_height="wrap_content"
android:layout_margin="5dip"
android:layout_alignParentStart="true"
- android:text="@*android:string/back_button_label"
- />
+ android:text="@*android:string/back_button_label" />
<LinearLayout
android:orientation="horizontal"
@@ -68,15 +64,13 @@
android:layout_height="wrap_content"
android:layout_margin="5dip"
android:text="@*android:string/skip_button_label"
- android:visibility="gone"
- />
+ android:visibility="gone" />
<Button android:id="@+id/next_button"
android:layout_width="150dip"
android:layout_height="wrap_content"
android:layout_margin="5dip"
- android:text="@*android:string/next_button_label"
- />
+ android:text="@*android:string/next_button_label" />
</LinearLayout>
diff --git a/res/layout/settings_summary_preference.xml b/res/layout/settings_summary_preference.xml
index 7d550b5..1340571 100644
--- a/res/layout/settings_summary_preference.xml
+++ b/res/layout/settings_summary_preference.xml
@@ -42,7 +42,7 @@
android:paddingBottom="5dp"
android:maxLines="10" />
- <com.android.settings.applications.LinearColorBar
+ <com.android.settings.widget.LinearColorBar
android:id="@+id/color_bar"
android:layout_width="match_parent"
android:layout_height="28dp"
diff --git a/res/xml/zen_mode_messages_settings.xml b/res/layout/smart_battery_header.xml
similarity index 60%
copy from res/xml/zen_mode_messages_settings.xml
copy to res/layout/smart_battery_header.xml
index 4b4a1e2..960f04a 100644
--- a/res/xml/zen_mode_messages_settings.xml
+++ b/res/layout/smart_battery_header.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,7 +15,16 @@
limitations under the License.
-->
-<PreferenceScreen
+<!-- Entity header -->
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="zen_mode_messages_settings"
- android:title="@string/zen_mode_messages" />
+ android:id="@+id/entity_header"
+ style="@style/EntityHeader"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:minHeight="200dp"
+ android:paddingBottom="32dp"
+ android:paddingStart="@dimen/preference_no_icon_padding_start"
+ android:paddingTop="24dp">
+
+</LinearLayout>
diff --git a/res/layout/styled_switch_bar.xml b/res/layout/styled_switch_bar.xml
index dd61907..1777c0f 100644
--- a/res/layout/styled_switch_bar.xml
+++ b/res/layout/styled_switch_bar.xml
@@ -25,7 +25,5 @@
android:layout_height="?android:attr/actionBarSize"
android:layout_width="match_parent"
android:paddingStart="0dp"
- android:background="@drawable/switchbar_background"
- android:theme="?attr/switchBarTheme"
- />
+ android:theme="?attr/switchBarTheme" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/suggestion_container.xml b/res/layout/suggestion_container.xml
new file mode 100644
index 0000000..9110c58
--- /dev/null
+++ b/res/layout/suggestion_container.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/SuggestionConditionStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="12dp"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ android:gravity="center_vertical">
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="24dp"
+ android:layout_centerVertical="true"
+ android:gravity="start"
+ android:text="@string/suggestions_title_v2"
+ android:textAppearance="@style/TextAppearance.SuggestionHeader" />
+
+ <TextView
+ android:id="@android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginEnd="24dp"
+ android:layout_centerVertical="true"
+ android:gravity="end"
+ android:textAppearance="@style/TextAppearance.SuggestionHeader" />
+
+ </LinearLayout>
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/suggestion_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="18dp"
+ android:paddingBottom="16dp"
+ android:scrollbars="none"/>
+
+</LinearLayout>
diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
index 2adfab3..b947452 100644
--- a/res/layout/suggestion_tile.xml
+++ b/res/layout/suggestion_tile.xml
@@ -30,8 +30,8 @@
<ImageView
android:id="@android:id/icon"
- android:layout_width="@dimen/dashboard_tile_image_size"
- android:layout_height="@dimen/dashboard_tile_image_size"
+ android:layout_width="@dimen/suggestion_card_icon_size"
+ android:layout_height="@dimen/suggestion_card_icon_size"
android:layout_marginStart="14dp"
android:layout_marginEnd="24dp" />
diff --git a/res/layout/suggestion_tile_v2.xml b/res/layout/suggestion_tile_v2.xml
new file mode 100644
index 0000000..e04febb
--- /dev/null
+++ b/res/layout/suggestion_tile_v2.xml
@@ -0,0 +1,82 @@
+<?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.
+-->
+
+<android.support.v7.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="328dp"
+ 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" />
+
+ <ImageView
+ android:id="@+id/close_button"
+ android:layout_width="18dp"
+ android:layout_height="18dp"
+ android:alpha="0.54"
+ android:layout_alignParentEnd="true"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:src="@drawable/ic_suggestion_close_button"/>
+
+ </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.SuggestionTitleV2"
+ android:ellipsize="marquee"
+ 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:textAppearance="@style/TextAppearance.SuggestionSummary" />
+
+ </LinearLayout>
+
+</android.support.v7.widget.CardView>
diff --git a/res/layout/suggestion_tile_with_button_v2.xml b/res/layout/suggestion_tile_with_button_v2.xml
new file mode 100644
index 0000000..5f4ed18
--- /dev/null
+++ b/res/layout/suggestion_tile_with_button_v2.xml
@@ -0,0 +1,88 @@
+<?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.
+-->
+
+<android.support.v7.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="328dp"
+ android:layout_height="wrap_content"
+ 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/dashboard_tile_image_size"
+ android:layout_height="@dimen/dashboard_tile_image_size"
+ style="@style/SuggestionCardIcon"
+ android:layout_marginTop="16dp"
+ android:layout_marginBottom="8dp" />
+
+ <ImageView
+ android:id="@+id/close_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:src="@drawable/ic_suggestion_close_button"/>
+
+ </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.TileTitle"
+ android:ellipsize="marquee"
+ 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:textAppearance="@style/TextAppearance.SuggestionSummary" />
+
+ <Button
+ android:id="@android:id/primary"
+ style="@style/ActionPrimaryButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:text="@string/suggestion_button_text" />
+
+ </LinearLayout>
+
+</android.support.v7.widget.CardView>
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index 11d7306..29e125b 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -17,33 +17,37 @@
*/
-->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <TextView android:id="@+id/switch_text"
- android:layout_height="wrap_content"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_gravity="center_vertical"
- android:maxLines="2"
- android:ellipsize="end"
- android:textAppearance="@style/TextAppearance.Switch"
- android:textColor="?android:attr/textColorPrimary"
- android:textAlignment="viewStart" />
+ <TextView
+ android:id="@+id/switch_text"
+ android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_gravity="center_vertical"
+ android:maxLines="2"
+ android:ellipsize="end"
+ android:textAppearance="@style/TextAppearance.Switch"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="18sp"
+ 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:theme="@android:style/Theme.Material"
- android:layout_gravity="center_vertical"
- android:layout_marginEnd="@dimen/restricted_icon_margin_end"
- android:visibility="gone" />
+ <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:theme="@android:style/Theme.Material"
+ android:layout_gravity="center_vertical"
+ android:layout_marginEnd="@dimen/restricted_icon_margin_end"
+ android:visibility="gone" />
- <com.android.settings.widget.ToggleSwitch android:id="@+id/switch_widget"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:theme="@style/ThemeOverlay.SwitchBar.Settings" />
+ <com.android.settings.widget.ToggleSwitch
+ android:id="@+id/switch_widget"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:theme="@style/Widget.SwitchBar.Switch" />
</merge>
diff --git a/res/layout/time_zone_list.xml b/res/layout/time_zone_list.xml
new file mode 100644
index 0000000..a3c47cd
--- /dev/null
+++ b/res/layout/time_zone_list.xml
@@ -0,0 +1,44 @@
+<!--
+ 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="match_parent"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:id="@+id/tz_region_spinner_layout"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/actionBarSize"
+ android:background="?android:attr/colorAccent"
+ android:gravity="center_vertical"
+ android:paddingEnd="@dimen/switchbar_subsettings_margin_end"
+ android:orientation="horizontal">
+
+ <Spinner
+ android:id="@+id/tz_region_spinner"
+ android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:paddingStart="64dp"
+ android:layout_weight="1"
+ android:background="@drawable/app_filter_spinner_background"/>
+ </LinearLayout>
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/tz_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+</LinearLayout>
diff --git a/res/layout/time_zone_list_item.xml b/res/layout/time_zone_list_item.xml
new file mode 100644
index 0000000..471c9d8
--- /dev/null
+++ b/res/layout/time_zone_list_item.xml
@@ -0,0 +1,62 @@
+<!--
+ 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:background="?android:attr/selectableItemBackground"
+ android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:orientation="vertical"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+ <TextView
+ android:id="@+id/tz_item_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="TimeZone name"
+ android:textAppearance="?android:attr/textAppearanceListItem" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/tz_item_details"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+ android:textColor="?android:attr/textColorSecondary" />
+
+ <TextView
+ android:id="@+id/tz_item_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAlignment="viewEnd"
+ android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+ android:textColor="?android:attr/textColorSecondary" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/tz_item_dst"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+ android:textColor="?android:attr/textColorSecondary" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/two_action_buttons.xml b/res/layout/two_action_buttons.xml
index 41bcfc3..23bb886 100644
--- a/res/layout/two_action_buttons.xml
+++ b/res/layout/two_action_buttons.xml
@@ -20,9 +20,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
- android:paddingTop="8dp"
+ android:paddingTop="24dp"
android:paddingStart="68dp"
- android:paddingEnd="8dp"
+ android:paddingEnd="24dp"
android:orientation="horizontal">
<FrameLayout
@@ -42,6 +42,9 @@
android:layout_height="wrap_content"
android:layout_marginBottom="4dp" />
</FrameLayout>
+ <Space
+ android:layout_width="16dp"
+ android:layout_height="wrap_content" />
<FrameLayout
android:layout_width="0dp"
android:layout_weight="1"
diff --git a/res/layout/wifi_calling_settings_preferences.xml b/res/layout/wifi_calling_settings_preferences.xml
index 4e64f40..7e411e1 100644
--- a/res/layout/wifi_calling_settings_preferences.xml
+++ b/res/layout/wifi_calling_settings_preferences.xml
@@ -14,8 +14,8 @@
limitations under the License.
-->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tabs_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -25,7 +25,6 @@
android:id="@+id/switch_bar"
android:layout_height="?android:attr/actionBarSize"
android:layout_width="match_parent"
- android:background="@drawable/switchbar_background"
android:theme="?attr/switchBarTheme" />
<FrameLayout
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index cfb6d9a..2c4a1ed 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -316,6 +316,26 @@
android:orientation="vertical"
android:visibility="gone">
+ <LinearLayout android:id="@+id/metered_settings_fields"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item">
+
+ <TextView android:id="@+id/metered_settings_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item_label"
+ android:text="@string/data_usage_metered_yes" />
+
+ <Spinner android:id="@+id/metered_settings"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item_spinner"
+ android:prompt="@string/data_usage_metered_yes"
+ android:entries="@array/wifi_metered_entries"/>
+
+ </LinearLayout>
+
<LinearLayout android:id="@+id/proxy_settings_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/wifi_network_details_two_buttons_panel.xml b/res/layout/wifi_network_details_two_buttons_panel.xml
index f076eea..57f76b5 100644
--- a/res/layout/wifi_network_details_two_buttons_panel.xml
+++ b/res/layout/wifi_network_details_two_buttons_panel.xml
@@ -37,7 +37,7 @@
<Button
style="@android:style/Widget.Material.Button.Colored"
android:id="@+id/signin_button"
- android:text="@string/support_sign_in_button_text"
+ android:text="@string/wifi_sign_in_button_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
diff --git a/res/layout/zen_mode_settings_button.xml b/res/layout/zen_mode_settings_button.xml
index 82989fc..4fe522d7 100644
--- a/res/layout/zen_mode_settings_button.xml
+++ b/res/layout/zen_mode_settings_button.xml
@@ -30,7 +30,7 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
- android:layout_gravity="center"
+ android:layout_gravity="left"
android:text="@string/zen_mode_button_turn_on"
android:paddingEnd="8dp" />
@@ -40,7 +40,7 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
- android:layout_gravity="center"
+ android:layout_gravity="left"
android:text="@string/zen_mode_button_turn_off"
android:paddingEnd="8dp" />
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index e69abc4..e632ea2 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"አዝራር ተጫን"</item>
<item msgid="1624323946324499595">"ፒን ከአቻ መሣሪያ"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 ሰዓት"</item>
<item msgid="5198271470953124739">"በጭራሽ አታቋርጥ"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (ነባሪ)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"ደካማ"</item>
<item msgid="2042505933058940139">"ደካማ"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"ከ60 ቀኖች በላይ የሆናቸው"</item>
<item msgid="5692284879054004388">"ከ90 ቀኖች በላይ የሆናቸው"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"የአውታረ መረብ ምርጫን ተጠቀም"</item>
+ <item msgid="8745603368609022803">"እንደ ተለካ አስተናግድ"</item>
+ <item msgid="2266114985518865625">"እንደ ያልተለካ አስተናግድ"</item>
+ </string-array>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 94164b3..1485cb2 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"የእርስዎ መሣሪያዎች"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"አዲስ መሣሪያ ያጣምሩ"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"ወደ ብሉቱዝ መሣሪያዎች ለማጣመር እና ለማገናኘት መሣሪያን ይፍቀዱ"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"የውስጠ-ሞገድ ማስጮህን አሰናክል"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"በብሉቱዝ ጆሮ ማዳመጫዎች ላይ ብጁ የስልክ የጥሪ ቅላጼዎችን አታጫውት"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"ውሂብ አዘጋጅ"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"በፊደል ተራ ለይ"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"በሰዓት ሰቅ ለይ"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> በ<xliff:g id="TRANSITION_DATE">%2$s</xliff:g> ላይ ይጀምራል።"</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"የቀን ብርሃን ቁጠባዎች ጊዜ"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"መደበኛ ሰዓት"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"የሰዓት ሰቅ በክልል"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"ቋሚ የጅምር ሰዓት ሰቆች"</string>
<string name="date_picker_title" msgid="1338210036394128512">"ቀን"</string>
<string name="time_picker_title" msgid="483460752287255019">"ጊዜ"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"በራስ ሰር ቆልፍ"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"የቁልፍ ገጽ መልዕክት"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"ንዑስ ፕሮግራሞችን አንቃ"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"በአስተዳዳሪ ተሰናክሏል"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ምንም"</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">"ለምሳሌ፦ የአበበ Android።"</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"የመገለጫ መረጃ"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"መለያዎች"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"ምስጠራ እና ምስክርነቶች"</string>
@@ -459,9 +471,16 @@
<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="8971630898700461034">"ማያ ገጽ መቆለፊያውን ያዘጋጁ"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"መሣሪያዎን ይጠብቁ"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"የጣት አሻራን ይጠቀሙ"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"በእርስዎ የጣት አሻራ ይክፈቱ"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"ማሳያ ቆልፍ ምረጥ"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"የስራ ቁልፍ ይምረጡ"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"እንደ ተናጋሪ ስልክ"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ለሙዚቃ እና ማህደረ መረጃ"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ቅንብሮች አስታውስ"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ከፍተኛው የተገናኙ የብሉቱዝ ኦዲዮ መሣሪያዎች ብዛት"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ከፍተኛው የተገናኙ የብሉቱዝ ኦዲዮ መሣሪያዎች ብዛትን ይምረጡ"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"ውሰድ"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ገመድ-አልባ ማሳየትን ያንቁ"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"በአቅራቢያ ምንም መሳሪያዎች አልተገኙም።"</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"ስም"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 ጊኸ"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ጊኸ"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"ግባ"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d ሜቢ/ሴ"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fiን ማብራት ይፈልጋል"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fiን ማጥፋት ይፈልጋል"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi ያብሩ"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fiን ተጠቀም"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"የWi-Fi ቅንብሮች"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"አዘጋጅ& የገመድ አልባ ድረስ ነጥብ አደራጅ"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">" የይለፍ ቃል፡"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"የይለፍ ቃል አሳይ"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"የመዳረሻ ነጥብ ባንድ ይምረጡ"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ራስ-ሰር"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 ጊሄዝ ባንድ"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 ጊሄዝ ባንድ"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ቅንብሮች"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS አለ"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"የአውታረ መረብ ይለፍ ቃልዎን ያስገቡ"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"የአገልግሎት አቅራቢ የWi‑Fi አውታረ መረብ"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"በ<xliff:g id="NAME">%1%s</xliff:g> በኩል አገናኝ"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"በ<xliff:g id="NAME">%1$s</xliff:g> በኩል አገናኝ"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> የአካባቢ ትክክለኛነትን ለማሻሻል እና ለሌሎች ዓላማዎች የአውታረ መረብ መቃኘትን ማብራት ይፈልጋል፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ።\n\nይሄ ለሁሉም መቃኘት ለሚፈልጉ መተግበሪያዎች ይፈቀድ?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ይህንን ለማጥፋት በትርፍ ፍሰት ምናሌው ውስጥ ወደ የላቁ ይሂዱ።"</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ፍቀድ"</string>
@@ -909,10 +933,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"የኤፒ ባንድ"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ለሌሎች መሣሪያዎችዎ የWi‑Fi አውታረ መረብን ለመፍጠር መገናኛ ነጥብብ ይጠቀሙ። መገናኛ ነጥብ የእርስዎን የሞባይል ውሂብ ግንኙነት በመጠቀም በይነመረብን ያቀርባል። ተጨማሪ የሞባይል ውሂብ ክፍያዎች ሊከፈልባቸው ይችላል።"</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"መተግበሪያዎች በአቅራቢያ ካሉ መሣሪያዎች ጋር ይዘትን ለመጋራት መገናኛ ነጥብ ሊፈጥሩ ይችላሉ።"</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"መገናኛ ነጥብን በራስሰር አጥፋ"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Wi‑Fi መገናኛ ነጥብ ምንም መሣሪያዎች ካልተገናኙ ይጠፋል"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"የመገናኛ ነጥብን በማብራት ላይ…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"የመገናኛ ነጥብን በማጥፋት ላይ…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ገቢር ነው"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android ድረስ ነጥብ"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"የWi-Fi ጥሪ ማድረጊያ"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi Callingን ያብሩ"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"በሞባይል አውታረ መረብ ፈንታ Wi-Fi ይጠቀሙ"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"የአስቸኳይ አደጋ አድራሻ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"በWi-Fi ላይ የአስቸኳይ አደጋ ጥሪ ሲያደርጉ እንደ የእርስዎ አካባቢ ሆኖ ስራ ላይ ይውላል"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"ስለግል ዲኤንኤስ ባህሪያት "<annotation id="url">"የበለጠ ይረዱ"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
<string name="sound_settings" msgid="5534671337768745343">"ድምፅ"</string>
<string name="all_volume_title" msgid="4296957391257836961">"ድምፆች"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"የተንቀሳቃሽ አውታረ መረብ አይነት"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"የድምጸ ተያያዥ ሞደም መረጃ"</string>
<string name="status_data_state" msgid="5503181397066522950">"የተንቀሳቃሽ አውታረ መረብክልል"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"የአገልግሎት ሁኔታ"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"የሲግናል ጥንካሬ"</string>
<string name="status_roaming" msgid="2638800467430913403">"በመንቀሳቀስ ላይ"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"የእርስዎ አዲስ <xliff:g id="NAME">^1</xliff:g> እየሰራ ነው። \n\nፎቶዎችን፣ ፋይሎችን እና የመተግበሪያ ውሂብን ወደዚህ መሣሪያ ለመውሰድ ወደ ቅንብሮች > ማከማቻ ይሂዱ።"</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ን ይውሰዱ"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g>ን እና ውሂቡን ወደ <xliff:g id="NAME_0">^2</xliff:g> መውሰድ ጥቂት ጊዜ ብቻ ነው የሚወስደው። መውሰዱ እስኪጠናቀቅ ድረስ መተግበሪያውን መጠቀም አይችሉም። \n\nበሚወሰድበት ጊዜ <xliff:g id="NAME_1">^2</xliff:g>ን አያስወግዱት።"</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ውሂብን ለመውሰድ ተጠቃሚ <xliff:g id="APP">^1</xliff:g>ን መክፈት ይኖርብዎታል።"</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g>ን በመውሰድ ላይ…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"በሚወሰድበት ጊዜ <xliff:g id="NAME">^1</xliff:g>ን አያስወግዱት። \n\nመውሰዱ እስኪጠናቀቅ ድረስ በዚህ መሣሪያ ላይ ያለው የ<xliff:g id="APP">^2</xliff:g> የሚገኝ አይሆንም።"</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"መውሰድን ሰርዝ"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"አውታረ መረብ፣ መተግበሪያዎች ወይም መሣሪያ ዳግም ሊዋቀሩ ይችላሉ"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi፣ ተንቀሳቃሽ ስልክ እና ብሉቱዝን ዳግም አስጀምር"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"የሚከተሉትን ጨምሮ ይህ ሁሉንም የአውታረ መረብ ቅንብሮችን ዳግም ያቀናብራል፦\n\n"<li>"Wi‑Fi"</li>\n<li>"የተንቀሳቃሽ ስልክ ውሂብ"</li>\n<li>"ብሉቱዝ"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"እንዲሁም eSIMዎችን ዳግም አስጀምር"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"ቅንብሮችን ዳግም ያቀናብሩ"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"ሁሉም አውታረ መረብ ቅንብሮች ዳግም ይጀምሩ? ይህን እርምጃ መቀልበስ አይችሉም!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"ቅንብሮችን ዳግም ያቀናብሩ"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"ዳግም ይቀናበር?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"የአውታረመረብ ዳግም ማስጀመር ለዚህ ተጠቃሚ አይገኝም"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"የአውታረ መረብ ቅንብሮች ዳግም ጀምረዋል።"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIMዎችን ዳግም ማስጀመር አልተቻለም"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"በስህተት ምክንያት eSIMዎቹን ዳግም ማስጀመር አልተቻለም።"</string>
<string name="master_clear_title" msgid="3531267871084279512">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"በeSIM ላይ ያሉ የአገልግሎት አቅራቢዎች"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMዎች"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ይሄ የተንቀሳቃሽ ስልክ አገልግሎት እቅድዎን አይሰርዘውም።"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ \n\nለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n" ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>" የSD ካርድ "</b>"መጥፋት ያስፈልገዋል።"</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"እባክዎ ከበይነ መረብ ጋር ያገናኙ"</string>
<string name="location_title" msgid="1029961368397484576">"የእኔ ሥፍራ"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"የስራ መገለጫ አካባቢ"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"ሁነታ"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ከፍተኛ ትክክለኝነት"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"የባትሪ ኃይል ቁጠባ"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"መሣሪያ ብቻ"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"አካባቢ ጠፍቷል"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"የመተግበሪያ ደረጃ ፈቃዶች"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"የቅርብ ጊዜ የአካባቢ ጥያቄዎች"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"ምንም መተግበሪያዎች በቅርብ ጊዜ አካባቢ አልጠየቁም"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"የአካባቢ አገልግሎቶች"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"ከፍተኛ የባትሪ አጠቃቀም"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"ዝቅተኛ የባትሪ አጠቃቀም"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"የአካባቢ ሁነታ"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"አካባቢን ለማወቅ ጂፒኤስ፣ Wi‑Fi ፣ ብሉቱዝ ወይም የተንቀሳቃሽ ስልክ አውታረ መረቦችን ይጠቀሙ"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"አካባቢን ለመወሰን Wi‑Fi፣ ብሉቱዝ ወይም የተንቀሳቃሽ ስልክ አውታረ መረቦችን ይጠቀሙ"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"አካባቢን ለማወቅ ጂፒኤስን እና የመሣሪያ ዳሳሾችን ይጠቀሙ"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"በመቃኘት ላይ"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi ቅኝት"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"የስርስዓት መተግበሪያዎች እና አገልግሎቶች በማንኛውም ሰዓት የWi‑Fi መሳሪያዎችን እንዲያገኙ በመፍቀድ አካባቢን ያሻሽሉ"</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"የአካባቢ ምንጮች"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"የሕግ መረጃ፣ኹነታ፣ የሶፍትዌር ሥሪት እይ"</string>
<string name="legal_information" msgid="5769301644270604095">"የህግ መረጃ"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"ሁሉንም <xliff:g id="COUNT">%1$d</xliff:g> መተግበሪያዎች ይመልከቱ"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"የእርስዎ ጡባዊ እና የግል ውሂብ ባልታወቁ መተግበሪያዎች ለሚፈጸም ጥቃት ይበልጥ ተጋላጭ ናቸው። ከዚህ ምንጭ የመጡ መተግበሪያዎችን በመጫን እነሱን በመጠቀምዎ በጡባዊዎ ላይ ለሚከሰት ማንኛውም ጉዳት ወይም ለውሂብ መጥፋት ኃላፊነቱን የሚወስዱት እርስዎ መሆኑን ተስማምተዋል።"</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"የእርስዎ ስልክ እና የግል ውሂብ ባልታወቁ መተግበሪያዎች ለሚፈጸም ጥቃት ይበልጥ ተጋላጭ ናቸው። ከዚህ ምንጭ የመጡ መተግበሪያዎችን በመጫን እነሱን በመጠቀምዎ በስልክዎ ላይ ለሚከሰት ማንኛውም ጉዳት ወይም ለውሂብ መጥፋት ኃላፊነቱን የሚወስዱት እርስዎ መሆኑን ተስማምተዋል።"</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"የእርስዎ መሣሪያ እና የግል ውሂብ ባልታወቁ መተግበሪያዎች ለሚፈጸም ጥቃት ይበልጥ ተጋላጭ ናቸው። ከዚህ ምንጭ የመጡ መተግበሪያዎችን በመጫን እነሱን በመጠቀምዎ በመሣሪያዎ ላይ ለሚከሰት ማንኛውም ጉዳት ወይም የውሂብ መጥፋት ኃላፊነቱን የሚወስዱት እርስዎ መሆኑን ተስማምተዋል።"</string>
<string name="advanced_settings" msgid="1777249286757067969">"የላቁ ቅንብሮች"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"ተጨማሪ የቅንብሮች አማራጮች ያንቁ"</string>
<string name="application_info_label" msgid="5736524913065714880">"የመተግበሪያ መረጃ"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"በአፈጻጸም ላይ ተጽዕኖ ሊኖረው ይችላል"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ጠቋሚ መንቀሳቀስ ካቆመ በኋላ ጠቅ ማድረግ"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ጠቅ ከማድረግ በፊት መዘግየት"</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_summary_state_enabled" msgid="8359913912320966304">"በርቷል"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ጠፍቷል"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"በፈጣን ቅንብሮች ውስጥ አሳይ"</string>
@@ -1987,7 +2015,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> ይቀራል"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"ለመሙላት <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ይቀረዋል"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"የበስተጀርባ እንቅስቃሴ"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"ተገድቧል"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"መተግበሪያው በበስተጀርባ እንዲሄድ ይፍቀዱለት።"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"መተግበሪያው ስራ ላይ ባልሆነበት ጊዜ የጀርባ እንቅስቃሴ ማሄድ ይችላል"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"መተግበሪያው ስራ ላይ ባልሆነበት ጊዜ የጀርባ እንቅስቃሴው የተገደበ ነው"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"ባትሪ በጥሩ አቋም ላይ ነው"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"መተግበሪያዎች በጤናማነት እየሠሩ ነው"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ዝቅተኛ የባትሪ አቅም"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ባትሪ ጥሩ የባትሪ ዕድሜን ሊሰጥ አይችልም"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"ዘመናዊ የባትሪ አስተዳዳሪን ያብሩ"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"የባትሪ አጠቃቀምን ለማትባት ያብሩ"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"የባትሪ ሁነታን አብራ"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"የእርስዎን የባትሪ ዕድሜ ያራዝሙ"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"ዝቅተኛ ባትሪ ሁነታ በርቷል"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"አንዳንድ ባህሪያት የተገደቡ ናቸው"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ስልክ በጣም ጫን ባለ መልኩ ሥራ ላይ ውሏል"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ጡባዊ በጣም ጫን ባለ መልኩ ሥራ ላይ ውሏል"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"መሣሪያው በጣም ጫን ባለ መልኩ ሥራ ላይ ውሏል"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"ከመጨረሻው ሙሉ ኃይል ከተሞላለት ወዲህ <xliff:g id="HOUR">%1$s</xliff:g> ሥራ ላይ ውሏል"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"የእርስዎ ስልክ በጣም ጫን ባለ መልኩ ሥራ ላይ ውሏላ እና ይሄ ብዙ ባትሪ ፈጅቷል። የእርስዎ ባትሪ መደበኛ የሆነ ሥራ ነው እየሠራ ያለው።\n\n የእርስዎ መሣሪያ ሙሉ ኃይል ከተሞላለት ወዲህ ለ<xliff:g id="HOUR">%1$s</xliff:g> ሥራ ላይ ውሏል።\n\n ጠቅላላ አጠቃቀም፦"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"የእርስዎ ጡባዊ በጣም ጫን ባለ መልኩ ሥራ ላይ ውሏላ እና ይሄ ብዙ ባትሪ ፈጅቷል። የእርስዎ ባትሪ መደበኛ የሆነ ሥራ ነው እየሠራ ያለው።\n\n የእርስዎ መሣሪያ ሙሉ ኃይል ከተሞላለት ወዲህ ለ<xliff:g id="HOUR">%1$s</xliff:g> ሥራ ላይ ውሏል።\n\n ጠቅላላ አጠቃቀም፦"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"የእርስዎ መሣሪያ በጣም ጫን ባለ መልኩ ሥራ ላይ ውሏላ እና ይሄ ብዙ ባትሪ ፈጅቷል። የእርስዎ ባትሪ መደበኛ የሆነ ሥራ ነው እየሠራ ያለው።\n\n የእርስዎ መሣሪያ ሙሉ ኃይል ከተሞላለት ወዲህ ለ<xliff:g id="HOUR">%1$s</xliff:g> ሥራ ላይ ውሏል።\n\n ጠቅላላ አጠቃቀም፦"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"የዘመናዊ ባትሪ አስተዳዳሪ"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"ባትሪን በራስ-ሰር አስተዳድር"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"በመተግበሪያዎች አጠቃቀም ላይ በመመስረት የኃይል አጠቃቀምን በራስ-ሰር አስተካክል"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"የተገደቡ መተግበሪያዎች"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d መተግበሪያዎች</item>
+ <item quantity="other">%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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"ማህደረ መረጃ አገልጋይ"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"የመተግበሪያ ማትባት"</string>
<string name="battery_saver" msgid="8172485772238572153">"ባትሪ ቆጣቢ"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"የባትሪ ቆጣቢን ተጠቀም"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"በራስ ሰር አብራ"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"በፍፁም"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> ባትሪ ላይ"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"አስምር በአሁኑጊዜ ችግር እየገጠመው ነው። ከአፍታ ቆይታ በኋላ ይመለሳል።"</string>
<string name="add_account_label" msgid="7811707265834013767">"መለያ አክል"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"የስራ መገለጫ ገና አይገኝም"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"የሥራ ሁነታ"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"የሥራ መገለጫ፣ መተግበሪያዎችን፣ የበስተጀርባ ሥምረት እና ተዛማጅ ባህሪዎችን ጨምሮ ይፍቀዱ"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"የስራ መገለጫ አስወግድ"</string>
<string name="background_data" msgid="5779592891375473817">"ዳራ ውሂብ"</string>
<string name="background_data_summary" msgid="8328521479872763452">"መተግበሪያዎች በማንኛውም ሰዓት ማመሳሰል፣ መላክ፣ እና ውሂብ መቀበል ይችላሉ።"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"መለያ አስወግድ?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ይህን መለያ ማስወገድ ሁሉንም መልዕክቶቹን፣ እውቂያዎቹን፣ እና ከጡባዊው ውስጥ ሌላ ውሂብ ይሰርዛል!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ይህን መለያ ማስወገድ ሁሉንም መልዕክቶቹን፣ እውቂያዎቹን፣ እና ከስልኩ ውስጥ ያለ ሌላ ውሂብን ይሰርዛል!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"ይህን መለያ ማስወገድ ሁሉንም መልዕክቶቹ፣ እውቂያዎቹ እና ሌላ ውሂቡ ከስልኩ ላይ ይሰርዛቸዋል!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"ይህ ለውጥ በአስተዳዳሪዎ አይፈቀድም"</string>
<string name="provider_label" msgid="7724593781904508866">"ምዝገባዎችላይ ተጫን"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="one">የእውቅና ማረጋገጫዎችን ይፈትሹ</item>
<item quantity="other">የእውቅና ማረጋገጫዎችን ይፈትሹ</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"ተጠቃሚዎች"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"ተጠቃሚዎች እና መገለጫዎች"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ተጠቃሚ ወይም መገለጫ አክል"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"ተጠቃሚ አክል"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ብሉቱዝ፣ Cast"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"መተግበሪያዎች እና ማሳወቂያዎች"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ፈቃዶች፣ ነባሪ መተግበሪያዎች"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"ተጠቃሚዎች እና መለያዎች"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"አትረብሽ፣ አቋርጥ፣ ማቋረጥ፣ እረፍት"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"አቅራቢያ፣ አካባቢ፣ ታሪክ፣ ሪፖርት ማድረግ"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"ትክክለኝነት"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"መለያ"</string>
<string name="keywords_users" msgid="3434190133131387942">"ገደብ፣ ገድብ፣ የተገደበ"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"የጽሑፍ እርማት፣ ትክክል፣ ድምፅ፣ ንዘር፣ ራስ-ሰር፣ ቋንቋ፣ የጣት ምልክት፣ ጠቁም፣ የአስተያየት ጥቆማ፣ ገጽታ፣ የሚያስከፋ፣ ቃል፣ ተይብ፣ ስሜት ገላጭ ምስል፣ አለምአቀፍ"</string>
@@ -2872,6 +2924,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ደንቦች</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"አይረብሹ"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"አትረብሽን አብራ"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ባህሪ"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ከዚህ የመጡ ድምጾችን እና ንዝረቶችን ፍቀድ፦"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ምንም ድምፅ የለም"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"በራስ-ሰር አብራ"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"ራስ-ሰር ደንቦች"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"ራስ-ሰር ደንብ"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"የአትረብሽ ደንቦችን ያቀናብሩ"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"በተወሰኑ ጊዜዎች ላይ ድምጾችን እና ንዝረቶችን ገድብ"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"ሙሉ ለሙሉ ጸጥታ"</string>
@@ -2890,12 +2946,15 @@
<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_add" msgid="90014394953272517">"አክል"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"አሁን አብራ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"አሁን አጥፋ"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"አብራ"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"አሁን አብራ"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"አሁን አጥፋ"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"አትረብሽ እስከ <xliff:g id="FORMATTED_TIME">%s</xliff:g> ድረስ በርቷል"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"አትረብሽ እርስዎ እስከሚያጠፉት ድረስ እንደበራ ይቆያል"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"አትረብሽ በደንብ <xliff:g id="RULE_NAME">%s</xliff:g> በራስ-ሰር በርቷል"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"አትረብሽ በአንድ መተግበሪያ (<xliff:g id="APP_NAME">%s</xliff:g>) በራስ-ሰር በርቷል"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"ቅድሚያ የሚሰጠው ብቻ"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>። <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2970,7 @@
<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="recent_notifications" msgid="5660639387705060156">"በቅርቡ የተላኩ"</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>
@@ -2930,7 +2990,7 @@
<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_importance_title" msgid="848692592679312666">"አስፈላጊነት"</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="5455049524984686275">"ምንም ድምፅ ወይም የሚታይ ትርጉም የለም"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"መካከለኛ አስፈላጊነት"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"የማሳወቂያ መዳረሻ"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"የስራ መገለጫ ማሳወቂያዎች መዳረሻ ታግዷል"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"የአትረብሽ መዳረሻ"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"ምንም የተጫኑ መተግበሪያዎች የተጠየቀው አትረብሽ መዳረሻ የላቸውም"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"መተግበሪያዎችን በመጫን ላይ..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android የዚህ መተግበሪያ ማሳወቂያዎች በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android የዚህ መተግበሪያ ምድብ በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ይህን የማሳወቂያዎች ቡድን በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"በጥያቄዎ መሠረት Android የዚህ መተግበሪያ ማሳወቂያዎች በዚህ መሣሪያ ላይ እንዳይታዩ እያገደ ነው"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"በጥያቄዎ መሠረት Android ይህ የማሳወቂያዎች ምድብ በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"በጥያቄዎ መሠረት Android ይህን የማሳወቂያዎች ስብስብ በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
<string name="notification_channels" msgid="5346841743182627500">"ምድቦች"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"ሌላ"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"መሣሪያዎን ለመክፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ይለፍ ቃል እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\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="1793719723017395175">"አዎ"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"አይ"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ፒን ይጠየቅ?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ስርዓተ-ጥለት ይጠየቅ?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"የይለፍ ቃል ይጠየቅ?"</string>
@@ -3254,8 +3317,8 @@
<string name="high_power_off" msgid="3393904131961263278">"የባትሪ አጠቃቀምን አትባ"</string>
<string name="high_power_system" msgid="7362862974428225301">"የባትሪ ማትባት አይገኝም"</string>
<string name="high_power_desc" msgid="6283926163708585760">"የባትሪ ማትባትን አትተግብር። ባትሪዎን በበለጠ ፍጥነት ሊጨርሰው ይችላል።"</string>
- <string name="high_power_prompt_title" msgid="6358673688590282655">"መተግበሪያው ሁልጊዜ በጀርባ ውስጥ ያሄድ?"</string>
- <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> ሁልጊዜ በጀርባ ውስጥ እንዲያሄድ መፍቀድ የባትሪ ህይወት ሊቀንስ ይችላል። \n\nይህን በኋላ ላይ በቅንብሮች > መተግበሪያዎች & ማሳወቂያዎች ውስጥ መቀየር ይችላሉ።"</string>
+ <string name="high_power_prompt_title" msgid="6358673688590282655">"መተግበሪያው ሁልጊዜ በጀርባ ውስጥ ይሂድ?"</string>
+ <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> ሁልጊዜ በጀርባ ውስጥ እንዲያሄድ መፍቀድ የባትሪ ህይወት ሊቀንስ ይችላል። \n\nይህን በኋላ ላይ በቅንብሮች ፤ መተግበሪያዎች እና ማሳወቂያዎች ውስጥ መቀየር ይችላሉ።"</string>
<string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ከመጨረሻው ሙሉ ኃይል መሙላት በኋላ አጠቃቀም"</string>
<string name="battery_power_management" msgid="5571519699679107523">"የኃይል አስተዳደር"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"ከመጨረሻው ሙሉ ኃይል መሙላት በኋላ ምንም የባትሪ አጠቃቀም የለም"</string>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"የአሁኑ ተጠቃሚ፦ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"እንደ <xliff:g id="USER_NAME">%1$s</xliff:g> ሆነው ገብተዋል።"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ነባሪ ነው"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"በርቷል / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ጠፍቷል"</string>
<string name="backup_disabled" msgid="485189128759595412">"ምትኬ ተሰናክሏል"</string>
<string name="about_summary" msgid="924181828102801010">"ወደ Android <xliff:g id="VERSION">%1$s</xliff:g> ተዘምኗል"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"ምትኬዎችን ማጥፋት አይቻልም"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"ይህ እርምጃ ተሰናክሏል። ተጨማሪ ለማወቅ የድርጅትዎን አስተዳዳሪ ያነጋግሩ።"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"ተጨማሪ ዝርዝሮች"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"የእርስዎ አስተዳዳሪ ቅንብሮችን፣ ፈቃዶችን፣ የኮርፖሬት መዳረሻን፣ የአውታረ መረብ እንቅስቃሴን እና የመሣሪያዎ አካባቢያዊ መረጃን ጨምሮ ከእርስዎ የስራ መገለጫ ጋር የተጎዳኙ መተግበሪያዎችን እና ውሂብን መከታተል እና ማቀናበር ይችላል።"</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"የሥራ መገለጫ ጠፍቷል"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"መተግበሪያዎች፣ የበስተጀርባ ሥምረት፣ እና ሌሎች ከእርስዎ የሥራ መገለጫ ጋር የተገናኙ ባህሪዎች ጠፍተዋል።"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"የማታ ብርሃት መርሐግብርን ያዘጋጁ"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"እንዲተኙ ለማገዝ ለማያ ገጹ ብርቱካናማ ቅልም ይስጡት።"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"የምሽት ብርሃን በርቷል"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ተጨማሪ"</string>
@@ -3537,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"ምንም"</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>
@@ -3559,31 +3628,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ከበርካታ መሣሪያዎች ጋር ተገናኝቷል"</string>
<string name="demo_mode" msgid="2798762752209330277">"የስርዓት ተጠቃሚ በይነገጽ ማሳያ ሁነታ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"የፈጣን ቅንብሮች ገንቢ ሰድሮች"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"እርስዎን ለመርዳት እዚህ እንገኛለን"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"እዚህ ላይ 24/7 ለእርስዎ እንገኛለን"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"እዚህ 24/7 ለእርስዎ እንገኛለን"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"ማንኛውም ችግር ለመፍታት ለማገዝ የድጋፍ ቡድናችን እዚህ አለ"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"የድጋፍ ቡድናችን ሙሉ ቀን፣ በየቀኑ እዚህ ነው"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"እገዛ ውስጥ ይፈልጉ ወይም በድጋፍ ሰዓቶች (አካባቢያዊ ሰዓት) ጊዜ ተመልሰው ይምጡ፦<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"የስልክ ድጋፍ ሰዓቶች (አካባቢያዊ ሰዓት)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"እርዳታ ይፈልጉ ወይም ጠቃሚ ምክሮችን እና ዘዴዎችን ያስሱ"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"ድጋፍ ለ፦"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"ወደ ውጭ አገር ሊጓዙ ነው?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"አለምአቀፍ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"ስልክ"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"ውይይት"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ጠቃሚ ምክሮችን እና ዘዴዎችን አስስ"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"እገዛን ፈልግ እና ግብረመልስ ላክ"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"የእውቂያ ድጋፍ"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"ግባ"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"መግባት አልቻሉም?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"የሥርዓት መረጃን ላክ"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ዳግም አታሳይ"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"እንደሚከተለው በመጠየቅ ላይ"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"መለያ ያክሉ"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"የሥርዓት መረጃ"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"መስኮት መከታተያ"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"የላይ ሽፋን መከታተያ"</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>
@@ -3599,11 +3645,11 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ሰከንዶች</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ሰከንዶች</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> ይጠብቁ"</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="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>
@@ -3614,32 +3660,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ለካሜራ የኃይል አዝራሩን ሁለቴ ይጫኑ"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"ለራስ ፎቶ ሁነታ ስልክን ሁለቴ ጠምዘዝ ያድርጉ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"ለራስ ፎቶ ሁነታ ጡባዊን ሁለቴ ጠምዘዝ ያድርጉ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"ለራስ ፎቶ ሁነታ መሣሪያን ሁለቴ ጠምዘዝ ያድርጉ"</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_suggestion_summary" msgid="5987443721392571847">"ማያ ገጽ በሚጠፋበት ጊዜ ማሳወቂያዎችን ይፈትሹ"</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_pickup_suggestion_summary" msgid="7014700589991761035">"ማያ ገጽ በሚጠፋበት ጊዜ ማሳወቂያዎችን ይፈትሹ"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"የእርስዎን ማሳወቂያዎች ለመፈተሽ በመሣሪያዎ ጀርባ ላይ ባለው የጣት አሻራ ዳሳሽ ላይ ወደ ታች ጠረግ ያድርጉት"</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"ማሳወቂያዎችን በፍጥነት ይመልከቱ"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"በጣት አሻራ ዳሳሹ ላይ ወደ ታች ያንሸራትቱ"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"በርቷል"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"ጠፍቷል"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ማስነሻ አስቀድሞ ተከፍቷል"</string>
@@ -3769,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"የማውጫ መዳረሻ"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"የማውጫ መዳረሻ"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index e75af41..c3e76e7 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Düyməyə basın"</item>
<item msgid="1624323946324499595">"Eynisəviyyəli cihazdan PIN"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 saat"</item>
<item msgid="5198271470953124739">"Heç vaxt taym aut olmasın"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (Defolt)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Keyfiyyətsiz"</item>
<item msgid="2042505933058940139">"Zəif"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 gündən köhnədir"</item>
<item msgid="5692284879054004388">"90 gündən köhnədir"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Şəbəkə tərcihindən istifadə edin"</item>
+ <item msgid="8745603368609022803">"Limitli olaraq qəbul edin"</item>
+ <item msgid="2266114985518865625">"Limitisiz olaraq qəbul edin"</item>
+ </string-array>
</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index ba5034e..3490173 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Cihazlarınız"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yeni cihazı qoşalaşdırın"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Qoşalaşdırmaq və bluetooth cihazlarına qoşulmaq üçün cihaza icazə verin"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Diapazon daxili zəngi deaktiv edin"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Bluetooth qulaqlığında fərdi telefon zənglərini oxutmayın"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Tarix ayarlayın"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Əlifba üzrə sırala"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Vaxt zonasına görə sırala"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> tarixindən başlayır."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Yay vaxtı"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Standart vaxt"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Bölgə üzrə saat qurşağı"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Sabit saat qurşaqları"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Tarix"</string>
<string name="time_picker_title" msgid="483460752287255019">"Vaxt"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Avtomatik kilidləyin"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Ekran mesajını kilidləyin"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Vidcetləri aktivləşdirin"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Admin tərəfindən deaktiv edildi"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Kilid seçimini göstərin"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Təkmilləşdirilmiş giriş və barmaq izi kilidini deaktiv edən yandırıb söndürmə düyməsini göstərin."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Heç biri"</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">"Məs., İlkin Santak."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profil info"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Hesablar"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Yer"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Məkan istifadə edin"</string>
<string name="account_settings_title" msgid="626177544686329806">"Hesablar"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Təhlükəsizlik & yeri"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Şifrələmə və kredensiallar"</string>
@@ -459,9 +469,11 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Daxil etdiyiniz parol düzgündür, lakin datanız zədəlidir. \n\nPlanşeti istifadə etməyə davam etmək üçün zavod sıfırlaması etməlisiniz. Sıfırlanandan sonra Google Hesabınızda yedəklənmiş istənilən datanı bərpa edə bilərsiniz."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Daxil etdiyiniz parol düzgündür, lakin datanız zədəlidir. \n\nTelefonu istifadə etməyə davam etmək üçün zavod sıfırlaması etməlisiniz. Sıfırlanandan sonra Google Hesabınızda yedəklənmiş istənilən datanı bərpa edə bilərsiniz."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Daxiletmə metoduna keç"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Ekran kilidini quraşdırın"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Cihazınızı qoruyun"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Barmaq izini istifadə edin"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Ekran kilidi ayarlayın"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Digərlərinin planşetinizi istifadə etməsinə mane olun"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Digərlərinin cihazınızı istifadə etməsinə mane olun"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Digərlərinin telefonunuzu istifadə etməsinə mane olun"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Barmaq izi ilə kiliddən çıxarın"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Barmaq iziniz ilə kilidi açın"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran kilidi seçin"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"İş kilidi seçin"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Spikerfon telefon kimi"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiqi və media üçün"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ayarları yadda saxlayın"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimum qoşulmuş Bluetooth audio cihazı"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Maksimum sayda qoşulmuş Bluetooth audio cihazları seçin"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Yayım"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Naqilsiz displeyi aktivləşdirin"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Yaxınlıqda heç bir cihaz tapılmadı."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Ad"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Giriş"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi yandırmaq istəyir"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi söndürmək istəyir"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi yandırın"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fi istifadə edin"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi ayarları"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Simzis giriş nöqtələrini quraşdırın və idarə edin"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Parol"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Parolu göstər"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP Band Seçin"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Avtomatik"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz Band"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz Band"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP parametrləri"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mövcuddur)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Şəbəkə parolunuzu daxil edin"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi şəbəkəsi"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> vasitəsilə qoşulun"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> vasitəsilə qoşulun"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Yerləşmə dəqiqliyini təkmilləşdirmək və digər məqsədlər üçün Wi-Fi qapalı olsa da belə <xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqi şəbəkə skanını yandırmaq istəyir. \n \n Skan etmək istəyən bütün tətbiqlərə icazə verilsin?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Bunu söndürmək üçün daşma menyuda Qabaqcıl bölməsinə daxil olun."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"İcazə verin"</string>
@@ -909,10 +926,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Digər cihazlara Wi‑Fi şəbəkəsi yaratmaq üçün hotspot istifadə edin. Hotspot mobil data bağlantısından istifadə edərək internet təmin edir. Əlavə mobil data xərcləri tətbiq edilə bilər."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Tətbiq yaxınlıqdakı cihazlarla kontenti paylaşmaq üçün hotspot yarada bilər."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Hotspotu avtomatik deaktiv edin"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Heç bir cihaz qoşulu olmazsa, Wi‑Fi hotspot\'u deaktiv ediləcək"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot yandırılır..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot söndürülür…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktivdir"</string>
@@ -923,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi zəngi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi Zəngini aktiv edin"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Wi-Fi əvəzinə mobil şəbəkə istifadə edin"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Wi-Fi ilə zəng edərək əhatəni genişləndirin"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Çağrı tərcihi"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi çağrı rejimi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Roaminq seçimi"</string>
@@ -961,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Fövqəladə Ünvan"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi vasitəilə təcili zəng etdiyiniz zaman məkanınız kimi istidafə edilir"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"Fərdi DNS funksiyaları haqqında "<annotation id="url">"ətraflı məlumat"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"Göstər"</string>
<string name="sound_settings" msgid="5534671337768745343">"Səs"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Həcmlər"</string>
@@ -1175,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Mobil şəbəkə növü"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Operator infosu"</string>
<string name="status_data_state" msgid="5503181397066522950">"Mobil şəbəkə durumu"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Xidmət durumu"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Siqnal gücü"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaminq"</string>
@@ -1308,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Yeni <xliff:g id="NAME">^1</xliff:g> cihazınız işləyir. \n\nFotoları, faylları və tətbiq datasını bu cihaza daşımaq üçün Ayarlar və Yaddaş Ehtiyatı bölməsinə keçin."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> daşıyın"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> və onun datasının <xliff:g id="NAME_0">^2</xliff:g> üzərinə daşınması bir neçə dəqiqə vaxt alacaq. Daşınma tamamlanmamış tətbiqləri işlədə bilməyəcəksiniz. \n\nDaşınma müddəti ərzində <xliff:g id="NAME_1">^2</xliff:g> çıxarılmamalıdır."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Datanı köçürmək üçün <xliff:g id="APP">^1</xliff:g> tətbiqini kiliddən çıxarın."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> daşınır…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Daşınma zamanı <xliff:g id="NAME">^1</xliff:g> silinməməlidir. \n\nDaşınma tamamlanmamış bu cihazdakı <xliff:g id="APP">^2</xliff:g> tətbiqi əlçatan olmayacaq."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Daşınmanı ləğv edin"</string>
@@ -1360,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Şəbəkə, tətbiqlər və ya cihazı sıfırlamaq mümkündür"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, mobil və Bluetooth\'u sıfırlayın"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Bununla bütün şəbəkə ayarları sıfırlanacaq, bura daxildir:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobil data"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"eSIM-ləri də sıfırlayın"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Telefondakı bütün eSIM-ləri silin. eSIM-ləri yenidən endirmək üçün operatorla razılığa gəlməlisiniz. Bununla mobil xidmət planı ləğv edilməyəcək."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Ayarları sıfırlayın"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Bütün şəbəkə ayarları sıfırlansın? Bu əməliyyatı geri qaytara bilməzsiniz!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Ayarları sıfırlayın"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Sıfırlansın?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Şəbəkə sıfırlaması bu istifadəçi üçün əlçatan deyil"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Şəbəkə ayarları sıfırlandı"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM-ləri sıfırlamaq alınmadı"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM-lər xəta səbəbilə sıfırlana bilmədi."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Bütün datanı silin (fabrika sıfırlaması)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Bu, planşetinizdən bunları siləcək: "<b>"daxili yaddaş"</b>", həmçinin:\n\n"<li>"Google hesabınızı"</li>\n<li>"Sistem və tətbiq data və ayarlarını"</li>\n<li>"Endirilmiş tətbiqləri"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Bu telefonunuzun "<b>"daxili yaddaşından"</b>" bütün datanı siləcək, bura daxildir: \n\n"<li>"Google hesabınız"</li>\n<li>"Sistem və tətbiq məlumatları və parametrləri"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Hazırda bu hesablara daxil olmusunuz:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu cihazda başqa istifadəçilər iştirak edir.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiqi"</li>\n<li>"Fotolar"</li>\n<li>"Digər istifadəçi datası"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM operatorları"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM-lər"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Bununla mobil xidmət planı ləğv edilməyəcək."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Həmçinin musiqi, şəkil və digər istifadəçi datası təmizləmək üçün "<b>"USB yaddaşı"</b>" silinməlidir."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musiqi, şəkil, və digər istifadəçi datasını silmək üçün "<b>"SD kartı"</b>" təmizləmək lazımdır."</string>
@@ -1432,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Lütfən. internetə qoşulun"</string>
<string name="location_title" msgid="1029961368397484576">"Mənim yerləşməm"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"İş profili üçün yer"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Rejim"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Yüksək dəqiqlik"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batareyaya qənaət"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Yalnız cihaz"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Məkan deaktiv"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Tətbiq səviyyəsi icazələri"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Son məkan sorğuları"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Son vaxtlar heç bir tətbiq tərəfindən məkan sorğusu olmayıb"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Məkan xidmətləri"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Çox batareya istifadəsi"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Az batareya istifadəsi"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Məkan rejimi"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Məkanı aşkarlamaq üçün GPS, Wi‑Fi, Bluetooth və ya mobil şəbəkə istifadə edin"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Məkanı aşkarlamaq üçün Wi‑Fi, Bluetooth və ya mobil şəbəkə istifadə edin"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Məkanı müəyyən etmək üçün GPS və cihaz sensoru istifadə edin"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Skan edilir"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi skan edilir"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Sistem tətbiq və xidmətlərinə Wi-Fi şəbəkələrini hər zaman aşkar etməyə icazə verməklə məkanı təkmilləşdirin."</string>
@@ -1468,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Məkan mənbələri"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Planşet haqqında"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Telefon haqqında"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Cihaz haqqında"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Oxşar cihaz haqqında"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Hüquqi məlumata, statusa, proqram versiyasına baxın"</string>
<string name="legal_information" msgid="5769301644270604095">"Hüquqi məlumat"</string>
@@ -1575,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Bütün <xliff:g id="COUNT">%1$d</xliff:g> tətbiqə baxın"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Planşet və şəxsi datanız naməlum tətbiqlərin hücumuna qarşı daha həssasdır. Bu mənbədən tətbiq quraşdırmaqla planşetinə dəyə biləcək zərər və ya həmin tətbiqlərin istifadəsi nəticəsində baş verən data itkisinə görə məsuliyyət daşıdığınızı qəbul edirsiniz."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon və şəxsi datanız naməlum tətbiqlərin hücumuna qarşı daha həssasdır. Bu mənbədən tətbiq quraşdırmaqla telefona dəyə biləcək zərər və ya həmin tətbiqlərin istifadəsi nəticəsində baş verən data itkisinə görə məsuliyyət daşıdığınızı qəbul edirsiniz."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Cihaz və şəxsi datanız naməlum tətbiqlərin hücumuna qarşı daha həssasdır. Bu mənbədən tətbiq quraşdırmaqla cihaza dəyə biləcək zərər və ya həmin tətbiqlərin istifadəsi nəticəsində baş verən data itkisinə görə məsuliyyət daşıdığınızı qəbul edirsiniz."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Qabaqcıl ayarlar"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Daha çox parametr seçimlərini aktiv edin"</string>
<string name="application_info_label" msgid="5736524913065714880">"Tətbiq info"</string>
@@ -1874,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Performansa təsir edə bilər"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Göstərici hərəkəti dayandırdıqdan sonra klikləyin"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Klikləmədən əvvəl gözləyin"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"AKTİV"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DEAKTİV"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Sürətli Ayarlarda Göstər"</string>
@@ -1987,7 +2005,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> qalır"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"Şarjın bitməsinə var: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Arxa fon fəaliyyəti"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Məhdudlaşdırılmış"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Tətbiqin arxa fonda işləməsinə icazə verin"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"İstifadə edilmədiyi zaman tətbiq arxa fonda işləyə bilər"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"İstifadə edilmədiyi zaman tətbiqin arxa fon fəaliyyəti məhduddur"</string>
@@ -2030,14 +2048,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Batareya istifadəyə yararlıdır"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Tətbiqlər düzgün işləmir"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Zəif batareya tutumu"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batareya azdır"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Ağıllı batareya menecerini aktiv edin"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Batareya istifadəsini optimallaşdırmaq üçün aktiv edin"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"\"Zəif Batareya\" Rejimini aktiv edin"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Batareya istifadəsini artırın"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"\"Zəif Batareya\" Rejimi aktivdir"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Bəzi funksiyalar məhduddur"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefon çox istifadə edilib"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Planşet çox istifadə edilib"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Cihaz çox istifadə edilib"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Ən son tam doldurmadan sonra təxminən <xliff:g id="HOUR">%1$s</xliff:g> istifadə edildi"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Telefon həddindən artıq istifadə edildiyinə görə batareya çox sərf edilib. Batareya düzgün işləmir.\n\n Ən son tam doldurulmadan sonra cihaz təxminən <xliff:g id="HOUR">%1$s</xliff:g> istifadə edilib.\n\n Ümumi istifadə:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Planşet həddindən artıq istifadə edildiyinə görə batareya çox sərf edilib. Batareya düzgün işləmir.\n\n Ən son tam doldurulmadan sonra cihaz təxminən <xliff:g id="HOUR">%1$s</xliff:g> istifadə edilib.\n\n Ümumi istifadə:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Cihaz həddindən artıq istifadə edildiyinə görə batareya çox sərf edilib. Batareya düzgün işləmir.\n\n Ən son tam doldurulmadan sonra cihaz təxminən <xliff:g id="HOUR">%1$s</xliff:g> istifadə edilib.\n\n Ümumi istifadə:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Ağıllı batareya meneceri"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Batareyanın avtomatik idarə edilməsi"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"İstifadəyə əsasən batareya istifadəsini tətbiqlərə görə avtomatik ayarlayın"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Məhdudlaşdırılmış tətbiqlər"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d tətbiq</item>
+ <item quantity="one">%1$d tətbiq</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Tətbiq dayandırılsın?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefon batareya istifadəsini normal idarə edə bilmir, çünki <xliff:g id="APP">%1$s</xliff:g> telefonu oyaq saxlamağa davam edir.\n\nBu problemi həll etmək üçün tətbiqi dayandıra bilərsiniz.\n\nProblem baş verməyə davam edərsə, batareya performansını yaxşılaşdırmaq üçün tətbiqi sistemdən silməyiniz tələb edilə bilər."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Planşet batareya istifadəsini normal idarə edə bilmir, çünki <xliff:g id="APP">%1$s</xliff:g> planşeti oyaq saxlamağa davam edir.\n\nBu problemi həll etmək üçün tətbiqi dayandıra bilərsiniz.\n\nProblem baş verməyə davam edərsə, batareya performansını yaxşılaşdırmaq üçün tətbiqi sistemdən silməyiniz tələb edilə bilər."</string>
@@ -2146,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Tətbiq optimallaşdırması"</string>
<string name="battery_saver" msgid="8172485772238572153">"Batareya Qənaəti"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Batareya Qənaətindən istifadə edin"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Avtomatik aktivləşdir"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Heç vaxt"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya"</string>
@@ -2333,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Hazırda sinxronizasiyada problemlər var. Bir azdan sonra düzələcək."</string>
<string name="add_account_label" msgid="7811707265834013767">"Hesab əlavə edin"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"İş profili hələ əlçatan deyil"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"İş rejimi"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Tətbiq, arxa fon sinxronizasiyası və digər əlaqədar xüsusiyyətlər daxil olmaqla iş profilinin fəaliyyətinə icazə verin"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"İş profili"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Təşkilatınız tərəfindən idarə olunur"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Tətbiq və bildirişlər deaktivdir"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"İş profilini silin"</string>
<string name="background_data" msgid="5779592891375473817">"Fon datası"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Tətbiqlər istənilən vaxt datanı sinxronlaşdıra, göndərə və qəbul edə bilər"</string>
@@ -2366,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Hesab silinsin?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Bu hesabın silinməsi bütün mesajları, kontaktları və digər datanı planşetinizdən siləcək"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Bu hesabın silinməsi həmçinin bütün mesajların, kontaktların və digər datanın telefondan silinməsi ilə müşayət olunacaq!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Bu hesabın silinməsi bütün mesajları, kontaktları və digər datanı cihazdan siləcək!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Admin bu dəyişikliyə icazə vermir"</string>
<string name="provider_label" msgid="7724593781904508866">"Abunələrə basın"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2622,8 @@
<item quantity="other">Sertifikatları yoxlayın</item>
<item quantity="one">Sertifikatı yoxlayın</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"İstifadəçilər"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"İstifadəçilər və profillər"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"İstifadəçi və ya profil əlavə edin"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"İstifadəçi əlavə edin"</string>
@@ -2774,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Yayım"</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="account_dashboard_title" msgid="4936890821712178853">"İstifadəçi və hesab"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"narahat etməyin, bölməyin, bölmək, fasilə"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"yaxınlıqda, məkan, tarixçə, hesabat vermək"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"səliqə"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"hesab"</string>
<string name="keywords_users" msgid="3434190133131387942">"məhdudiyyət, məhdudlaşma, məhdudlaşıb"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"mətn düzəlişi, bağlantı, səs, titrəyiş, avtomatik, dil, jest, təklif etmək, təklif, tema, incidici, söz, növ, emosiya işarəsi, beynəlxalq"</string>
@@ -2872,6 +2911,7 @@
<item quantity="one">1 qayda</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Narahat Etməyin"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"\"Narahat Etməyin\" rejimini aktiv edin"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Davranış"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Səslərə, vibrasiyalara icazə verin"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Səs yoxdur"</string>
@@ -2881,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Avtomatik aktiv edin"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Avtomatik qaydalar"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Avtomatik qayda"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\"Narahat etməyin\" ayarlayın"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Səs və vibrasiyanı məhdud edin"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Müəyyən vaxtlarda telefonu səssiz edin"</string>
+ <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"\"Narahat etməyin\" qaydaları ayarlayın"</string>
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Qaydadan istifadə edin"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Yalnız prioritet"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Yalnız alarmlar"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Tam sakitlik"</string>
@@ -2890,12 +2931,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Vizual fəsadları blok edin"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Görünən siqnallara icazə verin"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Əlavə edin"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"İNDİ AKTİV EDİN"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"İNDİ DEAKTİV EDİN"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Aktiv edin"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"İndi aktiv edin"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"İndi deaktiv edin"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Narahat Etməyin rejimi <xliff:g id="FORMATTED_TIME">%s</xliff:g> olana qədər aktivdir"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Narahat Etməyin rejimi deaktiv edilənə qədər aktiv qalacaq"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Narahat Etməyin rejimi <xliff:g id="RULE_NAME">%s</xliff:g> tərəfindən avtomatik aktiv edildi"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Narahat Etməyin rejimi <xliff:g id="APP_NAME">%s</xliff:g> tərəfindən avtomatik aktiv edildi"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Yalnız prioritet"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"İş profili səsləri"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Şəxsi profil səslərini istifadə edin"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"İş və şəxsi profil səsləri eynidir"</string>
@@ -2911,6 +2955,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Zəng səsləri"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Digər səs və vibrasiyalar"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Bildirişlər"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Ən son göndərilənlər"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Qabaqcıl"</string>
<string name="profile_section_header" msgid="2320848161066912001">"İş bildirişləri"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Bildiriş nöqtələrinə icazə verin"</string>
@@ -2930,7 +2975,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Tətbiq bildirişləri"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Bildiriş kateqoriyası"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Bildiriş kateqoriyasının qrupu"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Əhəmiyyət"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Davranış"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Səsə icazə verin"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Bildirişləri heç vaxt göstərməyin"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Səs və ya vizual kəsintisiz"</string>
@@ -2948,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Orta əhəmiyyətli"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Çox əhəmiyyətli"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Daha çox əhəmiyyətli"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Bildirişləri göstərin"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Bildiriş köməkçisi"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Bildiriş girişi"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"İş profili bildirişlərinə giriş blok edilib"</string>
@@ -2978,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"\"Narahat etməyin\" girişi"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Heç bir tətbiq \"Narahat etməyin\" girişi sorğusu göndərməyib"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Tətbiqlər endirilir..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bu tətbiq bildirişinin bu cihazda görünməsini blok edir"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bu kateqoriyalı bildirişin bu cihazda görünməsini blok edir"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bu kateqoriyalı bildirişin cihazda görünməsini blok edir"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Təklifinizə əsasən Android tətbiq bildirişinin bu cihazda görünməsini blok edir"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Təklifinizə əsasən Android bu kateqoriyalı bildirişin cihazda görünməsini blok edir"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Təklifinizə əsasən Android bu qrupdan olan bildirişin cihazda görünməsini blok edir"</string>
<string name="notification_channels" msgid="5346841743182627500">"Kateqoriyalar"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Digər"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə parol tələb edərək onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün parol tələb edilsin?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Bəli"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Xeyr"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Bəli"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Xeyr"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PİN tələb edirsiniz?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Model tələb edirsiniz?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Parol tələb edirsiniz?"</string>
@@ -3397,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Cari istifadəçi: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> kimi daxil olundu"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> deloftdur"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"YANDIR / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"QAPALI"</string>
<string name="backup_disabled" msgid="485189128759595412">"Yedəkləmə deaktiv edildi"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> versiyasına güncəlləndi"</string>
@@ -3407,6 +3456,7 @@
<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="6346948990624612516">"Yedəkləmələri deaktiv etmək alınmadı"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Bu əməliyyat deaktivdir. Ətraflı məlumat üçün təşkilatın admini ilə əlaqə saxlayın."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Daha ətraflı"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Admin ayarlar, icazələr, korporativ giriş, şəbəkə fəaliyyəti və cihazın məkan məlumatı da daxil olmaqla bu iş profili ilə əlaqəli tətbiq və dataya nəzarət edə və idarə edə bilər."</string>
@@ -3430,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"İş profili deaktivdir"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Tətbiq, arxa fon sinxronizasiyası və iş profiliniz ilə bağlı digər xüsusiyyətlər deaktiv edildi."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Gecə İşığı cədvəlini ayarlayın"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Solğun ekran kəhrabası"</string>
+ <string name="night_display_suggestion_summary" msgid="228346372178218442">"Hər gecə ekranı avtomatik olaraq söndürün"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"Gecə İşığı aktivdir"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran kəhrəba rəngi çalarındandır. Bu, yuxuya getməyinizə kömək edə bilər."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Təklif edilənlər"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Təkliflər"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> daha"</string>
@@ -3537,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"Yoxdur"</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>
@@ -3559,31 +3612,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Sürətli ayarlar üzrə developer xanaları"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Yardım üçün buradayıq"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Sizin üçün 24/7 buradayıq"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Sizin üçün 24 7 buradayıq"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Dəstək komandamız problemi həll etmək üçün xidmətinizdədir"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Dəstək komandamız hər gün, hər saat əlçatandır"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Yardım axtarın və ya dəstək saatlarında geri gəlin (yerli vaxt):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Telefon dəstək saatları (yerli vaxt)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Yardım axtarın və ya məsləhət və tövsiyələri kəşf edin"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Dəstək:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Xaricə səyahət edirsiniz?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Beynəlxalq xərclər çıxıla bilər"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Söhbət"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Məsləhət və tövsiyələri kəşf edin"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Yardım axtarın və əks əlaqə göndərin"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Yardım xidmətiylə əlaqə"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Giriş"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Daxil ola bilmədiniz?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Sistem məlumatı göndərin"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Yenidən göstərməyin"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Sorğulama növü:"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Hesab əlavə edin"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Sistem məlumatı"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Pəncərə Obyekti"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Səth İzi"</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>
@@ -3599,11 +3629,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> saniyə</item>
<item quantity="one">1 saniyə</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> gözləyin"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Yaddaşı idarə edin"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Yaddaşda boş yer yaratmaq üçün, yaddaş meneceri yedəklənmiş foto və videoları cihazınızdan silir."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Foto və videoları silin"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Yaddaş Meneceri"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Yaddaş menecerindən istifadə edin"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Avtomatik"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Təlimat"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"İndi yer boşaldın"</string>
@@ -3614,32 +3644,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kameraya keçin"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kameranı cəld açmaq üçün, enerji düyməsinə iki dəfə basın. İstənilən ekranda işləyir."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kameranı cəld açın"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Yandırıb-söndürmə düyməsinə iki dəfə basın və kameranı açın"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kameranı çevirin"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Cəld selfi çəkin"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Selfi rejimi üçün telefonu iki dəfə burun"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Selfi rejimi üçün planşeti iki dəfə burun"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Selfi rejimi üçün cihazı iki dəfə burun"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Ekran deaktiv olduğu zaman bildirişləri yoxlayın"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Ekran deaktiv olduğu zaman bildirişləri yoxlayın"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Bildirişləri yoxlamaq üçün, planşetin arxasındakı barmaq sensorunda aşağı sürüşdürün."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Bildirişləri yoxlamaq üçün, cihazın arxasındakı barmaq sensorunda aşağı sürüşdürün."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Bildirişlərə cəld baxın"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Barmaq izi sensorunda aşağı sürüşdürün"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Aktiv"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Deaktiv"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Əməliyyat sistemi yükləyicisi artıq kiliddən çıxarılıb"</string>
@@ -3769,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Kataloq girişi"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"kataloq girişi"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"Telefonum"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"Planşetim"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"Cihazım"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Hesab"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Cihaz adı"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Maşında Bluetooth\'dan istifadə edin"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Avtomobil idarə edərkən Bluetooth\'u avtomatik aktiv edin"</string>
</resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index d1568f9..6407a92 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Націсніце кнопку"</item>
<item msgid="1624323946324499595">"PIN-код ад пірынгавай прылады"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 гадзіна"</item>
<item msgid="5198271470953124739">"Ніколі не ўключаць тайм-аўт"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (стандартна)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Дрэнная"</item>
<item msgid="2042505933058940139">"Дрэнны"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Старэйшыя за 60 дзён"</item>
<item msgid="5692284879054004388">"Старэйшыя за 90 дзён"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Выкарыстоўваць параметры сеткі"</item>
+ <item msgid="8745603368609022803">"Лімітная"</item>
+ <item msgid="2266114985518865625">"Безлімітная"</item>
+ </string-array>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index a13afcc..74b5b1e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -172,6 +172,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Вашы прылады"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Спалучыце новую прыладу"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Дазволіць прыладзе спалучацца з прыладамі Bluetooth і падключацца да іх"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Адключыць унутрыпалосны празвон"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Не прайграваць карыстальніцкія рынгтоны на тэлефоне праз гарнітуры Bluetooth"</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>
@@ -334,6 +336,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Задаць дату"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Сартаваць па алфавіце"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сартаваць па часавым поясе"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"Змена на <xliff:g id="TIME_TYPE">%1$s</xliff:g> пачынаецца <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Летні час"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Стандартны час"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Часавы пояс згодна рэгіёну"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Часавыя паясы з фіксаваным зрухам"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
<string name="time_picker_title" msgid="483460752287255019">"Час"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Аўтаматычная блакіроўка"</string>
@@ -344,6 +351,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Тэкст на экране блакіроўкі"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Уключыць віджэты"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Адключана адміністратарам"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Няма"</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">"Напрыклад, Android Лявона"</string>
@@ -352,6 +363,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Звесткi профiлю"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Уліковыя запісы"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шыфраванне і ўліковыя даныя"</string>
@@ -465,9 +477,16 @@
<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="8971630898700461034">"Задайце блакіроўку экрана"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Абараніце сваю прыладу"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Выкарыстоўваць адбітак пальца"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Разблакіруйце з дапамогай адбітка пальца"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Спосаб блакіроўкі экрана"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Выб. блак. прац. проф."</string>
@@ -713,6 +732,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Як гучная сувязь"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музыкі і мультымедыя"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомніць налады"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Максімальная колькасць падключаных аўдыяпрылад Bluetooth"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Выбар максімальнай колькасці падключаных аўдыяпрылад Bluetooth"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Перадача"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Уключыць бесправадны дысплей"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Прылад побач не знойдзена."</string>
@@ -727,6 +748,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Назва"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 ГГц"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ГГц"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Увайсці"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Мб/с"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> хоча ўключыць Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> хоча адключыць Wi-Fi"</string>
@@ -744,6 +766,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Уключыць Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Выкарыстоўваць Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Налады Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Усталяванне бесправадных кропак доступу і кіраванне iмi"</string>
@@ -838,6 +861,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Пароль"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Паказваць пароль"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Выбраць дыяпазон для пунктаў доступу"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Аўтаматычна"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Дыяпазон 2,4 ГГц"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Дыяпазон 5 ГГц"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Налады IP"</string>
@@ -855,7 +879,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS даступная)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Калі ласка, увядзіце пароль сеткі"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Сетка Wi‑Fi аператара"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Падлучыцца праз <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Падлучыцца праз <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Каб павысіць дакладнасць размяшчэння і для іншых мэтаў, <xliff:g id="APP_NAME">%1$s</xliff:g> хоча ўключыць сеткавае сканаванне, нават калі Wi-Fi выключаны.\n\nДазволіць для ўсіх прыкладанняў, якія патрабуецца адсканаваць?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Каб адключыць гэту наладу, перайдзіце да пункту «Пашыраныя» меню перапаўнення."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дазволіць"</string>
@@ -933,10 +957,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Дыяпазон для пунктаў доступу"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Выкарыстоўвайце хот-спот для стварэння сеткі Wi‑Fi для іншых прылад. Хот-спот дае доступ да інтэрнэту праз падключэнне да мабільнай перадачы даных. Мабільны аператар можа спаганяць дадатковую плату."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Праграмы могуць ствараць хот-спот для абагульвання змесціва з прыладамі паблізу."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Аўтаматычна выключыць хот-спот"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Хот-спот Wi‑Fi выключыцца, калі прылады непадключаныя"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Уключэнне кропкi доступу..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключэнне кропкi доступу..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Сетка <xliff:g id="NETWORK_SSID">%1$s</xliff:g> актыўная"</string>
@@ -947,7 +969,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-тэлефанія"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Уключыць Wi-Fi-тэлефанію"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Выкарыстоўваць Wi-Fi замест мабільнай сеткі"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -985,6 +1008,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Экстранны адрас"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Выкарыстоўваецца як ваша месцазнаходжанне, калі вы робіце экстранны выклік праз Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Дадатковыя звесткі"</annotation>" аб функцыях Прыватнай DNS"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
<string name="sound_settings" msgid="5534671337768745343">"Гук"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Гучнасць"</string>
@@ -1202,6 +1226,8 @@
<string name="status_network_type" msgid="3279383550222116235">"Тып мабільнай сеткі"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Звесткi пра аператара"</string>
<string name="status_data_state" msgid="5503181397066522950">"Стан мабільнай сеткі"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"Стан"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Магутнасць сігналу"</string>
<string name="status_roaming" msgid="2638800467430913403">"Роўмінг"</string>
@@ -1335,6 +1361,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Вашая новая <xliff:g id="NAME">^1</xliff:g> працуе. \n\nКаб перамясціць фатаграфіі, файлы і даныя дадаткаў на гэту прыладу, перайдзіце ў меню Налады > Памяць."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Перамясціце <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Перамяшчэнне дадатку <xliff:g id="APP">^1</xliff:g> і яго даных на <xliff:g id="NAME_0">^2</xliff:g> зойме ўсяго некалькі секунд. Вы не зможаце выкарыстоўваць гэты дадатак, пакуль перамяшчэнне не завершана. \n\nНе вымайце <xliff:g id="NAME_1">^2</xliff:g> падчас перамяшчэння."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Каб перамяшчаць даныя, трэба разблакіраваць карыстальніка <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Перамяшчэнне <xliff:g id="APP">^1</xliff:g>..."</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Не вымайце <xliff:g id="NAME">^1</xliff:g> падчас перамяшчэння. \n\nДадатак <xliff:g id="APP">^2</xliff:g> не будзе даступны на гэтай прыладзе, пакуль перамяшчэнне не завершана."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Адмяніць перамяшчэнне"</string>
@@ -1387,19 +1414,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Налады сеткі, праграмы або прылады могуць быць скінуты"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Скінуць налады Wi-Fi, мабільнай перадачы даных і Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Гэта прывядзе да скіду ўсіх налад сеткі, у тым ліку\n\n"<li>"Wi‑Fi"</li>\n<li>"мабільнай перадачы даных"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Скінуць eSIM-карты"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"Скід налад"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Скінуць усе налады сеткі? Гэта дзеянне нельга адмяніць!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Скід налад"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Скінуць?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Скід налад сеткі недаступны для гэтага карыстальніка"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Налады сеткі былі скінутыя"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Немагчыма скінуць eSIM-карты"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Немагчыма скінуць eSIM-карты з-за памылкі."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Сцерці ўсе даныя (cкід да заводскіх налад)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховiшча"</b>" вашага планшэта, у тым ліку:\n\n"<li>"Ваш улiковы запiс Google"</li>\n<li>"Сістэмныя даныя і налады, а таксама даныя і налады дадаткаў"</li>\n<li>"Спампаваныя дадаткі"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховiшча"</b>" вашага тэлефона, у тым ліку:\n\n"<li>"Ваш улiковы запiс 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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Аператары на eSIM-карце"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM-карты"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Гэта не прывядзе да скасавання вашага тарыфнага плана."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя дадзеныя карыстальніка, трэба ачысціць "<b>"USB-назапашвальнік"</b>"."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя дадзеныя карыстальніка, трэба выдаліць інфармацыю з "<b>"SD-карты"</b>"."</string>
@@ -1459,21 +1491,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Калі ласка, падлучыцеся да Інтэрнэту"</string>
<string name="location_title" msgid="1029961368397484576">"Маё месцазнаходжанне"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Месца для рабочага профілю"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Рэжым"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Высокая дакладнасць"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Эканомія энергіі"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Толькi прылада"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Вызначэнне месцазнаходж. адкл."</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Дазволы на ўзроўні праграм"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Апошнія запыты пра месцазнах."</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"У апошні час запытаў ад дадаткаў на вызначэнне месцазнаходжання не паступала"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Службы вызначэння месцазнаходжання"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Выс. узровень выкарыст. акум."</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Нізкі ўзровень выкарыст. акум."</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Рэжым вызначэння месцазнаходж."</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Выкарыстоўваць GPS, Wi-Fi, Bluetooth або мабільныя сеткі для вызначэння месцазнаходжання"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Выкарыстоўваць Wi‑Fi, Bluetooth або мабільныя сеткі для вызначэння месцазнаходжання"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Выкарыстоўваць GPS і датчыкі прылады для вызначэння месцазнаходжання"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Сканіраванне"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Сканіраванне Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Палепшыце функцыю вызначэння месцазнаходжання, дазволіўшы сістэмным праграмам і службам знаходзіць сеткі Wi-Fi у любы час."</string>
@@ -1495,6 +1518,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Крыніцы месцазнаходжання"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"Прагледзець юрыдычную інфармацыю, стан, вэрсіі праграмнага забяспечання"</string>
<string name="legal_information" msgid="5769301644270604095">"Юрыдычная інфармацыя"</string>
@@ -1602,6 +1626,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Паказаць усе праграмы (<xliff:g id="COUNT">%1$d</xliff:g> шт.)"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ваш планшэт і асабістыя даныя больш уразлівыя для нападаў невядомых праграм. Пры ўсталёўцы праграм з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні планшэта ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваш тэлефон і асабістыя даныя больш уразлівыя для нападаў невядомых праграм. Пры ўсталёўцы праграм з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні тэлефона ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Ваша прылада і асабістыя даныя больш прыступныя для нападаў невядомых праграм. Усталёўваючы праграмы з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні прылады ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Пашыраныя налады"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Уключыць дадатковыя параметры налад"</string>
<string name="application_info_label" msgid="5736524913065714880">"Звесткі пра праграмы"</string>
@@ -1903,6 +1928,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Можа паўплываць на прадукцыйнасць"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Націсканне пасля спынення руху указальніка"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Затрымка перад націсканнем"</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_summary_state_enabled" msgid="8359913912320966304">"УКЛЮЧАНА"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"АДКЛЮЧАНА"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Паказваць у Хуткіх наладах"</string>
@@ -2030,7 +2058,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>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"Да поўнай зарадкі засталося <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Фонавая дзейнасць"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"З абмежаваннямі"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Дазволіць праграме працаваць у фонавым рэжыме"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Праграма можа працаваць у фонавым рэжыме, калі не выкарыстоўваецца"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Праца праграмы ў фонавым рэжыме абмежавана, калі праграмай не карыстаюцца"</string>
@@ -2073,14 +2101,33 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Акумулятар у добрым стане"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Праграмы працуюць нармальна"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Нізкая ёмістасць акумулятара"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Акумулятар не можа забяспечыць дастатковы тэрмін аўтаномнай працы"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Уключыць разумны менеджар акумулятара"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Уключыць для аптымізацыі карыстання акумулятарам"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Уключэнне рэжыму нізкага ўзроўню выкарыстання акумулятара"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Падоўжыце працу акумулятара"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Уключаны рэжым нізкага ўзроўню выкарыстання акумулятара"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Некаторыя магчымасці абмежаваныя"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Тэлефонам шмат карысталіся"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Планшэтам шмат карысталіся"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Прыладай шмат карысталіся"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"З моманту апошняй поўнай зарадкі прыладай карысталіся каля <xliff:g id="HOUR">%1$s</xliff:g>"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Вы шмат працавалі з тэлефонам і выкарысталі значную частку зараду акумулятара. Акумулятар працуе нармальна.\n\n З моманту апошняй поўнай зарадкі вы карысталіся тэлефонам на працягу <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Усяго выкарыстана:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Вы шмат працавалі на планшэце і выкарысталі значную частку зараду акумулятара. Акумулятар працуе нармальна.\n\n З моманту апошняй поўнай зарадкі вы карысталіся планшэтам на працягу <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Усяго выкарыстана:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Вы шмат працавалі на прыладзе і выкарысталі значную частку зараду акумулятара. Акумулятар працуе нармальна.\n\n З моманту апошняй поўнай зарадкі вы карысталіся прыладай на працягу <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Усяго выкарыстана:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Інтэлектуальны менеджар акумулятара"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Аўтаматычнае кіраванне акумулятарам"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Аўтаматычная рэгуліроўка спажывання энергіі праграмамі ў залежнасці ад умоў выкарыстання"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Праграмы, якія не працуюць у фонавым рэжыме"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d праграма</item>
+ <item quantity="few">%1$d праграмы</item>
+ <item quantity="many">%1$d праграм</item>
+ <item quantity="other">%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>
@@ -2189,6 +2236,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Сервер медыя"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Аптымізацыя дадаткаў"</string>
<string name="battery_saver" msgid="8172485772238572153">"Эканомія зараду"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Карыстанне функцыяй эканоміі зараду"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Уключаць аўтаматычна"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Ніколі"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"пры ўзроўні зараду акумулятара <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2376,8 +2424,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"У цяперашні час ёсць праблемы сінхранізацыi. Яна хутка адновіцца."</string>
<string name="add_account_label" msgid="7811707265834013767">"Дадаць уліковы запіс"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Рабочы профіль яшчэ недаступны"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Рэжым працы"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Дазволіць функцыянаванне працоўнага профілю, у тым ліку праграм, фонавай сінхранізацыі і звязаных з імі функцый."</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Выдаліць рабочы профіль"</string>
<string name="background_data" msgid="5779592891375473817">"Зыходныя дадзеныя"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Прыкладанні ў любы час могуць сінхранізаваць, адпраўляць і атрымлiваць дадзеныя"</string>
@@ -2409,6 +2461,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Выдаліць уліковы запіс"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Выдаленне гэтага ўлiковага запiсу прывядзе да выдалення ўсіх паведамленняў, кантактаў і іншых дадзеных з планшэта."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Выдаленне гэтага ўлiковага запiсу прывядзе да выдалення ўсіх паведамленняў, кантактаў і іншых дадзеных з тэлефона."</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Выдаленне гэтага ўліковага запісу прывядзе да выдалення з прылады ўсіх паведамленняў, кантактаў і іншых даных!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Ваш адміністратар не дазваляе гэту змену"</string>
<string name="provider_label" msgid="7724593781904508866">"Прымусовыя падпіскі"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2635,7 +2688,8 @@
<item quantity="many">Праверыць сертыфікаты</item>
<item quantity="other">Праверыць сертыфікаты</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Карыстальнікі"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Карыстальнікi і профілi"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Дадаць карыстальніка або профіль"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Дадаць карыстальніка"</string>
@@ -2827,7 +2881,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Праграмы і апавяшчэнні"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дазволы, стандартныя праграмы"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"Карыстальнікі і ўліковыя запісы"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2858,7 +2913,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"не турбаваць, умешвацца, умяшанне, перапыняць"</string>
<string name="keywords_app" msgid="6334757056536837791">"аператыўная памяць"</string>
<string name="keywords_location" msgid="6615286961552714686">"паблізу, месцазнаходжанне, гісторыя, справаздачы"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"дакладнасць"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"уліковы запіс"</string>
<string name="keywords_users" msgid="3434190133131387942">"абмежаванне, абмяжоўваць, абмежаваны"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"выпраўленне тэксту, правільны, гук, вібрацыя, аўтаматычна, мова, жэст, прапанаваць, прапанова, тэма, абразлівы, слова, набіраць, эмодзі, міжнародны"</string>
@@ -2927,6 +2981,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> правіла</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Не турбаваць"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Уключэнне рэжыму \"Не турбаваць\""</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Паводзіны"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дазволіць гукі і вібрацыю ад:"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без гуку"</string>
@@ -2936,8 +2991,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Уключаць аўтаматычна"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Аўтаматычныя правілы"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Аўтаматычнае правіла"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Правілы рэжыму \"Не турбаваць\""</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Абмяжоўваць гукі і вібрацыю ў пэўныя часы"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"Поўная цішыня"</string>
@@ -2945,12 +3003,15 @@
<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_add" msgid="90014394953272517">"Дадаць"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"УКЛЮЧЫЦЬ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"АДКЛЮЧЫЦЬ"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Уключыць"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Уключыць"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Адключыць"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Рэжым \"Не турбаваць\" уключаны да <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Рэжым \"Не турбаваць\" будзе ўключаны, пакуль вы яго не выключыце"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Рэжым \"Не турбаваць\" быў аўтаматычна ўключаны правілам (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Рэжым \"Не турбаваць\" быў аўтаматычна ўключаны праграмай (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Толькі прыярытэтныя"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2966,6 +3027,7 @@
<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="recent_notifications" msgid="5660639387705060156">"Нядаўна адпраўлялі"</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>
@@ -2985,7 +3047,7 @@
<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_importance_title" msgid="848692592679312666">"Важнасць"</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="5455049524984686275">"Без гуку ці візуальнага перапынення"</string>
@@ -3003,6 +3065,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Сярэдняя важнасць"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"Доступ да апавяшчэнняў"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Доступ да апавяшчэнняў працоўнага профілю заблакіраваны"</string>
@@ -3035,9 +3098,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ да рэжыму «Не турбаваць»"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Запытаў доступу да рэжыму «Не турбаваць» ад усталяваных дадаткаў не паступала"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка дадаткаў..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android блакіруе апавяшчэнні ад дадзенай праграмы на гэтай прыладзе"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android блакіруе дадзеную катэгорыю апавяшчэнняў на гэтай прыладзе"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android блакіруе дадзеную групу апавяшчэнняў на гэтай прыладзе"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Па вашым запыце Android блакіруе апавяшчэнні ад дадзенай праграмы на гэтай прыладзе"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Па вашым запыце Android блакіруе дадзеную катэгорыю апавяшчэнняў на гэтай прыладзе"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Па вашым запыце Android блакіруе дадзеную групу апавяшчэнняў на гэтай прыладзе"</string>
<string name="notification_channels" msgid="5346841743182627500">"Катэгорыі"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Іншае"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3192,6 +3255,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання пароля пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\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="1793719723017395175">"Так"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Не"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Запытваць PIN-код?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Патрабаваць узор?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Запытваць пароль?"</string>
@@ -3481,7 +3546,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Бягучы карыстальнік: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Вы ўвайшлі як <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> з\'яўляецца стандартнай праграмай"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"УКЛ. / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ВЫКЛ."</string>
<string name="backup_disabled" msgid="485189128759595412">"Рэзервовае капіраванне адключана"</string>
<string name="about_summary" msgid="924181828102801010">"Абноўлена да версіі Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3491,6 +3557,7 @@
<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="6346948990624612516">"Немагчыма выключыць стварэнне рэзервовых копій"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Гэта дзеянне адключана. Каб даведацца больш, звярніцеся да адміністратара вашай арганізацыі."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Дадатковая інфармацыя"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"У вашага адміністратара ёсць магчымасць маніторынгу і адміністравання праграм і даных, звязаных з вашым працоўным профілем, у тым ліку налад, дазволаў, карпаратыўнага доступу, сеткавай актыўнасці і геаданых."</string>
@@ -3514,9 +3581,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"Працоўны профіль адключаны"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Праграмы, фонавая сінхранізацыя і іншыя функцыі, звязаныя з вашым працоўным профілем, адключаны."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Глядзець графік \"Начной падсветкі\""</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Бурштынавы экран, каб дапамагчы вам заснуць"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"Начная падсветка ўключана"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"яшчэ +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3629,6 +3698,8 @@
<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_none" msgid="5144174674654097316">"Няма"</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>
@@ -3653,31 +3724,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Падключана да некалькіх прылад"</string>
<string name="demo_mode" msgid="2798762752209330277">"Рэжым дэманстрацыі сістэмнага інтэрфейсу карыстальніка"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Пліткі хуткіх налад для распрацоўшчыкаў"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Мы радыя дапамагчы"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Мы працуем для вас 24/7"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Мы працуем для вас 24/7"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Наша служба падтрымкі працуе, каб дапамагчы ў вырашэнні любога пытання"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Наша служба падтрымкі даступная кругласутачна кожны дзень"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Пашукайце ў даведцы або звярніцеся ў службу падтрымкі ў гадзіны яе працы (па мясцовым часе):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Гадзіны працы службы падтрымкі па тэлефоне (па мясцовым часе)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Пашукайце ў даведцы або праверце парады і падказкі"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Падтрымка для наступнай краіны:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Падарожнічаеце за мяжу?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Можа быць спагнана плата за міжнародны выклік"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Тэлефон"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Чат"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Праверце парады і падказкі"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Пашукайце ў даведцы і адпраўце водгук"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Звяжыцеся са службай падтрымкі"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Увайсці"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Не можаце ўвайсці ў сістэму?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Адправіць інфармацыю пра сістэму"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Больш не паказваць"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Запыт ад"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Дадаць уліковы запіс"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Сістэмная інфармацыя"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Трасіроўка вокан"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Трасіроўка паверхні"</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>
@@ -3699,11 +3747,11 @@
<item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунды</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Пачакайце каля <xliff:g id="ESTIMATE">%1$s</xliff:g>"</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="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>
@@ -3714,32 +3762,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Каб адкрыць камеру, двойчы націсніце на кнопку сілкавання"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Каб перакл. на франтальную камеру, двойчы павярніце тэлефон"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Каб перакл. на франтальную камеру, двойчы павярніце планшэт"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Каб перакл. на франтальную камеру, двойчы павярніце прыладу"</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_suggestion_summary" msgid="5987443721392571847">"Правяраць апавяшчэнні, калі экран выключаны"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Правяраць апавяшчэнні, калі экран выключаны"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Каб праверыць апавяшчэнні, правядзіце пальцам уніз па сканеры адбіткаў пальцаў на заднім боку прылады."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Хуткі прагляд апавяшчэнняў"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Правядзіце пальцам уніз па сканеры адбіткаў пальцаў"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Уключана"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Адключана"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Загрузчык ужо разблакіраваны"</string>
@@ -3883,8 +3924,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Доступ да каталога"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"доступ да каталога"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index cb0deba..ed05f50 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"পুশ বোতাম"</item>
<item msgid="1624323946324499595">"চেনা ডিভাইস থেকে পিন"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"১ ঘণ্টা"</item>
<item msgid="5198271470953124739">"কখনই সময় শেষ হবে না"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"১ (ডিফল্ট)"</item>
+ <item msgid="7584056855393485416">"২"</item>
+ <item msgid="844570832050176311">"৩"</item>
+ <item msgid="1896812737336024220">"৪"</item>
+ <item msgid="2664420770707984266">"৫"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"১"</item>
+ <item msgid="2731443086402670729">"২"</item>
+ <item msgid="74627748729027880">"৩"</item>
+ <item msgid="2654447223197666662">"৪"</item>
+ <item msgid="7026157954713482328">"৫"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"নিম্নমানের"</item>
<item msgid="2042505933058940139">"খারাপ"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"৬০ দিনের বেশি পুরানো"</item>
<item msgid="5692284879054004388">"৯০ দিনের বেশি পুরানো"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"নেটওয়ার্কের পছন্দ ব্যবহার করুন"</item>
+ <item msgid="8745603368609022803">"মিটারিং চালু রাখুন"</item>
+ <item msgid="2266114985518865625">"মিটারিং এর দরকার নেই"</item>
+ </string-array>
</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 4d4870f..fbeec0f 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"আপনার ডিভাইসগুলি"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"নতুন ডিভাইস যুক্ত করুন"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"ডিভাইসে ব্লুটুথ সংযোগ করতে এবং পেয়ার করতে অনুমতি দিন"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ইন-ব্যান্ড রিং অক্ষম করুন"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"ব্লুটুথ হেডসেটে ফোনের কাস্টম রিং-টোন শুনতে চাই না"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"তারিখ সেট করুন"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"বর্ণানুক্রমে সাজান"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"সময় অঞ্চলের অনুসারে সাজান"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> তারিখে চালু হবে।"</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"ডেলাইট সেভিং সময়"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"স্ট্যান্ডার্ড টাইম"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"অঞ্চল অনুযায়ী টাইম জোন"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"সুনির্দিষ্ট অফসেট টাইম জোন"</string>
<string name="date_picker_title" msgid="1338210036394128512">"তারিখ"</string>
<string name="time_picker_title" msgid="483460752287255019">"সময়"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"অটোমেটিক লক"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"লক স্ক্রিনের মেসেজ"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"উইজেটগুলি সক্ষম করুন"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"কোনো কিছুই নয়"</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">"যেমন, সুমনের Android"</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"প্রোফাইল তথ্য"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"অ্যাকাউন্টগুলি"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"এনক্রিপশন ও ক্রেডেনশিয়াল"</string>
@@ -459,9 +471,16 @@
<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="8971630898700461034">"স্ক্রিন লক সেট করুন"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"আপনার ডিভাইস সুরক্ষিত করুন"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"আঙ্গুলের ছাপ ব্যবহার করুন"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"আপনার আঙ্গুলের ছাপ দিয়ে আনলক করুন"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"স্ক্রিন লক বেছে নিন"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"কর্মস্থলের লক বেছে নিন"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"স্পিকার ফোন হিসেবে"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"সঙ্গীত এবং মিডিয়ার জন্য"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"সেটিংস মনে রাখুন"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ব্লুটুথের মাধ্যমে সংযুক্ত সর্বাধিক অডিও ডিভাইস"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"সর্বাধিক কতগুলি অডিও ডিভাইস ব্লুটুথের মাধ্যমে সংযুক্ত করা যাবে তা নির্দিষ্ট করুন"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"কাস্ট করুন"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ওয়্যারলেস প্রদর্শন সক্ষম করুন"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"কাছাকাছি কোনো ডিভাইস পাওয়া যায়নি।"</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"নাম"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"সাইন-ইন করুন"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi চালু করতে চাইছে"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi বন্ধ করতে চাইছে"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"ওয়াই-ফাই"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"ওয়াই-ফাই চালু করুন"</string>
<string name="wifi_settings" msgid="29722149822540994">"ওয়াই-ফাই"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"ওয়াই-ফাই ব্যবহার করুন"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"ওয়াই-ফাই সেটিংস"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"ওয়াই-ফাই"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"ওয়্যারলেস অ্যাক্সেস পয়েন্ট সেট আপ ও পরিচালনা করুন"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"পাসওয়ার্ড"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"পাসওয়ার্ড দেখান"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ব্যান্ড বেছে নিন"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"অটোমেটিক"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"২.৪ GHz ব্যান্ড"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"৫ GHz ব্যান্ড"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP সেটিংস"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS উপলব্ধ)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"আপনার নেটওয়ার্ক পাসওয়ার্ডটি লিখুন"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"পরিষেবা প্রদানকারীর ওয়াই-ফাই নেটওয়ার্ক"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> এর মাধ্যমে সংযুক্ত করুন"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> এর মাধ্যমে সংযুক্ত করুন"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"অবস্থান নির্ভুলতা উন্নতি ও অন্যান্য উদ্দ্যেশ্যের জন্য <xliff:g id="APP_NAME">%1$s</xliff:g> নেটওয়ার্ক স্ক্যান চালু করতে চাইছে, এমনকি ওয়াই-ফাই বন্ধ থাকা সত্ত্বেও।\n\nযে সব অ্যাপ্লিকেশানগুলি স্ক্যান করতে চাই তাদের জন্য এটির অনুমতি দেবেন?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"এটি বন্ধ করতে, ওভারফ্লো মেনুতে ‘উন্নত’ লেখায় যান"</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"অনুমতি দিন"</string>
@@ -909,10 +933,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"আপনার অন্যান্য ডিভাইসের জন্য একটি ওয়াই-ফাই নেটওয়ার্ক তৈরি করতে হটস্পট ব্যবহার করুন। হটস্পটের মাধ্যমে আপনার মোবাইলের ডেটা ব্যবহার করে ইন্টারনেট সংযোগ দেওয়া হয়। মোবাইলের ডেটার জন্য অতিরিক্ত চার্জ প্রযোজ্য হতে পারে।"</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"অ্যাপগুলি আশেপাশের ডিভাইসের সাথে কন্টেন্ট শেয়ার করার জন্য হটস্পট তৈরি করতে পারে।"</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"নিজে থেকে হটস্পট বন্ধ করুন"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"কোনও ডিভাইস সংযুক্ত না থাকলে ওয়াই-ফাই হটস্পট বন্ধ হয়ে যাবে"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"হটস্পট চালু হচ্ছে..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"হটস্পট বন্ধ হচ্ছে..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> সক্রিয় আছে"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"ওয়াই-ফাই কলিং"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"ওয়াই-ফাই কলিং চালু করুন"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"মোবাইল নেটওয়ার্কের পরিবর্তে ওয়াই-ফাই ব্যবহার করুন"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"জরুরি ঠিকানা"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ওয়াই-ফাই নেটওয়ার্ক ব্যবহার করে জরুরি কল করার সময় আপনার লোকেশন হিসেবে ব্যবহার করা হয়"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"ব্যক্তিগত ডিএনএস বৈশিষ্ট্যের বিষয়ে "<annotation id="url">"আরও জানুন"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"প্রদর্শন"</string>
<string name="sound_settings" msgid="5534671337768745343">"সাউন্ড"</string>
<string name="all_volume_title" msgid="4296957391257836961">"ভলিউম"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"মোবাইল নেটওয়ার্ক ধরণ"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"অপারেটরের তথ্য"</string>
<string name="status_data_state" msgid="5503181397066522950">"মোবাইল নেটওয়ার্ক স্থিতি"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"পরিষেবা স্থিতি"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"সিগন্যাল ক্ষমতা"</string>
<string name="status_roaming" msgid="2638800467430913403">"রোমিং"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"আপনার নতুন <xliff:g id="NAME">^1</xliff:g> কাজ করছে৷ \n\nফটো, ফাইল, এবং অ্যাপ্লিকেশান ডেটা এই ডিভাইসে সরাতে, সেটিংস এবং সঞ্চয়স্থানে যান৷"</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> সরান"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> এবং এর ডেটা <xliff:g id="NAME_0">^2</xliff:g> এ সরাতে মাত্র কয়েক মিনিট সময় লাগবে৷ সরানো সম্পূর্ণ না হওয়া পর্যন্ত আপনি অ্যাপ্লিকেশানটি ব্যবহার করতে পারবেন না৷ \n\nসরানোর সময় <xliff:g id="NAME_1">^2</xliff:g> অপসারণ করবেন না৷"</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ডেটা সরানোর জন্য <xliff:g id="APP">^1</xliff:g>কে আনলক করতে হবে।"</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> সরানো হচ্ছে..."</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"সরানোর সময় <xliff:g id="NAME">^1</xliff:g>টি অপসারণ করবেন না৷ \n\nএই ডিভাইসের <xliff:g id="APP">^2</xliff:g> অ্যাপ্লিকেশানটি সরানো সম্পূর্ণ না হওয়া পর্যন্ত উপলব্ধ নাও হতে পারে৷"</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"সরানো বাতিল করুন"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"নেটওয়ার্ক, অ্যাপ, অথবা ডিভাইস রিসেট করা যায়"</string>
<string name="reset_network_title" msgid="6166025966016873843">"ওয়াই-ফাই, মোবাইল এবং ব্লুটুথ রিসেট করুন"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"এগুলি সহ সমস্ত নেটওয়ার্ক সেটিংস আবার সেট করবে:\n\n"<li>"ওয়াই ফাই "</li>\n<li>"সেলুলার ডাটা "</li>\n<li>"ব্লুটুথ"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"এছাড়াও ই-সিমগুলি রিসেট করুন"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"সেটিংস আবার সেট করুন"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"সমস্ত নেটওয়ার্ক সেটিংস আবার সেট করবেন? আপনি এই প্রক্রিয়াটি পূর্বাবস্থায় ফেরাতে পারবেন না!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"সেটিংস আবার সেট করুন"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"আবার সেট করবেন?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"এই ব্যবহারকারীদের জন্য নেটওয়ার্ক আবার সেট করুন উপলব্ধ নয়"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"নেটওয়ার্ক সেটিংস আবার সেট করা হয়েছে"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"ই-সিমগুলি রিসেট করা যাচ্ছে না"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"একটি সমস্যা হয়েছে, ই-সিমগুলি রিসেট করা যাচ্ছে না।"</string>
<string name="master_clear_title" msgid="3531267871084279512">"সমস্ত ডেটা মুছুন (ফ্যাক্টরি রিসেট)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ই-সিম এ থাকা পরিষেবা প্রদানকারী"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"ই-সিম"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"এতে আপনার মোবাইল পরিষেবার প্ল্যান বাতিল হবে না।"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"USB সঞ্চয়স্থানটিকে"</b>" মুছে দিতে হবে।"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"SD কার্ডটিকে"</b>" মুছে দিতে হবে।"</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"দয়া করে ইন্টারনেটের সঙ্গে সংযুক্ত হোন"</string>
<string name="location_title" msgid="1029961368397484576">"আমার অবস্থান"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"কাজের প্রোফাইলের জন্য অবস্থান"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"মোড"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"উচ্চ পর্যায়ের যথার্থতা"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ব্যাটারি সঞ্চয়"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"শুধুমাত্র ডিভাইস"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"অবস্থান বন্ধ"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"অ্যাপ-স্তরের অনুমতিগুলি"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"সাম্প্রতিক অবস্থান অনুরোধগুলি"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"সম্প্রতি কোনো অ্যাপ্লিকেশান অবস্থানের অনুরোধ করেনি"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"লোকেশন পরিষেবা"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"উচ্চ ব্যাটারির ব্যবহার"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"কম ব্যাটারির ব্যবহার"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"অবস্থান মোড"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"অবস্থান নির্ধারণ করতে জিপিএস, ওয়াই ফাই, ব্লুটুথ, বা মোবাইল নেটওয়ার্ক ব্যবহার করুন"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"অবস্থান নির্ধারণ করতে ওয়াই ফাই, ব্লুটুথ, বা মোবাইল নেটওয়ার্ক ব্যবহার করুন"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"অবস্থান নির্ণয় করতে GPS এবং ডিভাইস সেন্সর ব্যবহার করুন"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"স্ক্যান করা হচ্ছে"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ওয়াই-ফাই স্ক্যানিং"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"যে কোনো সময়ে ওয়াই-ফাই নেটওয়ার্কগুলিকে সনাক্ত করার জন্য সিস্টেম অ্যাপ্লিকেশান এবং পরিষেবাগুলিকে অনুমতি দিয়ে অবস্থান উন্নত করুন।"</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"অবস্থান উৎসগুলি"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"আইনি তথ্য, স্থিতি, সফ্টওয়্যার ভার্সন দেখুন"</string>
<string name="legal_information" msgid="5769301644270604095">"আইনি তথ্য"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g>টি অ্যাপের সবকটি দেখুন"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"অজানা অ্যাপের দ্বারা আপনার ট্যাবলেট এবং ব্যক্তিগত তথ্য আক্রান্ত হওয়ার সম্ভাবনা সবচেয়ে বেশি। এই উৎস থেকে আসা অ্যাপগুলি ইনস্টল করে আপনি সম্মত হচ্ছেন যে সেগুলি ব্যবহারের ফলে আপনার ট্যাবলেটের কোনো ক্ষতি হলে বা ডেটা হারিয়ে গেলে তার জন্য আপনিই দায়ী থাকবেন।"</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"অজানা অ্যাপের দ্বারা আপনার ফোন এবং ব্যক্তিগত তথ্য আক্রান্ত হওয়ার সম্ভাবনা সবচেয়ে বেশি। এই উৎস থেকে আসা অ্যাপগুলি ইনস্টল করে আপনি সম্মত হচ্ছেন যে সেগুলি ব্যবহারের ফলে আপনার ফোনের কোনো ক্ষতি হলে বা ডেটা হারিয়ে গেলে তার জন্য আপনিই দায়ী থাকবেন।"</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"অজানা অ্যাপের দ্বারা আপনার ফোন এবং ব্যক্তিগত তথ্য আক্রান্ত হওয়ার সম্ভাবনা সবচেয়ে বেশি। এই উৎস থেকে আসা অ্যাপগুলি ইনস্টল করে আপনি সম্মত হচ্ছেন যে সেগুলি ব্যবহারের ফলে আপনার ফোনের কোনও ক্ষতি হলে বা ডেটা হারিয়ে গেলে তার জন্য আপনিই দায়ী থাকবেন।"</string>
<string name="advanced_settings" msgid="1777249286757067969">"উন্নত সেটিংস"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"আরো সেটিংস বিকল্প সক্ষম করুন"</string>
<string name="application_info_label" msgid="5736524913065714880">"অ্যাপের তথ্য"</string>
@@ -1610,7 +1635,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>
@@ -1731,7 +1756,7 @@
<string name="service_stop" msgid="6369807553277527248">"থামান"</string>
<string name="service_manage" msgid="1876642087421959194">"সেটিংস"</string>
<string name="service_stop_description" msgid="9146619928198961643">"এই পরিষেবাটি এটির অ্যাপ্লিকেশান দ্বারা শুরু হয়েছে। এটি থামালে, অ্যাপ্লিকেশানটি বিফল হওয়ার সম্ভাবনা রয়েছে।"</string>
- <string name="heavy_weight_stop_description" msgid="6050413065144035971">"এই অ্যাপ্লিকেশানটি নিরাপদে থামানো যাবে না। আপনি যদি এটিকে থামান, আপনি হয়তো আপনার বর্তমান কাজের কয়েকটি হারাতে পারেন।"</string>
+ <string name="heavy_weight_stop_description" msgid="6050413065144035971">"এই অ্যাপ্লিকেশানটি নিরাপদে থামানো যাবে না। আপনি যদি এটিকে থামান, আপনি হয়ত আপনার বর্তমান কাজের কয়েকটি হারাতে পারেন।"</string>
<string name="background_process_stop_description" msgid="3834163804031287685">"যদি পুরানো অ্যাপ্লিকেশান প্রক্রিয়াটি আবার প্রয়োজন হয় তাই এটি চলছে। সাধারণতঃ এটি থামার কোনো কারণ নেই।"</string>
<string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: বর্তমানে ব্যবহৃত হচ্ছে। এটিকে নিয়ন্ত্রণ করতে সেটিংসে আলতো চাপুন।"</string>
<string name="main_running_process_description" msgid="1130702347066340890">"মুখ্য প্রক্রিয়া ব্যবহৃত হচ্ছে।"</string>
@@ -1760,7 +1785,7 @@
<string name="auto_punctuate_summary" msgid="4372126865670574837">"\"।\" প্রবেশ করাতে দুইবার \'স্পেস\' কী টিপুন"</string>
<string name="show_password" msgid="4837897357002495384">"পাসওয়ার্ড দেখুন"</string>
<string name="show_password_summary" msgid="3365397574784829969">"টাইপ করার সময় অক্ষরগুলি কয়েক মুহূর্তের জন্য দেখুন"</string>
- <string name="spellchecker_security_warning" msgid="9060897418527708922">"এই বানান পরীক্ষকটি হয়তো পাসওয়ার্ড এবং ক্রেডিট কার্ড নম্বর সহ আপনার টাইপ করা সমস্ত টেক্সট সংগ্রহ করতে সক্ষম হতে পারে। এটি <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> অ্যাপ থেকে এসেছে। এই বানান পরীক্ষকটি ব্যবহার করবেন?"</string>
+ <string name="spellchecker_security_warning" msgid="9060897418527708922">"এই বানান পরীক্ষকটি হয়ত পাসওয়ার্ড এবং ক্রেডিট কার্ড নম্বর সহ আপনার টাইপ করা সমস্ত টেক্সট সংগ্রহ করতে সক্ষম হতে পারে। এটি <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> অ্যাপ থেকে এসেছে। এই বানান পরীক্ষকটি ব্যবহার করবেন?"</string>
<string name="spellchecker_quick_settings" msgid="246728645150092058">"সেটিংস"</string>
<string name="spellchecker_language" msgid="6041050114690541437">"ভাষা"</string>
<string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"কিবোর্ড এবং ইনপুট"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"কার্য-সম্পাদনায় প্রভাব রাখতে পারে"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"পয়েন্টার সরানো বন্ধ হবার পরেই ক্লিক করুন"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ক্লিক করার আগে বিলম্ব"</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_summary_state_enabled" msgid="8359913912320966304">"চালু"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"বন্ধ"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"দ্রুত সেটিংসে দেখান"</string>
@@ -1987,7 +2015,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> অবশিষ্ট রয়েছে"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> চার্জ করা বাকি"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"পটভূমির কার্যকলাপ"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"বিধিনিষেধযুক্ত"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"অ্যাপটি পটভূমিতে চলতে দিন"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"যখন অ্যাপটি ব্যবহার করা হয় না তখন সেটি পটভূমিতে চালু থাকতে পারে"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"যখন অ্যাপটি ব্যবহার করা হয় না তখন পটভূমিতে সেটির ব্যবহার সীমিত"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"ব্যাটারি ভাল অবস্থায় আছে"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"অ্যাপে সাধারণ কার্যকলাপ দেখা যাচ্ছে"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"কম ক্ষমতার ব্যাটারি"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"কম ক্ষমতার ব্যাটারিতে ভাল কাজ হয় না"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"স্মার্ট ব্যাটারি পরিচালক চালু করুন"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"ব্যাটারির ব্যবহার অপ্টিমাইজ করতে এটি চালু করুন"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"\'ব্যাটারি কম\' মোড চালু করুন"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"ব্যাটারি আরও বেশিক্ষণ চালান"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"\'ব্যাটারি কম\' মোড চালু আছে"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"কিছু বৈশিষ্ট্য সীমিতভাবে ব্যবহার করা যাবে"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ফোন অত্যাধিক ব্যবহার করা হয়েছে"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ট্যাবলেট অত্যাধিক ব্যবহার করা হয়েছে"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ডিভাইস অত্যাধিক ব্যবহার করা হয়েছে"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"শেষ বার সম্পূর্ণ চার্জের পর <xliff:g id="HOUR">%1$s</xliff:g> ব্যবহার করা হয়েছে"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"আপনার ফোন অত্যাধিক ব্যবহার করার ফলে প্রচুর ব্যাটারি খরচ হয়েছে। আপনার ব্যাটারির সাধারণ কার্যকলাপ দেখা যাচ্ছে।\n\n শেষ বার সম্পূর্ণ চার্জের পর আপনার ফোন <xliff:g id="HOUR">%1$s</xliff:g> ব্যবহার করা হয়েছে।\n\n মোট ব্যবহার:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"আপনার ট্যাবলেট অত্যাধিক ব্যবহার করার ফলে প্রচুর ব্যাটারি খরচ হয়েছে। আপনার ব্যাটারির সাধারণ কার্যকলাপ দেখা যাচ্ছে।\n\n শেষ বার সম্পূর্ণ চার্জের পর আপনার ট্যাবলেট <xliff:g id="HOUR">%1$s</xliff:g> ব্যবহার করা হয়েছে।\n\n মোট ব্যবহার:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"আপনার ডিভাইস অত্যাধিক ব্যবহার করার ফলে প্রচুর ব্যাটারি খরচ হয়েছে। আপনার ব্যাটারির সাধারণ কার্যকলাপ দেখা যাচ্ছে। \n\n শেষ বার সম্পূর্ণ চার্জের পর আপনার ডিভাইস <xliff:g id="HOUR">%1$s</xliff:g> ব্যবহার করা হয়েছে।\n\n মোট ব্যবহার:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"স্মার্ট ব্যাটারি পরিচালক"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"ব্যাটারি অটোমেটিক পরিচালনা করুন"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"পাওয়ারের ব্যবহার সংক্রান্ত অ্যাপের মাধ্যমে নিজে থেকেই পাওয়ারের ব্যবহার অ্যাডজাস্ট করুন"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"বিধিনিষেধযুক্ত অ্যাপ"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$dটি অ্যাপ</item>
+ <item quantity="other">%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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"মিডিয়াসার্ভার"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"অ্যাপ অপটিমাইজেশান"</string>
<string name="battery_saver" msgid="8172485772238572153">"ব্যাটারি সেভার"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"ব্যাটারি সেভার ব্যবহার করুন"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"স্বয়ংক্রিয়ভাবে চালু হবে"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"কখনও নয়"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g>ব্যাটারি আছে"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"সমন্বয় বর্তমানে সমস্যার সম্মুখীন হচ্ছে। এটি খুব শীঘ্রই ফিরে আসবে।"</string>
<string name="add_account_label" msgid="7811707265834013767">"অ্যাকাউন্ট যোগ করুন"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"কর্মস্থলের প্রোফাইল এখনো উপলব্ধ নয়"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"কাজের মোড"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"অ্যাপ, পটভূমি সিঙ্ক এবং সম্পর্কিত বৈশিষ্ট্যগুলি সহ কর্মস্থলের প্রোফাইলটিকে কাজ করার অনুমতি দিন"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"কর্মস্থলের প্রোফাইল সরান"</string>
<string name="background_data" msgid="5779592891375473817">"ব্যাকগ্রাউন্ড ডেটা"</string>
<string name="background_data_summary" msgid="8328521479872763452">"অ্যাপ্লিকেশানগুলি যে কোনো সময়ে ডেটা সমন্বয়, পাঠাতে ও গ্রহণ করতে পারে"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"অ্যাকাউন্ট সরাবেন?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"এই অ্যাকাউন্টটি মুছে দিলে এটি ট্যাবলেটটি থেকে সমস্ত মেসেজ, পরিচিতি এবং অন্য ডেটা মুছে দেবে!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"এই অ্যাকাউন্টটি মুছে দিলে এটি ফোন থেকে সমস্ত মেসেজ, পরিচিতি এবং অন্য ডেটা মুছে দেবে!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"এই অ্যাকাউন্টটি মুছে দিলে এটির সমস্ত মেসেজ, পরিচিতি এবং অন্যান্য ডেটা ডিভাইস থেকে মুছে দেওয়া হবে!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"আপনার প্রশাসক এই পরিবর্তনটি করতে দেবেন না"</string>
<string name="provider_label" msgid="7724593781904508866">"পুশ সদস্যতাগুলি"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="one">টি সার্টিফিকেট পরীক্ষা করুন</item>
<item quantity="other">টি সার্টিফিকেট পরীক্ষা করুন</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"ব্যবহারকারীগণ"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"ব্যবহারকারীরা ও প্রোফাইলগুলি"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ব্যবহারকারী অথবা প্রোফাইল যোগ করুন"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"ব্যবহারকারীকে যোগ করুন"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ব্লুটুথ, কাস্ট করা"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"অ্যাপ ও বিজ্ঞপ্তি"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"অনুমতিগুলি, ডিফল্ট অ্যাপ্স"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"ব্যবহারকারী এবং অ্যাকাউন্টগুলি"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"বিরক্ত করবেন না, বাধা দেওয়া, বাধা, বিরতি"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"আশেপাশে, অবস্থান, ইতিহাস, প্রতিবেদন করা"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"নির্ভুলতা"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"অ্যাকাউন্ট"</string>
<string name="keywords_users" msgid="3434190133131387942">"বাধানিষেধ, বাধানিষেধ আরোপ করা, বাধানিষেধযুক্ত"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"টেক্সট সংশোধন, সঠিক, শব্দ, স্পন্দন, স্বয়ং, ভাষা, ইঙ্গিত, প্রস্তাব, প্রস্তাবনা, থিম, আপত্তিজনক, শব্দ, লেখা, ইমোজি, আন্তর্জাতিক"</string>
@@ -2872,6 +2924,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি নিয়ম</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"বিরক্ত করবেন না"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"\'বিরক্ত করবেন না\' মোড চালু করুন"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"আচরণ"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"এগুলির সাউন্ড ও ভাইব্রেশন হবে"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"কোনও সাউন্ড নয়"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"নিজে থেকে চালু করুন"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"অটোমেটিক নিয়ম"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"অটোমেটিক নিয়ম"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\'বিরক্ত করবেন না\' সেট আপ করুন"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"নির্দিষ্ট সময়ের ক্ষেত্রে শব্দ এবং কম্পন সীমিত করুন"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"একদম নিরব"</string>
@@ -2890,12 +2946,15 @@
<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_add" msgid="90014394953272517">"যোগ করুন"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"এখনই চালু করুন"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"এখনই বন্ধ করুন"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"চালু করুন"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"এখনই চালু করুন"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"এখনই বন্ধ করুন"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"\'বিরক্ত করবেন না\' মোডটি <xliff:g id="FORMATTED_TIME">%s</xliff:g> পর্যন্ত চালু থাকবে"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"\'বিরক্ত করবেন না\' মোডটি বন্ধ না করা পর্যন্ত সেটি চালু থাকবে"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"<xliff:g id="RULE_NAME">%s</xliff:g> নিয়মটির জন্য \'বিরক্ত করবেন না\' মোডটি নিজে থেকেই চালু হয়ে গেছে"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"<xliff:g id="APP_NAME">%s</xliff:g> অ্যাপটি নিজে থেকেই \'বিরক্ত করবেন না\' মোড চালু করে দিয়েছে"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"শুধুমাত্র অগ্রাধিকার"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2970,7 @@
<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="recent_notifications" msgid="5660639387705060156">"সম্প্রতি পাঠানো হয়েছে"</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>
@@ -2930,7 +2990,7 @@
<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_importance_title" msgid="848692592679312666">"গুরুত্ব"</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="5455049524984686275">"কোনো শব্দ বা ভিজ্যুয়াল বাধা নেই"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"মাঝারি গুরুত্ব"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"বিজ্ঞপ্তির অ্যাক্সেস"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"কর্মস্থলের প্রোফাইলের বিজ্ঞপ্তিতে অ্যাক্সেস ব্লক করা হয়েছে"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"বিরক্ত করবেন না অ্যাক্সেস করুন"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"ইনস্টল করা নেই এমন অ্যাপগুলি বিরক্ত করবেন না অ্যাক্সেস করুন এর অনুরোধ জানিয়েছে"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"অ্যাপ্লিকেশানগুলি লোড করা হচ্ছে..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android এই অ্যাপের বিজ্ঞপ্তিগুলিকে এই ডিভাইসে দেখাতে দিছে না।"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android এই বিভাগের বিজ্ঞপ্তিগুলিকে এই ডিভাইসে দেখাতে দিছে না।"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android এই বিভাগের বিজ্ঞপ্তিগুলিকে এই ডিভাইসে দেখাতে দিচ্ছে না"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"আপনার অনুরোধ অনুযায়ী Android এই অ্যাপের বিজ্ঞপ্তি এই ডিভাইসে দেখাচ্ছে না"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"আপনার অনুরোধ অনুযায়ী Android এই বিভাগের বিজ্ঞপ্তিগুলি এই ডিভাইসে দেখাচ্ছে না"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"আপনার অনুরোধ অনুযায়ী Android এই ধরনের বিজ্ঞপ্তিগুলি এই ডিভাইসে দেখাচ্ছে না"</string>
<string name="notification_channels" msgid="5346841743182627500">"বিভাগগুলি"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"অন্যান্য"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"আপনার ডিভাইস আনলক করার জন্য আঙ্গুলের ছাপ ব্যবহার করা ছাড়াও ডিভাইসটি চালু হওয়ার সময় পাসওয়ার্ড দেওয়ার মাধ্যমে আপনি এটিকে আরো সুরক্ষিত রাখতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত এতে কল, মেসেজ বা অ্যালার্মের কোনও বিজ্ঞপ্তি আসবে না।\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="1793719723017395175">"হ্যাঁ"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"না"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"পিন প্রয়োজন?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"প্যাটার্নের প্রয়োজন?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"পাসওয়ার্ডের প্রয়োজন?"</string>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"বর্তমান ব্যবহারকারী: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> হিসেবে প্রবেশ করেছেন"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> হল ডিফল্ট"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"চালু / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"বন্ধ"</string>
<string name="backup_disabled" msgid="485189128759595412">"ব্যাক-আপ নেওয়া অক্ষম করা রয়েছে"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> এ আপডেট করা হয়েছে"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"ব্যাক-আপ বন্ধ করা যাবে না"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"এই অ্যাকশনটি অক্ষম করা আছে। আরো জানতে আপনার প্রতিষ্ঠানের প্রশাসকের সাথে যোগাযোগ করুন।"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"আরো বিশদ বিবরণ"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"আপনার প্রশাসক আপনার কর্মস্থলের প্রোফাইলের সাথে সম্পর্কিত অ্যাপ এবং ডেটা নিরীক্ষণ ও পরিচালনা করতে পারেন, যাতে সামিল রয়েছে সেটিংস, অনুমতি, কর্পোরেট অ্যাক্সেস, নেটওয়ার্ক কার্যকলাপ এবং ডিভাইসের অবস্থান তথ্য।"</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"কর্মস্থলের প্রোফাইল বন্ধ রয়েছে"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"অ্যাপ, পটভূমি সিঙ্ক এবং আপনার কর্মস্থলের প্রোফাইলের সাথে সম্পর্কিত অন্য বৈশিষ্ট্যগুলিকে বন্ধ করা হয়েছে৷"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"নাইট লাইটের সময়সূচী সেট করুন"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ঘুম আসতে অসুবিধা না হওয়ার জন্য স্ক্রিনের আভা অ্যাম্বার করুন"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"নাইট লাইট চালু আছে"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+ আরও <xliff:g id="ID_1">%1$d</xliff:g>টি"</string>
@@ -3537,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"কোনওটিই নয়"</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>
@@ -3559,31 +3628,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"একাধিক ডিভাইসের সাথে সংযুক্ত আছে"</string>
<string name="demo_mode" msgid="2798762752209330277">"সিস্টেম UI ডেমো মোড"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"দ্রুত সেটিংস ডেভেলপার টাইলস"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"আপনাকে সাহায্য করতে আমরা প্রস্তুত"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"আমরা আপনাকে সহায়তা করার জন্য সপ্তাহে সাত দিন ২৪ ঘণ্টা এখানে রয়েছি"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"আমরা আপনাকে সহায়তা করার জন্য সপ্তাহে সাত দিন ২৪ ঘণ্টা এখানে রয়েছি"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"যেকোনও সমস্যার সমাধান করার জন্য আমাদের সহায়তা টিম এখানে রয়েছে"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"আমাদের সহায়তা টিম সপ্তাহে সাত দিন ২৪ ঘণ্টা এখানে রয়েছে"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"সহায়তা খুঁজুন বা সহায়তা প্রদান চালু থাকার সময়ে আমাদের সাথে যোগযোগ করুন (স্থানীয় সময়):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ফোনের মাধ্যমে সহায়তা প্রদান করার সময় (স্থানীয় সময়)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"সহায়তা খুঁজুন বা টিপ এবং কৌশলগুলি এক্সপ্লোর করুন"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"এর জন্য সমর্থন:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"বিদেশ ভ্রমন করছেন?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"আন্তর্জাতিক চার্জ প্রযোজ্য হতে পারে"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"ফোন"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"চ্যাট করুন"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"টিপ এবং কৌশলগুলি এক্সপ্লোর করুন"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"সহায়তায় খুঁজুন এবং মতামত পাঠান"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"সহায়তায় যোগাযোগ করুন"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"সাইন-ইন করুন"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"সাইন ইন করতে পারছেন না?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"সিস্টেমের তথ্য পাঠান"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"আর দেখাবেন না"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"এই রূপে অনুরোধ করা হচ্ছে"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"অ্যাকাউন্ট যোগ করুন"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"সিস্টেমের তথ্য"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"উইন্ডো ট্রেস"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"সারফেস ট্রেস"</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>
@@ -3599,11 +3645,11 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> সেকেন্ড</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> সেকেন্ড</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> অপেক্ষা করুন"</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="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>
@@ -3614,32 +3660,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ক্যামেরা খোলার জন্য পাওয়ার বোতামটি দুবার টিপুন"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"সেলফি মোডে যাওয়ার জন্য ফোনটি ডবল টুইস্ট করুন"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"সেলফি মোডে যাওয়ার জন্য ট্যাবলেটটি ডবল টুইস্ট করুন"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"সেলফি মোডে যাওয়ার জন্য ডিভাইসটি ডবল টুইস্ট করুন"</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_suggestion_summary" msgid="5987443721392571847">"স্ক্রিন বন্ধ থাকলেও বিজ্ঞপ্তি দেখুন"</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_pickup_suggestion_summary" msgid="7014700589991761035">"স্ক্রিন বন্ধ থাকলেও বিজ্ঞপ্তি দেখুন"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ডিভাইসের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"বিজ্ঞপ্তিগুলি দ্রুত দেখুন"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"চালু আছে"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"বন্ধ আছে"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"বুটলোডার ইতিমধ্যেই আনলক করা হয়েছে"</string>
@@ -3769,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"ডিরেক্টরি অ্যাক্সেস"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"ডিরেক্টরি অ্যাক্সেস"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 2d6ab4e..8dd114d 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Pritisnite dugme"</item>
<item msgid="1624323946324499595">"PIN ravnopravnog uređaja"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 sat"</item>
<item msgid="5198271470953124739">"Ne ističe nikada"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (Zadano)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Loš"</item>
<item msgid="2042505933058940139">"Loš"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Starije od 60 dana"</item>
<item msgid="5692284879054004388">"Starije od 90 dana"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Koristi mrežne postavke"</item>
+ <item msgid="8745603368609022803">"Tretiraj kao vezu s ograničenjem"</item>
+ <item msgid="2266114985518865625">"Tretiraj kao vezu bez ograničenja"</item>
+ </string-array>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index d31e910..aa5de26 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -38,7 +38,7 @@
<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 podatkovnu vezu"</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>
<string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE"</string>
<string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video poziv obezbijeđen"</string>
@@ -171,6 +171,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparivanje novog uređaja"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Dozvolite uređaju uparivanje i povezivanje s Bluetooth uređajima"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Onemogući zvono unutar pojasa"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Ne reproduciraj prilagođene melodije zvona telefona na Bluetooth slušalicama"</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>
@@ -205,7 +207,7 @@
<string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informacije o susjednim ćelijama (zastarjela):"</string>
<string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Interval osvježavanja informacija o ćeliji"</string>
<string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Sve informacije o mjerenju ćelije"</string>
- <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informacije u stvarnom vremenu o podatkovnoj vezi:"</string>
+ <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informacije u stvarnom vremenu o vezi za prijenos podataka:"</string>
<string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Prijenos podataka:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roming:"</string>
<string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -295,7 +297,7 @@
<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">"Mobilni podaci"</string>
+ <string name="cellular_data_title" msgid="6835451574385496662">"Prijenos podataka na mobilnoj mreži"</string>
<string name="calls_title" msgid="3544471959217176768">"Pozivi"</string>
<string name="sms_messages_title" msgid="1778636286080572535">"SMS poruke"</string>
<string name="cellular_data_summary" msgid="4660351864416939504">"Dopusti prijenos podataka mobilnom mrežom"</string>
@@ -332,6 +334,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Postavljanje vremena"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortiraj po abecedi"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Poredaj po vremenskim zonama"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> počinje <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Ljetno računanje vremena"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Standardno vrijeme"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Vremenska zona po regiji"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Vremenske zone s fiksnim pomakom"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
<string name="time_picker_title" msgid="483460752287255019">"Vrijeme"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Automatsko zaključavanje"</string>
@@ -342,6 +349,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Poruka na zaključanom ekranu"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Omogući vidžete"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Onemogućio administrator"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ništa"</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">"Npr. Edinov Android."</string>
@@ -350,6 +361,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Podaci o profilu"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Koristi lokaciju"</string>
<string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Sigurnost i lokacija"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifriranje i akreditivi"</string>
@@ -462,9 +474,16 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti tablet, morate izvršiti vraćanje na fabričke postavke. Prilikom podešavanja tableta nakon ponovnog postavljanja, imat ćete priliku da vratite podatke čija sigurnosna kopija je spremljena u vaš Google račun."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti telefon, morate izvršiti vraćanje na fabričke postavke. Prilikom podešavanja telefona nakon ponovnog postavljanja, imat ćete priliku da vratite podatke čija sigurnosna kopija je spremljena u vaš Google račun."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Promjena načina unosa"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Postavite zaključavanje ekrana"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zaštitite svoj uređaj"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Koristite otisak prsta"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Otključajte otiskom prsta"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Zaključavanje ekrana"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Odaberi zaklj. profila"</string>
@@ -702,6 +721,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kao spikerfon"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za muziku i medijske sadržaje"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimalan broj povezanih Bluetooth audio uređaja"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Izaberite maksimalan broj povezanih Bluetooth audio uređaja"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Emitiranje"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogući bežični prikaz"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nije pronađen nijedan uređaj u blizini."</string>
@@ -716,6 +737,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Ime"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Prijava"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mb/s"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> želi uključiti Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> želi isključiti Wi-Fi"</string>
@@ -733,6 +755,7 @@
<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">"Koristi Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi postavke"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Podešavanje bežičnih pristupnih tačaka i upravljanje njima"</string>
@@ -766,9 +789,9 @@
<string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimizacija Wi-Fi-ja"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Korištenje baterije se svodi na minimum kada je Wi-Fi uključen"</string>
<string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit za bateriju za Wi-Fi"</string>
- <string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"Prebaci se na mobilne podatke ako Wi-Fi izgubi pristup internetu."</string>
- <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Automatsko prebacivanje na prijenos mobilnih podataka"</string>
- <string name="wifi_cellular_data_fallback_summary" msgid="1403505355490119307">"Korištenje mobilnih podataka kada Wi-Fi mreža nema pristup internetu. Mogu nastati troškovi prijenosa podataka."</string>
+ <string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"Prebaci se na prijenos podataka na mobilnoj mreži ako Wi-Fi izgubi pristup internetu."</string>
+ <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Automatsko prebacivanje na prijenos podataka na mobilnoj mreži"</string>
+ <string name="wifi_cellular_data_fallback_summary" msgid="1403505355490119307">"Korištenje prijenosa podataka na mobilnoj mreži kada Wi-Fi mreža nema pristup internetu. Mogu nastati troškovi prijenosa podataka."</string>
<string name="wifi_add_network" msgid="6234851776910938957">"Dodajte mrežu"</string>
<string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Postavke za Wi-Fi"</string>
<string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi veza se uključuje ponovo automatski"</string>
@@ -827,6 +850,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Lozinka"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Prikaži lozinku"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Odaberite opseg pristupne tačke"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatski"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Opseg od 2.4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Opseg od 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP postavke"</string>
@@ -844,7 +868,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite svoju lozinku za mrežu"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi-Fi mreža mobilnog operatera"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Povežite se preko mobilnog operatera <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Povežite se preko mobilnog operatera <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Da biste poboljšali preciznost lokacije te u druge svrhe, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikacija želi uključiti skeniranje mreže, čak i kada je Wi-Fi isključen.\n\nŽelite li dozvoliti ovo za sve aplikacije koje žele izvršiti skeniranje?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Da ovo isključite, idite na Napredno u preklopnom meniju."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dozvoli"</string>
@@ -919,10 +943,10 @@
<string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Drugi uređaji se mogu povezati na pristupnu tačku <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
<string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Lozinka pristupne tačke"</string>
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP opseg"</string>
- <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Koristite pristupnu tačku da kreirate Wi‑Fi mrežu za ostale svoje uređaje. Pristupna tačka pruža internet koristeći vaš mobilni prijenos podataka. Mogu nastati dodatni troškovi prijenosa mobilnih podataka."</string>
+ <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Koristite pristupnu tačku da kreirate Wi‑Fi mrežu za ostale svoje uređaje. Pristupna tačka pruža internet koristeći vašu vezu za prijenos podataka na mobilnoj mreži. Mogu nastati dodatni troškovi prijenosa mobilnih podataka."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije mogu kreirati pristupnu tačku za dijeljenje sadržaja s uređajima u blizini."</string>
- <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Automatski isključi žarišnu točku"</string>
- <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Žarišna točka Wi‑Fi-ja isključit će se ako nije povezan nijedan uređaj"</string>
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Automatski isključi pristupnu tačku"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Wi‑Fi pristupna tačka će se isključiti ako nijedan uređaj nije povezan"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje pristupne tačke…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje pristupne tačke…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivna"</string>
@@ -933,7 +957,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android pristupna tačka"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi pozivanje"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Uključite Wi-Fi pozive"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Koristite Wi-Fi umjesto mobilne mreže"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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 Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Postavke rominga"</string>
@@ -971,6 +996,7 @@
<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>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saznajte više"</annotation>" o funkcijama Privatnog DNS-a"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
<string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Jačine zvuka"</string>
@@ -1133,11 +1159,11 @@
<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>
- <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Odaberite željenu SIM karticu za prijenos mobilnih podataka."</string>
+ <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Odaberite željenu SIM karticu za prijenos podataka na mobilnoj mreži."</string>
<string name="sim_change_data_title" msgid="294357201685244532">"Promijeniti podatkovni SIM?"</string>
- <string name="sim_change_data_message" msgid="5854582807996717811">"Želite li za prijenos mobilnih podataka koristiti SIM karticu <xliff:g id="NEW_SIM">%1$s</xliff:g> umjesto SIM kartice <xliff:g id="OLD_SIM">%2$s</xliff:g>?"</string>
+ <string name="sim_change_data_message" msgid="5854582807996717811">"Želite li za prijenos podataka na mobilnoj mreži koristiti SIM karticu <xliff:g id="NEW_SIM">%1$s</xliff:g> umjesto SIM kartice <xliff:g id="OLD_SIM">%2$s</xliff:g>?"</string>
<string name="sim_preferred_title" msgid="5567909634636045268">"Ažurirati željenu SIM karticu?"</string>
- <string name="sim_preferred_message" msgid="8466930554330635780">"SIM kartica <xliff:g id="NEW_SIM">%1$s</xliff:g> jedina je SIM kartica u vašem uređaju. Želite li tu SIM karticu koristiti za prijenos mobilnih podataka, pozive i SMS poruke?"</string>
+ <string name="sim_preferred_message" msgid="8466930554330635780">"SIM kartica <xliff:g id="NEW_SIM">%1$s</xliff:g> jedina je SIM kartica u vašem uređaju. Želite li tu SIM karticu koristiti za prijenos podataka na mobilnoj mreži, pozive i SMS poruke?"</string>
<string name="wrong_pin_code_pukked" msgid="4003655226832658066">"PIN za SIM je netačan. Za otključavanje uređaja sada morate kontaktirati svog operatera."</string>
<plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
<item quantity="one">PIN za SIM je netačan. Preostao vam je još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaj.</item>
@@ -1186,6 +1212,8 @@
<string name="status_network_type" msgid="3279383550222116235">"Vrsta mobilne mreže"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Informacije o operateru"</string>
<string name="status_data_state" msgid="5503181397066522950">"Stanje mobilne mreže"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"Stanje usluge"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Jačina signala"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roming"</string>
@@ -1319,6 +1347,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Novi uređaj (<xliff:g id="NAME">^1</xliff:g>) funkcionira. \n\nDa biste premjestili slike, datoteke i podatke aplikacija na ovaj uređaj, idite na Postavke > Memorija."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Premjesti <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Premještanje <xliff:g id="APP">^1</xliff:g> i njenih podataka na <xliff:g id="NAME_0">^2</xliff:g> će trajati samo nekoliko trenutaka. Nećete biti u mogućnosti koristiti aplikacije sve dok se ne završi premještanje. \n\n Nemojte uklanjati <xliff:g id="NAME_1">^2</xliff:g> tokom premještanja."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Da prebacite podatke, morate otključati korisnika <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Premješta se <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Nemojte uklanjati <xliff:g id="NAME">^1</xliff:g> tokom premještanja. Aplikacija \n\n <xliff:g id="APP">^2</xliff:g> na ovom uređaju neće biti dostupna sve dok se ne završi premještanje."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Poništi premještanje"</string>
@@ -1371,19 +1400,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Mreža, aplikacije ili uređaj mogu se vratiti na zadano"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Vrati Wi-Fi, mobilnu i Bluetooth vezu na zadane postavke"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Sve postavke mreže vratit će se na zadano, uključujući:\n\n"<li>"Wi‑Fi mrežu"</li>\n<li>"Prijenos mobilnih podataka"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Vraćanje i eSIM-ova na zadano"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"Vrati postavke na zadano"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Vratiti sve postavke mreže na zadano? Ovu radnju ne možete poništiti!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Vrati postavke na zadano"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Ponovo postaviti?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Ponovno postavljanje mreže nije dostupno za ovog korisnika"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Postavke mreže vraćene su na zadano"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Nije moguće vratiti eSIM-ove na zadano"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Nije moguće vratiti eSIM-ove na zadano zbog greške."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Potpuno izbriši sve podatke (vraćanje na fabričke postavke)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ovo će izbrisati sve podatke iz "<b>"interne memorije"</b>" vašeg tableta, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"sistemske i aplikacijske podatke i postavke"</li>\n<li>"preuzete aplikacije"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ovo će izbrisati sve podatke iz "<b>"interne memorije"</b>" vašeg telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"sistemske i aplikacijske podatke i postavke"</li>\n<li>"preuzete aplikacije"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni u sljedeće račune:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Drugi korisnici su prisutni na ovom uređaju.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilni operateri na eSIM kartici"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM kartice"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Ovim se neće otkazati vaš plan usluga mobilnog operatera."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"SD kartica"</b>" treba biti izbrisana."</string>
@@ -1424,7 +1458,7 @@
<string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"Dijeljenje internetske veze uređaja <xliff:g id="DEVICE_NAME">%1$d</xliff:g> putem Bluetootha"</string>
<string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Nije se moguće povezati sa više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja."</string>
<string name="bluetooth_untether_blank" msgid="2871192409329334813">"Prestat će se dijeliti veza s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
- <string name="tethering_footer_info" msgid="7112228674056306147">"Koristite pristupnu tačku i povezivanje putem mobitela za pružanje interneta drugim uređajima putem mobilnog prijenosa podataka. Aplikacije također mogu kreirati pristupne tačke za dijeljenje sadržaja s uređajima u blizini."</string>
+ <string name="tethering_footer_info" msgid="7112228674056306147">"Koristite pristupnu tačku i povezivanje putem mobitela za pružanje interneta drugim uređajima putem veze za prijenos podataka na mobilnoj mreži. Aplikacije također mogu kreirati pristupne tačke za dijeljenje sadržaja s uređajima u blizini."</string>
<string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
<string name="network_settings_title" msgid="2876509814832830757">"Mobilna mreža"</string>
<string name="manage_mobile_plan_title" msgid="7630170375010107744">"Paket mobilne usluge"</string>
@@ -1443,21 +1477,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Povežite se na Internet"</string>
<string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokacija za profil za Work"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka preciznost"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ušteda baterije"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Samo uređaj"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Utvrđivanje lokacije isključeno"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Odobrenja na nivou aplikacija"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedavni zahtjevi za utvrđivanje lokacije"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Nijedna aplikacija nije zahtijevala utvrđivanje lokacije u posljednje vrijeme"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Usluge lokacije"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Visoka potrošnja baterije"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Niska potrošnja baterije"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Način otkrivanja lokacije"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Koristi GPS, Wi-Fi, Bluetooth ili mobilne mreže za određivanje lokacije"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Koristi Wi-Fi, Bluetooth ili mobilnu mrežu za određivanje lokacije"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Koristi GPS i senzore uređaja za određivanje lokacije"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Skeniranje"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Skeniranje Wi‑Fi mreže"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Poboljšajte utvrđivanje lokacije tako da dozvolite sistemskim aplikacijama i uslugama da detektiraju Wi-Fi mreže u bilo kom trenutku."</string>
@@ -1479,6 +1504,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Izvori lokacije"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"O tabletu"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"O telefonu"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"O uređaju"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"O emuliranom uređaju"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Prikaži pravne informacije, status, verziju softvera"</string>
<string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
@@ -1586,6 +1612,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Prikaži sve aplikacije: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Vaši podaci na tabletu i lični podaci su više izloženi napadima aplikacija iz nepoznatih izvora. Instaliranjem aplikacija iz takvih izvora, saglasni ste da ste vi odgovorni za bilo kakvu štetu na telefonu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Vaši podaci na telefonu i lični podaci više su izloženi napadima aplikacija iz nepoznatih izvora. Instaliranjem aplikacija iz takvih izvora, saglasni ste da ste vi odgovorni za bilo kakvu štetu na telefonu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Podaci s vašeg uređaja i vaši lični podaci su izloženiji napadima nepoznatih aplikacija. Instaliranjem aplikacija iz ovog izvora prihvatate odgovornost za bilo kakvu štetu na uređaju ili gubitak podataka uzrokovan njihovim korištenjem."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
<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>
@@ -1886,6 +1913,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Može uticati na performanse"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik kada se pokazivač zaustavi"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Odgoda prije klika"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"UKLJUČENO"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ISKLJUČENO"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži u Brzim postavkama"</string>
@@ -2006,7 +2036,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">"Preostalo <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do pune baterije"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Aktivnosti u pozadini"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Ograničena"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Dopustite aplikaciji da radi u pozadini"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Aplikacija može raditi u pozadini kada se ne koristi"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Aktivnost aplikacije u pozadini je ograničena kada se ne koristi"</string>
@@ -2050,11 +2080,31 @@
<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="7060523369832289878">"Baterija je u dobrom stanju"</string>
- <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikacije se ponašaju na uobičajen način"</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikacije se normalno ponašaju"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Nizak kapacitet baterije"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Baterija ne može osigurati dobar vijek trajanja"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Uključite pametnog upravitelja baterije"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Uključite za optimiziranje potrošnje baterije"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Uključite način rada Niska potrošnja baterije"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Produžite trajanje baterije"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Uključen je način rada Niska potrošnja baterije"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Neke funkcije su ograničene"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Pojačano korištenje telefona"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Pojačano korištenje tableta"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Pojačano korištenje uređaja"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Oko <xliff:g id="HOUR">%1$s</xliff:g> iskorišteno od posljednje potpune napunjenosti"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Puno ste koristili telefon i potrošili mnogo baterije. Baterija se ponaša normalno.\n\n Od posljednje potpune napunjenosti telefon ste koristili oko <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Ukupna potrošnja:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Puno ste koristili tablet i potrošili mnogo baterije. Baterija se ponaša normalno.\n\n Od posljednje potpune napunjenosti tablet ste koristili oko <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Ukupna potrošnja:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Puno ste koristili uređaj i potrošili mnogo baterije. Baterija se ponaša normalno.\n\n Od posljednje potpune napunjenosti uređaj ste koristili oko <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Ukupna potrošnja:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Pametni upravitelj baterije"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Automatsko upravljanje baterijom"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Automatsko prilagođavanje potrošnje energije za aplikacije na osnovu korištenja"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Ograničene aplikacije"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d aplikacija</item>
+ <item quantity="few">%1$d aplikacije</item>
+ <item quantity="other">%1$d aplikacija</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Želite zaustaviti aplikaciju?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Vaš telefon ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno drži vaš telefon aktivnim.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju.\n\nAko se problem ne riješi, možda ćete trebati deinstalirati aplikaciju da poboljšate rad baterije."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Vaš tablet ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno drži vaš tablet aktivnim.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju.\n\nAko se problem ne riješi, možda ćete trebati deinstalirati aplikaciju da poboljšate rad baterije."</string>
@@ -2163,6 +2213,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Server za medijske sadržaje"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizacija aplikacija"</string>
<string name="battery_saver" msgid="8172485772238572153">"Ušteda baterije"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Koristi Uštedu baterije"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Automatsko uključivanje"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikad"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"na <xliff:g id="PERCENT">%1$s</xliff:g> baterije"</string>
@@ -2273,7 +2324,7 @@
<string name="usage_access_title" msgid="332333405495457839">"Apl. s pristupom pod. o korišt."</string>
<string name="emergency_tone_title" msgid="1055954530111587114">"Ton za hitne pozive"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Postavi ponašanje prilikom upućivanja poziva za hitne situacije"</string>
- <string name="privacy_settings_title" msgid="2978878794187459190">"Sigurnosno kopiranje"</string>
+ <string name="privacy_settings_title" msgid="2978878794187459190">"Izrada sigurnosnih kopija"</string>
<string name="backup_section_title" msgid="7952232291452882740">"Sigurnosna kopija i vraćanje"</string>
<string name="personal_data_section_title" msgid="7815209034443782061">"Lični podaci"</string>
<string name="backup_data_title" msgid="1239105919852668016">"Izrada sigurnosnih kopija podataka"</string>
@@ -2285,7 +2336,7 @@
<string name="backup_inactive_title" msgid="685838037986644604">"Usluga za izradu sigurnosne kopije nije aktivna"</string>
<string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Nijedan račun trenutno ne pravi sigurnosne kopije podataka"</string>
<string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
- <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Želite li prestati sa pravljenjem sigurnosnih kopija lozinki za Wi-Fi, obeleživača, drugih postavki te podataka aplikacija i izbrisati sve kopije sa Google servera?"</string>
+ <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Želite li prestati sa izradom sigurnosnih kopija lozinki za Wi-Fi, obeleživača, drugih postavki te podataka aplikacija i izbrisati sve kopije sa Google servera?"</string>
<string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Prestani da praviš sigurnosne kopije podataka (npr. lozinke za Wi-Fi i istorija poziva) i podataka aplikacije (npr. postavke i fajlovi koje pohranjuju aplikacije), i izbriši sve kopije na udaljenim serverima?"</string>
<string name="fullbackup_data_summary" msgid="960850365007767734">"Daljinski pokrenite automatsku izradu sigurnosnih kopija podataka na uređaju (npr. Wi-Fi lozinki i historije poziva) i podataka iz aplikacija (npr. postavki i fajlova koje pohranjuju aplikacije).\n\nKada uključite automatsku izradu sigurnosnih kopija, podaci iz uređaja i aplikacija se periodično pohranjuju daljinski. Podaci iz aplikacije mogu biti bilo koji podaci koje je aplikacija sačuvala (na osnovu programerskih postavki), uključujući 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>
@@ -2350,8 +2401,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Trenutno ima problema sa sinhroniziranjem. Ubrzo će opet raditi."</string>
<string name="add_account_label" msgid="7811707265834013767">"Dodaj račun"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Radni profil još uvijek nije dostupan"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Način rada"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Omogućava radnom profilu da funkcionira, uključujući aplikacije, sinhronizaciju u pozadini i povezane funkcije"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Ukloni radni profil"</string>
<string name="background_data" msgid="5779592891375473817">"Podaci u pozadini"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Aplikacije mogu sinhronizirati, slati i primati podatke u bilo koje vrijeme"</string>
@@ -2383,6 +2438,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Ukloniti račun?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Uklanjanjem ovog računa će se izbrisati sve njegove poruke, kontakti i ostali podaci s tableta!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Uklanjanjem ovog računa će se izbrisati sve njegove poruke, kontakti i ostali podaci s telefona!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Uklanjanjem ovog računa izbrisat ćete sve njegove poruke, kontakte i druge podatke s uređaja!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Vaš administrator ne dopušta ovu promjenu"</string>
<string name="provider_label" msgid="7724593781904508866">"Push pretplate"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2408,7 +2464,7 @@
<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>
- <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobilni podaci"</string>
+ <string name="data_usage_cellular_data" msgid="9168928285122125137">"Prijenos podataka na mobilnoj mreži"</string>
<string name="data_usage_data_limit" msgid="1193930999713192703">"Postavljanje ograničenja za podatke"</string>
<string name="data_usage_cycle" msgid="5652529796195787949">"Ciklus prijenosa podataka"</string>
<string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Korištenje aplikacije"</string>
@@ -2434,7 +2490,7 @@
<string name="data_usage_label_foreground" msgid="4938034231928628164">"Prvi plan"</string>
<string name="data_usage_label_background" msgid="3225844085975764519">"Pozadina"</string>
<string name="data_usage_app_restricted" msgid="3568465218866589705">"ograničeno"</string>
- <string name="data_usage_disable_mobile" msgid="8656552431969276305">"Želite li isključiti prijenos mobilnih podataka?"</string>
+ <string name="data_usage_disable_mobile" msgid="8656552431969276305">"Želite li isključiti prijenos podataka na mobilnoj mreži?"</string>
<string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Ograničenje za mobilne podatke"</string>
<string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Postavi ograničenje za 4G podatke"</string>
<string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Ograničenje 2G-3G podataka"</string>
@@ -2453,11 +2509,11 @@
<string name="data_usage_background_label" msgid="2722008379947694926">"Pozadina:"</string>
<string name="data_usage_app_settings" msgid="2279171379771253165">"Aplikacijske postavke"</string>
<string name="data_usage_app_restrict_background" msgid="7359227831562303223">"Pozadinski podaci"</string>
- <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Omogući prijenos mobilnih podataka u pozadini"</string>
+ <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Omogući prijenos podataka na mobilnoj mreži u pozadini"</string>
<string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Za ograničenje poz. podat. za ovu apl. ograničite mob. podatke."</string>
<string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograničiti podatke u pozadini?"</string>
<string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Zbog te značajke aplikacija koja ovisi o pozadinskim podacima može prestati raditi kada su dostupne samo mobilne mreže.\n\nU postavkama možete pronaći prikladnije kontrole prijenosa podataka."</string>
- <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Ograničavanje prijenosa pozadinskih podataka moguće je samo ako ste postavili ograničenje za prijenos mobilnih podataka."</string>
+ <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Ograničavanje prijenosa pozadinskih podataka moguće je samo ako ste postavili ograničenje za prijenos podataka na mobilnoj mreži."</string>
<string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Uklj. autom. sinhron. podataka?"</string>
<string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Promjene računa koje unesete na webu automatski će se kopirati na tablet.\n\nNeki računi također mogu automatski kopirati promjene s tableta na web. Google račun funkcionira na ovaj način."</string>
<string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Promjene računa koje unesete na webu automatski će se kopirati na telefon.\n\nNeki računi također mogu automatski kopirati promjene s telefona na web. Google račun funkcionira na ovaj način."</string>
@@ -2469,8 +2525,8 @@
<string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavljanje upozorenja o prijenosu podataka"</string>
<string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Postavljanje ograničenja za prijenos podataka"</string>
<string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograničavanje prijenosa podataka"</string>
- <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Vaš tablet će isključiti prijenos mobilnih podataka nakon što dostigne ograničenje koje ste postavili.\n\nS obzirom na to da vaš telefon mjeri prijenos podataka te da obračun vašeg operatera može biti drugačiji, uzmite u obzir postavljanje umjerenog ograničenja."</string>
- <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Vaš telefon će isključiti prijenos mobilnih podataka nakon što dostigne ograničenje koje ste postavili.\n\nS obzirom na to da vaš telefon mjeri prijenos podataka te da obračun vašeg operatera može biti drugačiji, uzmite u obzir postavljanje umjerenog ograničenja."</string>
+ <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Vaš tablet će isključiti prijenos podataka na mobilnoj mreži nakon što dostigne ograničenje koje ste postavili.\n\nS obzirom na to da vaš telefon mjeri prijenos podataka te da obračun vašeg operatera može biti drugačiji, uzmite u obzir postavljanje umjerenog ograničenja."</string>
+ <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Vaš telefon će isključiti prijenos podataka na mobilnoj mreži nakon što dostigne ograničenje koje ste postavili.\n\nS obzirom na to da vaš telefon mjeri prijenos podataka te da obračun vašeg operatera može biti drugačiji, uzmite u obzir postavljanje umjerenog ograničenja."</string>
<string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograničiti podatke u pozadini?"</string>
<string name="data_usage_restrict_background" msgid="434093644726734586">"Ako ograničite prijenos pozadinskih mobilnih podataka, neke aplikacije i usluge neće raditi ukoliko niste povezani na Wi-Fi mrežu."</string>
<string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Ako ograničite prijenos pozadinskih mobilnih podataka, neke aplikacije i usluge neće raditi ukoliko niste povezani na Wi-Fi mrežu.\n\nOva postavka utiče na sve korisnike registrirane na ovom tabletu."</string>
@@ -2551,7 +2607,7 @@
<string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Funkcija Uvijek uključeno je aktivna"</string>
<string name="vpn_require_connection" msgid="8388183166574269666">"Blokiraj veze bez VPN-a"</string>
<string name="vpn_require_connection_title" msgid="159053539340576331">"Treba li zahtijevati VPN vezu?"</string>
- <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Odaberite VPN profil s kojim će uvijek biti uspostavljena veza. Mrežni promet će biti dopušten samo kad je uspostavljena veza s tim VPN-om."</string>
+ <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Odaberite VPN profil s kojim će uvijek biti uspostavljena veza. Mrežni saobraćaj će biti dopušten samo kad je uspostavljena veza s tim VPN-om."</string>
<string name="vpn_lockdown_none" msgid="9214462857336483711">"Nema"</string>
<string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Uvijek aktivni VPN zahtijeva IP adresu i za server i za DNS."</string>
<string name="vpn_no_network" msgid="3050233675132726155">"Nema mrežne veze. Pokušajte ponovo kasnije."</string>
@@ -2605,7 +2661,8 @@
<item quantity="few">Provjerite certifikate</item>
<item quantity="other">Provjerite certifikate</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Korisnici"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Korisnici i profili"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodaj korisnika ili profil"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj korisnika"</string>
@@ -2745,7 +2802,7 @@
<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">"SIM kartice su promijenjene"</string>
<string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Dodirnite za podešavanje aktivnosti"</string>
- <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Prijenos mobilnih podataka je nedostupan"</string>
+ <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Prijenos podataka na mobilnoj mreži je nedostupan"</string>
<string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Dodirnite za odabir SIM kartice za prijenos podataka"</string>
<string name="sim_calls_always_use" msgid="7936774751250119715">"Uvijek koristi ovo za pozive"</string>
<string name="select_sim_for_data" msgid="2366081042162853044">"Odaberite SIM za podatke"</string>
@@ -2796,7 +2853,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</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="account_dashboard_title" msgid="4936890821712178853">"Korisnici i računi"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2827,7 +2885,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ne ne uznemiravaj, prekinuti, prekidanje, pauza"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"u blizini, lokacija, istorija, izvještavanje"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"preciznost"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"račun"</string>
<string name="keywords_users" msgid="3434190133131387942">"ograničenje, ograničavanje, ograničen"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"korekcija teksta, ispravan, zvuk, vibrirati, auto, jezik, gest, predložiti, prijedlog, tema, uvredljivo, riječ, vrsta, emoji, međunarodna"</string>
@@ -2895,6 +2952,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> pravila</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne ometaj"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Uključi način rada Ne ometaj"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Ponašanje"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Omogući zvuke i vibracije od"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Bez zvuka"</string>
@@ -2904,8 +2962,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Automatsko uključivanje"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Automatska pravila"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Automatsko pravilo"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Postavite pravila za funkciju Ne ometaj"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ograničite zvuk i vibracije u određenim vremenskim periodima"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Koristi pravilo"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Samo prioritetno"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Potpuna tišina"</string>
@@ -2913,12 +2974,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokiranje vizuelnih ometanja"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dozvolite vizualnu signalizaciju"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Dodaj"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"UKLJUČI SADA"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ISKLJUČI SADA"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Uključi"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Uključi sada"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Isključi sada"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Opcija Ne ometaj će biti uključena do <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Opcija Ne ometaj će biti uključena dok je ne isključite"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Opcija Ne ometaj je automatski uključena na osnovu pravila (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Opciju Ne ometaj je automatski uključila aplikacija (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Samo prioriteti"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Zvukovi radnog profila"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Koristite zvukove ličnog profila"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Zvukovi su isti za radni i lični profil"</string>
@@ -2934,6 +2998,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Melodije zvona"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Ostali zvukovi i vibracije"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Obavještenja"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Nedavno poslano"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Napredno"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Obavještenja za posao"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Dozvoli tačke za obavještenja"</string>
@@ -2953,7 +3018,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Obavještenja o aplikaciji"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obavještenja"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Grupa kategorija obavještenja"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Značaj"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Ponašanje"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Dozvoli zvuk"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Nikad ne prikazuj obavještenja"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Bez ometanja zvukom ili prikazivanjem"</string>
@@ -2971,6 +3036,7 @@
<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_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>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obavještenjima"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Pristup obavještenjima radnog profila je blokiran"</string>
@@ -3002,9 +3068,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne ometaj"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zatražila pristup za Ne ometaj"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Učitavaju se aplikacije..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokira prikaz obavještenja ove aplikacije na uređaju"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokira prikaz ove kategorije obavještenja na uređaju"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokira prikaz ove kategorije obavještenja na uređaju"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Na vaš zahtjev, Android blokira pojavljivanje obavještenja iz ove aplikacije na ovom uređaju"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Na vaš zahtjev, Android blokira pojavljivanje ove kategorije obavještenja na ovom uređaju"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Na vaš zahtjev, Android blokira pojavljivanje ove grupe obavještenja na ovom uređaju"</string>
<string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Ostalo"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3154,6 +3220,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštiti zahtijevanjem unošenja lozinke prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme.\n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja zahtijeva lozinka?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Da"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Ne"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Zahtijevati PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Zahtijevati unos obrasca?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Zahtijevati lozinku?"</string>
@@ -3289,7 +3357,7 @@
<string name="high_power_off" msgid="3393904131961263278">"Optimizacija potrošnje baterije"</string>
<string name="high_power_system" msgid="7362862974428225301">"Optimizacija baterije je nedostupna"</string>
<string name="high_power_desc" msgid="6283926163708585760">"Ne primjenjuje se optimizacija baterije. Tako se baterija može brže isprazniti."</string>
- <string name="high_power_prompt_title" msgid="6358673688590282655">"Želite li dopustiti aplikaciji da uvijek radi u pozadini?"</string>
+ <string name="high_power_prompt_title" msgid="6358673688590282655">"Dopustiti aplikaciji da uvijek radi u pozadini?"</string>
<string name="high_power_prompt_body" msgid="1031422980602565049">"Ako aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> dopustite da uvijek radi u pozadini, može se skratiti vijek trajanja baterije. \n\nTo možete promijeniti kasnije ako odete u Postavke > Aplikacije i obavještenja."</string>
<string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> iskorištenosti od posljednje potpune napunjenosti"</string>
<string name="battery_power_management" msgid="5571519699679107523">"Upravljanje napajanjem"</string>
@@ -3434,9 +3502,10 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Trenutni korisnik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kao korisnik <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> je zadana aplikacija"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"UKLJUČENO/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ISKLJUČENO"</string>
- <string name="backup_disabled" msgid="485189128759595412">"Pravljenje sigurnosnih kopija je onemogućeno"</string>
+ <string name="backup_disabled" msgid="485189128759595412">"Izrada sigurnosnih kopija je onemogućena"</string>
<string name="about_summary" msgid="924181828102801010">"Ažurirano na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
<string name="disabled_by_policy_title" msgid="627023216027648534">"Radnja nije dozvoljena"</string>
<string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"Nije moguće promijeniti jačinu zvuka"</string>
@@ -3444,6 +3513,7 @@
<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="6346948990624612516">"Nije moguće isključiti sigurnosne kopije"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Ova radnja je onemogućena. Da saznate više, obratite se administratoru organizacije."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Više detalja"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Vaš administrator može pratiti i upravljati aplikacijama i podacima povezanim s vašim radnim profilom, uključujući postavke, odobrenja, korporativni pristup, aktivnost na mreži i informacije o lokaciji uređaja."</string>
@@ -3460,16 +3530,18 @@
<string name="condition_zen_title" msgid="2679168532600816392">"Opcija Ne ometaj je uključena (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
<string name="condition_battery_title" msgid="3272131008388575349">"Čuvar baterije je uključen"</string>
<string name="condition_battery_summary" msgid="4418839236027977450">"Performanse su smanjenje. Usluge određivanja lokacije i pozadinski podaci su isključeni."</string>
- <string name="condition_cellular_title" msgid="1327317003797575735">"Mobilni podaci su isključeni"</string>
+ <string name="condition_cellular_title" msgid="1327317003797575735">"Prijenos podataka na mobilnoj mreži je isključen"</string>
<string name="condition_cellular_summary" msgid="1818046558419658463">"Internet je dostupan samo putem Wi-Fi mreže."</string>
<string name="condition_bg_data_title" msgid="2483860304802846542">"Ušteda podataka je uključena"</string>
<string name="condition_bg_data_summary" msgid="656957852895282228">"Pozadinski podaci su dostupni samo putem Wi-Fi mreže. Ovo može uticati na rad nekih aplikacija ili usluga kada Wi-Fi nije dostupan."</string>
<string name="condition_work_title" msgid="7293722361184366648">"Radni profil je isključen"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Isključene su aplikacije, pozadinska sinhronizacija i ostale funkcije povezane s vašim radnim profilom."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Postavite plan za Noćno svjetlo"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Obojite ekran u narandžasto da lakše zaspite"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"Noćno svjetlo je uključeno"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran je obojen u žutosmeđu nijansu. To vam može pomoći da zaspite."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Prijedlozi za vas"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Prijedlozi"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"još <xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"Još <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3493,12 +3565,12 @@
<string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserski senzor kamere"</string>
<string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatsko ažuriranje sistema"</string>
<string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
- <string name="cellular_data_usage" msgid="2155683719898158203">"Prijenos mobilnih podataka"</string>
+ <string name="cellular_data_usage" msgid="2155683719898158203">"Prijenos podataka na mobilnoj mreži"</string>
<string name="wifi_data_usage" msgid="686754111095324306">"Potrošnja Wi-Fi podataka"</string>
<string name="ethernet_data_usage" msgid="5108764537574354616">"Prijenos podataka putem Etherneta"</string>
<string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
<string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
- <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> prenesenih mobilnih podataka"</string>
+ <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> putem prijenosa podataka"</string>
<string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi podataka"</string>
<string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ethernet podataka"</string>
<string name="cell_warning_only" msgid="763147658209027140">"Upozorenje o podacima <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3578,6 +3650,8 @@
<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_none" msgid="5144174674654097316">"Nema"</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>
@@ -3601,31 +3675,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice programera za brze postavke"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Mi smo tu da pomognemo"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Tu smo za vas 24 sata dnevno"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Tu smo za vas 24 sata dnevno"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Naš tim za podršku je tu da se pobrine za sve probleme"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Naš tim za podršku na raspolaganju je cijelog dana, svakog dana."</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Potražite pomoć ili se vratite u radno vrijeme podrške (po lokalnom vremenu):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Radno vrijeme za pružanje telefonske podrške (lokalno vrijeme)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Potražite pomoć ili istražite savjete i trikove"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Podrška za:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Putujete u inostranstvo?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Mogući su troškovi za međunarodne pozive"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Pozovi"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Pokreni chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Istraživanje savjeta i trikova"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Pomoć i slanje povratnih informacija"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Kontaktirajte podršku korisnicima"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prijavite se"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Ne možete se prijaviti?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Pošalji informacije o sistemu"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne prikazuj ponovo"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Tražite kao"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Dodaj račun"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Informacije o sistemu"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Trag prozora"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Površinsko praćenje"</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>
@@ -3644,11 +3695,11 @@
<item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sekunde</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekundi</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Sačekajte ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Upravljanje prostorom za pohranu"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Radi lakšeg oslobađanja prostora za pohranu, upravitelj pohranom s vašeg uređaja uklanja sigurnosne kopije fotografija i videozapisa."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Ukloni fotografije i videozapise"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Upravitelj prostora za pohranu"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Koristi Upravitelja pohrane"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatski"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ručno"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Oslobodite prostor odmah"</string>
@@ -3659,32 +3710,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Prelazak na Kameru"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Dodirivanje dvaput na 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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Dodirnite dugme za napajanje dvaput da otvorite kameru"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Okretanje 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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Uvrnite telefon dvaput za selfi način rada"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Uvrnite tablet dvaput za selfi način rada"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Uvrnite uređaj dvaput za selfi način rada"</string>
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Kliknite dvaput za provjeru telefona"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Kliknite dvaput za provjeru tableta"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Kliknite dvaput za provjeru uređaja"</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_suggestion_summary" msgid="5987443721392571847">"Provjera obavještenja kada je ekran isključen"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Provjerite obavještenja dok je ekran isključen"</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 otiska prsta"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Provjera obavještenja prevlačenjem prstom prema dolje po senzoru za otisak prsta na poleđini telefona."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Provjera obavještenja prevlačenjem prstom prema dolje po senzoru za otisak prsta na poleđini tableta."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Provjera obavještenja prevlačenjem prstom prema dolje po senzoru za otisak prsta na poleđini uređaja."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Brzo pregledajte obavještenja"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Prevucite prstom prema dolje na senzoru za otisak prsta"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Uključeno"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Isključeno"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Program za učitavanje operativnog sistema je već otključan"</string>
@@ -3719,7 +3763,7 @@
<string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Podaci koji su povezani s vašim računom, kao što su e-pošta ili kalendar"</string>
<string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"Spisak aplikacija na vašem uređaju"</string>
<string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"Utrošeno vrijeme i podaci za svaku aplikaciju"</string>
- <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Najskoriji zapis mrežnog prometa"</string>
+ <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Najskoriji zapis mrežnog saobraćaja"</string>
<string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Najnoviji izvještaj o greškama"</string>
<string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Najnoviji zapisnik o aktivnostima"</string>
<string name="enterprise_privacy_none" msgid="7706621148858381189">"Nema"</string>
@@ -3821,8 +3865,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="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 prozor pri svakom padu aplikacije"</string>
+ <string name="directory_access" msgid="4722237210725864244">"Pristup direktorijima"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"pristup direktorijima"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 1e36841..2b3388b 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Push button"</item>
<item msgid="1624323946324499595">"PIN from peer device"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 hour"</item>
<item msgid="5198271470953124739">"Never time out"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (Default)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Poor"</item>
<item msgid="2042505933058940139">"Poor"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Over 60 days old"</item>
<item msgid="5692284879054004388">"Over 90 days old"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Use network preference"</item>
+ <item msgid="8745603368609022803">"Treat as metered"</item>
+ <item msgid="2266114985518865625">"Treat as unmetered"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index aa94d86..3fc7a8c 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Allow device to pair and connect to Bluetooth devices"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Disable in-band ringing"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Don’t play custom phone ringtones on Bluetooth headsets"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Set date"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sort alphabetically"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sort by time zone"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> starts on <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"British Summer Time (also known as daylight savings time)"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Standard time"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Time zone by region"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fixed offset time zones"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
<string name="time_picker_title" msgid="483460752287255019">"Time"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Automatically lock"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Lock screen message"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Enable widgets"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disabled by admin"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Show lockdown option"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Display power button option that turns off extended access and fingerprint unlocking."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"None"</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">"e.g. Joe\'s Android."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profile info"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Use location"</string>
<string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Security & location"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption & credentials"</string>
@@ -459,9 +469,11 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google account."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Switch input method"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Set screen lock"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protect your device"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Use fingerprint"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Set screen lock for security"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Prevent others from using your tablet"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Prevent others from using your device"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Prevent others from using your phone"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Unlock with fingerprint"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Unlock with your fingerprint"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Choose work lock"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum connected Bluetooth audio devices"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Select maximum number of connected Bluetooth audio devices"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Sign in"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn on Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn off Wi-Fi"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Turn on Wi‑Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Use Wi‑Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi settings"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Set up & manage wireless access points"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz band"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz band"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP settings"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi network"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -921,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi Calling"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Turn on Wi-Fi Calling"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Use Wi-Fi instead of mobile network"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Extend coverage by calling over Wi-Fi"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Calling preference"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi Calling mode"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Roaming preference"</string>
@@ -959,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Emergency Address"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Used as your location when you make an emergency call over Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Learn more"</annotation>" about Private DNS features"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
<string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1173,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Mobile network type"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Operator info"</string>
<string name="status_data_state" msgid="5503181397066522950">"Mobile network state"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Service status"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Signal strength"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -1306,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Your new <xliff:g id="NAME">^1</xliff:g> is working. \n\nTo move photos, files and app data to this device, go to Settings > Storage."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Move <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Moving <xliff:g id="APP">^1</xliff:g> and its data to <xliff:g id="NAME_0">^2</xliff:g> will take only a few moments. You won\'t be able to use the app until the move is complete. \n\nDon\'t remove the <xliff:g id="NAME_1">^2</xliff:g> during the move."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"To move data you need to unlock user <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moving <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> during the move. \n\nThe <xliff:g id="APP">^2</xliff:g> app on this device won\'t be available until the move is complete."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancel move"</string>
@@ -1358,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Network, apps or device can be reset"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Reset Wi-Fi, mobile & Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Also reset eSIMs"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Erase all eSIMs on the phone. You’ll have to contact your operator to re-download your eSIMs. This will not cancel your mobile service plan."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Reset all network settings? You can\'t undo this action!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Reset settings"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Network reset is not available for this user"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Can\'t reset eSIMs"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"The eSIMs can’t be reset due to an error."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operators on eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMs"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"This will not cancel your mobile service plan."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
@@ -1430,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Please connect to the internet"</string>
<string name="location_title" msgid="1029961368397484576">"My Location"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Device only"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Location off"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"App-level permissions"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Low battery use"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Use GPS, Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Use Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Use GPS and device sensors to determine location"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi scanning"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Improve location by allowing system apps and services to detect Wi‑Fi networks at any time."</string>
@@ -1466,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Location sources"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"About tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"About phone"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"About device"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"About emulated device"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
<string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
@@ -1573,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Your device and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your device or loss of data that may result from their use."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Enable more settings options"</string>
<string name="application_info_label" msgid="5736524913065714880">"App info"</string>
@@ -1872,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after cursor stops moving"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ON"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
@@ -1985,7 +2005,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> remaining"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> to charge"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Background activity"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Restricted"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Allow the app to run in the background"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"App can run in the background when not in use"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"App\'s background activity is limited when not in use"</string>
@@ -2030,10 +2050,29 @@
<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="7060523369832289878">"Battery is in good shape"</string>
<string name="battery_tip_summary_summary" msgid="7832491466325707487">"Apps are behaving normally"</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Low battery capacity"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Battery can\'t provide good battery life"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Turn on smart battery manager"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Turn on to optimise battery usage"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Turn on Low Battery Mode"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Extend your battery life"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Low Battery Mode is on"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Some features are limited"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Phone used heavily"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet used heavily"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Device used heavily"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"About <xliff:g id="HOUR">%1$s</xliff:g> used since last full charge"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Your phone was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your phone was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Your tablet was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your tablet was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Your device was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your device was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Smart battery manager"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Auto-manage battery"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Automatically adjust power usage by apps based on usage"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Restricted apps"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d apps</item>
+ <item quantity="one">%1$d app</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Stop app?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
@@ -2142,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Media server"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App optimisation"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Use Battery Saver"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Turn on automatically"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Never"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"at <xliff:g id="PERCENT">%1$s</xliff:g> battery"</string>
@@ -2329,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Sync is currently experiencing problems. It will be back shortly."</string>
<string name="add_account_label" msgid="7811707265834013767">"Add account"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Work profile isn\'t available yet"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Work mode"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Allow work profile to function, including apps, background sync and related features"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Work profile"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Managed by your organisation"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Apps and notifications are off"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Remove work profile"</string>
<string name="background_data" msgid="5779592891375473817">"Background data"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Apps can sync, send and receive data at any time"</string>
@@ -2362,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Remove account?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Removing this account will delete all of its messages, contacts and other data from the tablet!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Removing this account will delete all of its messages, contacts and other data from the phone!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Removing this account will delete all of its messages, contacts and other data from the device."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"This change isn\'t allowed by your admin"</string>
<string name="provider_label" msgid="7724593781904508866">"Push subscriptions"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2580,7 +2622,8 @@
<item quantity="other">Check certificates</item>
<item quantity="one">Check certificate</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Users & profiles"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Add user or profile"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
@@ -2770,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</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="account_dashboard_title" msgid="4936890821712178853">"Users & accounts"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2801,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"don\'t disturb, interrupt, interruption, break"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"nearby, location, history, reporting"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"accuracy"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
<string name="keywords_users" msgid="3434190133131387942">"restriction, restrict, restricted"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international"</string>
@@ -2868,6 +2911,7 @@
<item quantity="one">1 rule</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Do Not Disturb"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Turn on Do Not Disturb"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Behaviour"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Allow sounds & vibrations from"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"No sound"</string>
@@ -2877,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Turn on automatically"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Automatic rules"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Automatic rule"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Set Do Not Disturb rules"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limit sounds & vibrations at certain times"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Silence phone at certain times"</string>
+ <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"Set do not disturb rules"</string>
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Use rule"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priority only"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Total silence"</string>
@@ -2886,12 +2931,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Block visual disturbances"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Add"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"TURN ON NOW"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"TURN OFF NOW"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Turn on"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Turn on now"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Turn off now"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Do Not Disturb is on until <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Do Not Disturb will stay on until you turn it off"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Do Not Disturb was automatically turned on by a rule (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Do Not Disturb was automatically turned on by an app (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Priority only"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Use personal profile sounds"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sounds are the same for work and personal profiles"</string>
@@ -2907,6 +2955,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Ringtones"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Other sounds and vibrations"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Recently sent"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Allow notification dots"</string>
@@ -2926,7 +2975,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Notification category group"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Behaviour"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
@@ -2944,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent importance"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Show notifications"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Access to work profile notifications is blocked"</string>
@@ -2974,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android is blocking this group of notifications from appearing on this device"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3121,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Yes"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"No"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Require PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Require pattern?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Require password?"</string>
@@ -3393,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Current user: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Signed in as <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> is default"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ON / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"OFF"</string>
<string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
<string name="about_summary" msgid="924181828102801010">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3403,6 +3456,7 @@
<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="6346948990624612516">"Can\'t turn off backups"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"This action is disabled. To find out more, contact your organisation\'s admin."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"More details"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
@@ -3426,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Work profile is off"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Apps, background sync and other features related to your work profile are turned off."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Set Night Light schedule"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tint screen amber to help you fall asleep"</string>
+ <string name="night_display_suggestion_summary" msgid="228346372178218442">"Automatically tint screen every night"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"Night Light is on"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Screen is tinted amber. This may help you fall asleep."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Suggested for You"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> more"</string>
@@ -3533,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"None"</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>
@@ -3555,31 +3612,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"We\'re here for you 24/7"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"We\'re here for you 24/7"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Our support team is here to help address any issue"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Our support team is available all day, every day"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Search help or come back during support hours (local time):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Phone support hours (local time)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Search help or explore tips & tricks"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Support for:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Travelling abroad?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"International charges may apply"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Phone"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explore tips & tricks"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Search help & send feedback"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contact support"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Sign In"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Can\'t sign in?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Send system information"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Do not show this again"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Requesting as"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Add account"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"System information"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Window Trace"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Surface Trace"</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>
@@ -3595,11 +3629,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
<item quantity="one">1 second</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> wait"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Manage storage"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remove photos & videos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Storage manager"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Use Storage Manager"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Free up space now"</string>
@@ -3610,32 +3644,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Open camera quickly"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Press power button twice to open camera"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Take selfies faster"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Double-twist phone for selfie mode"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Double-twist tablet for selfie mode"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Double-twist device for selfie mode"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Check notifications when screen is off"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Check notifications when screen is off"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"To check your notifications, swipe down on the fingerprint sensor on the back of your tablet."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"To check your notifications, swipe down on the fingerprint sensor on the back of your device."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"See notifications quickly"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Swipe down on the fingerprint sensor"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"On"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is already unlocked"</string>
@@ -3765,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Directory access"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"directory access"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"My Phone"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"My Tablet"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"My Device"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Account"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Device name"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
</resources>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 1e36841..2b3388b 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Push button"</item>
<item msgid="1624323946324499595">"PIN from peer device"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 hour"</item>
<item msgid="5198271470953124739">"Never time out"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (Default)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Poor"</item>
<item msgid="2042505933058940139">"Poor"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Over 60 days old"</item>
<item msgid="5692284879054004388">"Over 90 days old"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Use network preference"</item>
+ <item msgid="8745603368609022803">"Treat as metered"</item>
+ <item msgid="2266114985518865625">"Treat as unmetered"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 7e2defd..d62b2d3 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Allow device to pair and connect to Bluetooth devices"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Disable in-band ringing"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Don’t play custom phone ringtones on Bluetooth headsets"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Set date"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sort alphabetically"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sort by time zone"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> starts on <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"British Summer Time (also known as daylight savings time)"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Standard time"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Time zone by region"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fixed offset time zones"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
<string name="time_picker_title" msgid="483460752287255019">"Time"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Automatically lock"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Lock screen message"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Enable widgets"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disabled by admin"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Show lockdown option"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Display power button option that turns off extended access and fingerprint unlocking."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"None"</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">"e.g. Joe\'s Android."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profile info"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Use location"</string>
<string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Security & location"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption & credentials"</string>
@@ -459,9 +469,11 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google account."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Switch input method"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Set screen lock"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protect your device"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Use fingerprint"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Set screen lock for security"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Prevent others from using your tablet"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Prevent others from using your device"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Prevent others from using your phone"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Unlock with fingerprint"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Unlock with your fingerprint"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Choose work lock"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum connected Bluetooth audio devices"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Select maximum number of connected Bluetooth audio devices"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Sign in"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn on Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn off Wi-Fi"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Turn on Wi‑Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Use Wi‑Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi settings"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Set up & manage wireless access points"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz band"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz band"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP settings"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi network"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -921,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi Calling"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Turn on Wi-Fi Calling"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Use Wi-Fi instead of mobile network"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Extend coverage by calling over Wi-Fi"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Calling preference"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi Calling mode"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Roaming preference"</string>
@@ -959,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Emergency Address"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Used as your location when you make an emergency call over Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Learn more"</annotation>" about Private DNS features"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
<string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1173,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Mobile network type"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Operator info"</string>
<string name="status_data_state" msgid="5503181397066522950">"Mobile network state"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Service status"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Signal strength"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -1306,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Your new <xliff:g id="NAME">^1</xliff:g> is working. \n\nTo move photos, files and app data to this device, go to Settings > Storage."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Move <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Moving <xliff:g id="APP">^1</xliff:g> and its data to <xliff:g id="NAME_0">^2</xliff:g> will take only a few moments. You won\'t be able to use the app until the move is complete. \n\nDon\'t remove the <xliff:g id="NAME_1">^2</xliff:g> during the move."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"To move data you need to unlock user <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moving <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> during the move. \n\nThe <xliff:g id="APP">^2</xliff:g> app on this device won\'t be available until the move is complete."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancel move"</string>
@@ -1358,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Network, apps or device can be reset"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Reset Wi-Fi, mobile & Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Also reset eSIMs"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Erase all eSIMs on the phone. You’ll have to contact your operator to re-download your eSIMs. This will not cancel your mobile service plan."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Reset all network settings? You can\'t undo this action!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Reset settings"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Network reset is not available for this user"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Can\'t reset eSIMs"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"The eSIMs can’t be reset due to an error."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operators on eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMs"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"This will not cancel your mobile service plan."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
@@ -1430,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Please connect to the internet"</string>
<string name="location_title" msgid="1029961368397484576">"My Location"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Device only"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Location off"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"App-level permissions"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Low battery use"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Use GPS, Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Use Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Use GPS and device sensors to determine location"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi scanning"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Improve location by allowing system apps and services to detect Wi‑Fi networks at any time."</string>
@@ -1466,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Location sources"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"About tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"About phone"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"About device"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"About emulated device"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
<string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
@@ -1573,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Your device and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your device or loss of data that may result from their use."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Enable more settings options"</string>
<string name="application_info_label" msgid="5736524913065714880">"App info"</string>
@@ -1872,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after cursor stops moving"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ON"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
@@ -1985,7 +2005,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> remaining"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> to charge"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Background activity"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Restricted"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Allow the app to run in the background"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"App can run in the background when not in use"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"App\'s background activity is limited when not in use"</string>
@@ -2030,10 +2050,29 @@
<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="7060523369832289878">"Battery is in good shape"</string>
<string name="battery_tip_summary_summary" msgid="7832491466325707487">"Apps are behaving normally"</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Low battery capacity"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Battery can\'t provide good battery life"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Turn on smart battery manager"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Turn on to optimise battery usage"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Turn on Low Battery Mode"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Extend your battery life"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Low Battery Mode is on"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Some features are limited"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Phone used heavily"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet used heavily"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Device used heavily"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"About <xliff:g id="HOUR">%1$s</xliff:g> used since last full charge"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Your phone was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your phone was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Your tablet was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your tablet was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Your device was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your device was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Smart battery manager"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Auto-manage battery"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Automatically adjust power usage by apps based on usage"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Restricted apps"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d apps</item>
+ <item quantity="one">%1$d app</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Stop app?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
@@ -2142,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Media server"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App optimisation"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Use Battery Saver"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Turn on automatically"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Never"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"at <xliff:g id="PERCENT">%1$s</xliff:g> battery"</string>
@@ -2329,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Sync is currently experiencing problems. It will be back shortly."</string>
<string name="add_account_label" msgid="7811707265834013767">"Add account"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Work profile isn\'t available yet"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Work mode"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Allow work profile to function, including apps, background sync and related features"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Work profile"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Managed by your organisation"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Apps and notifications are off"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Remove work profile"</string>
<string name="background_data" msgid="5779592891375473817">"Background data"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Apps can sync, send and receive data at any time"</string>
@@ -2362,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Remove account?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Removing this account will delete all of its messages, contacts and other data from the tablet!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Removing this account will delete all of its messages, contacts and other data from the phone!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Removing this account will delete all of its messages, contacts and other data from the device."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"This change isn\'t allowed by your admin"</string>
<string name="provider_label" msgid="7724593781904508866">"Push subscriptions"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2580,7 +2622,8 @@
<item quantity="other">Check certificates</item>
<item quantity="one">Check certificate</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Users & profiles"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Add user or profile"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
@@ -2770,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</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="account_dashboard_title" msgid="4936890821712178853">"Users & accounts"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2801,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"don\'t disturb, interrupt, interruption, break"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"nearby, location, history, reporting"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"accuracy"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
<string name="keywords_users" msgid="3434190133131387942">"restriction, restrict, restricted"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international"</string>
@@ -2868,6 +2911,7 @@
<item quantity="one">1 rule</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Do Not Disturb"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Turn on Do Not Disturb"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Behaviour"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Allow sounds & vibrations from"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"No sound"</string>
@@ -2877,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Turn on automatically"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Automatic rules"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Automatic rule"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Set Do Not Disturb rules"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limit sounds & vibrations at certain times"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Silence phone at certain times"</string>
+ <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"Set do not disturb rules"</string>
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Use rule"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priority only"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Total silence"</string>
@@ -2886,12 +2931,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Block visual disturbances"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Add"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"TURN ON NOW"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"TURN OFF NOW"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Turn on"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Turn on now"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Turn off now"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Do Not Disturb is on until <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Do Not Disturb will stay on until you turn it off"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Do Not Disturb was automatically turned on by a rule (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Do Not Disturb was automatically turned on by an app (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Priority only"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Use personal profile sounds"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sounds are the same for work and personal profiles"</string>
@@ -2907,6 +2955,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Ringtones"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Other sounds and vibrations"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Recently sent"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Allow notification dots"</string>
@@ -2926,7 +2975,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Notification category group"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Behaviour"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
@@ -2944,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent importance"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Show notifications"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Access to work profile notifications is blocked"</string>
@@ -2974,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android is blocking this group of notifications from appearing on this device"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3121,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Yes"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"No"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Require PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Require pattern?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Require password?"</string>
@@ -3393,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Current user: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Signed in as <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> is default"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ON / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"OFF"</string>
<string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
<string name="about_summary" msgid="924181828102801010">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3403,6 +3456,7 @@
<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="6346948990624612516">"Can\'t turn off backups"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"This action is disabled. To find out more, contact your organisation\'s admin."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"More details"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
@@ -3426,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Work profile is off"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Apps, background sync and other features related to your work profile are turned off."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Set Night Light schedule"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tint screen amber to help you fall asleep"</string>
+ <string name="night_display_suggestion_summary" msgid="228346372178218442">"Automatically tint screen every night"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"Night Light is on"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Screen is tinted amber. This may help you fall asleep."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Suggested for You"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> more"</string>
@@ -3533,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"None"</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>
@@ -3555,31 +3612,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"We\'re here for you 24/7"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"We\'re here for you 24/7"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Our support team is here to help address any issue"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Our support team is available all day, every day"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Search help or come back during support hours (local time):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Phone support hours (local time)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Search help or explore tips & tricks"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Support for:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Travelling abroad?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"International charges may apply"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Phone"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explore tips & tricks"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Search help & send feedback"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contact support"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Sign In"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Can\'t sign in?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Send system information"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Do not show this again"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Requesting as"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Add account"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"System information"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Window Trace"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Surface Trace"</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>
@@ -3595,11 +3629,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
<item quantity="one">1 second</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> wait"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Manage storage"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remove photos & videos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Storage manager"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Use Storage Manager"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Free up space now"</string>
@@ -3610,32 +3644,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Open camera quickly"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Press power button twice to open camera"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Take selfies faster"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Double-twist phone for selfie mode"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Double-twist tablet for selfie mode"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Double-twist device for selfie mode"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Check notifications when screen is off"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Check notifications when screen is off"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"To check your notifications, swipe down on the fingerprint sensor on the back of your tablet."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"To check your notifications, swipe down on the fingerprint sensor on the back of your device."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"See notifications quickly"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Swipe down on the fingerprint sensor"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"On"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is already unlocked"</string>
@@ -3765,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Directory access"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"directory access"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"My Phone"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"My Tablet"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"My Device"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Account"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Device name"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
</resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 1e36841..2b3388b 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Push button"</item>
<item msgid="1624323946324499595">"PIN from peer device"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 hour"</item>
<item msgid="5198271470953124739">"Never time out"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (Default)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Poor"</item>
<item msgid="2042505933058940139">"Poor"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Over 60 days old"</item>
<item msgid="5692284879054004388">"Over 90 days old"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Use network preference"</item>
+ <item msgid="8745603368609022803">"Treat as metered"</item>
+ <item msgid="2266114985518865625">"Treat as unmetered"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index aa94d86..3fc7a8c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Allow device to pair and connect to Bluetooth devices"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Disable in-band ringing"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Don’t play custom phone ringtones on Bluetooth headsets"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Set date"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sort alphabetically"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sort by time zone"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> starts on <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"British Summer Time (also known as daylight savings time)"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Standard time"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Time zone by region"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fixed offset time zones"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
<string name="time_picker_title" msgid="483460752287255019">"Time"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Automatically lock"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Lock screen message"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Enable widgets"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disabled by admin"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Show lockdown option"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Display power button option that turns off extended access and fingerprint unlocking."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"None"</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">"e.g. Joe\'s Android."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profile info"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Use location"</string>
<string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Security & location"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption & credentials"</string>
@@ -459,9 +469,11 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google account."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Switch input method"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Set screen lock"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protect your device"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Use fingerprint"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Set screen lock for security"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Prevent others from using your tablet"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Prevent others from using your device"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Prevent others from using your phone"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Unlock with fingerprint"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Unlock with your fingerprint"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Choose work lock"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum connected Bluetooth audio devices"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Select maximum number of connected Bluetooth audio devices"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Sign in"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn on Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn off Wi-Fi"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Turn on Wi‑Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Use Wi‑Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi settings"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Set up & manage wireless access points"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz band"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz band"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP settings"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi network"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -921,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi Calling"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Turn on Wi-Fi Calling"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Use Wi-Fi instead of mobile network"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Extend coverage by calling over Wi-Fi"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Calling preference"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi Calling mode"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Roaming preference"</string>
@@ -959,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Emergency Address"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Used as your location when you make an emergency call over Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Learn more"</annotation>" about Private DNS features"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
<string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1173,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Mobile network type"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Operator info"</string>
<string name="status_data_state" msgid="5503181397066522950">"Mobile network state"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Service status"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Signal strength"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -1306,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Your new <xliff:g id="NAME">^1</xliff:g> is working. \n\nTo move photos, files and app data to this device, go to Settings > Storage."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Move <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Moving <xliff:g id="APP">^1</xliff:g> and its data to <xliff:g id="NAME_0">^2</xliff:g> will take only a few moments. You won\'t be able to use the app until the move is complete. \n\nDon\'t remove the <xliff:g id="NAME_1">^2</xliff:g> during the move."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"To move data you need to unlock user <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moving <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> during the move. \n\nThe <xliff:g id="APP">^2</xliff:g> app on this device won\'t be available until the move is complete."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancel move"</string>
@@ -1358,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Network, apps or device can be reset"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Reset Wi-Fi, mobile & Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Also reset eSIMs"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Erase all eSIMs on the phone. You’ll have to contact your operator to re-download your eSIMs. This will not cancel your mobile service plan."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Reset all network settings? You can\'t undo this action!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Reset settings"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Network reset is not available for this user"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Can\'t reset eSIMs"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"The eSIMs can’t be reset due to an error."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operators on eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMs"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"This will not cancel your mobile service plan."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
@@ -1430,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Please connect to the internet"</string>
<string name="location_title" msgid="1029961368397484576">"My Location"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Device only"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Location off"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"App-level permissions"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Low battery use"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Use GPS, Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Use Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Use GPS and device sensors to determine location"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi scanning"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Improve location by allowing system apps and services to detect Wi‑Fi networks at any time."</string>
@@ -1466,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Location sources"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"About tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"About phone"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"About device"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"About emulated device"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
<string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
@@ -1573,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Your device and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your device or loss of data that may result from their use."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Enable more settings options"</string>
<string name="application_info_label" msgid="5736524913065714880">"App info"</string>
@@ -1872,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after cursor stops moving"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ON"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
@@ -1985,7 +2005,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> remaining"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> to charge"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Background activity"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Restricted"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Allow the app to run in the background"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"App can run in the background when not in use"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"App\'s background activity is limited when not in use"</string>
@@ -2030,10 +2050,29 @@
<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="7060523369832289878">"Battery is in good shape"</string>
<string name="battery_tip_summary_summary" msgid="7832491466325707487">"Apps are behaving normally"</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Low battery capacity"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Battery can\'t provide good battery life"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Turn on smart battery manager"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Turn on to optimise battery usage"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Turn on Low Battery Mode"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Extend your battery life"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Low Battery Mode is on"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Some features are limited"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Phone used heavily"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet used heavily"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Device used heavily"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"About <xliff:g id="HOUR">%1$s</xliff:g> used since last full charge"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Your phone was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your phone was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Your tablet was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your tablet was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Your device was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your device was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Smart battery manager"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Auto-manage battery"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Automatically adjust power usage by apps based on usage"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Restricted apps"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d apps</item>
+ <item quantity="one">%1$d app</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Stop app?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
@@ -2142,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Media server"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App optimisation"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Use Battery Saver"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Turn on automatically"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Never"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"at <xliff:g id="PERCENT">%1$s</xliff:g> battery"</string>
@@ -2329,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Sync is currently experiencing problems. It will be back shortly."</string>
<string name="add_account_label" msgid="7811707265834013767">"Add account"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Work profile isn\'t available yet"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Work mode"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Allow work profile to function, including apps, background sync and related features"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Work profile"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Managed by your organisation"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Apps and notifications are off"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Remove work profile"</string>
<string name="background_data" msgid="5779592891375473817">"Background data"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Apps can sync, send and receive data at any time"</string>
@@ -2362,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Remove account?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Removing this account will delete all of its messages, contacts and other data from the tablet!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Removing this account will delete all of its messages, contacts and other data from the phone!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Removing this account will delete all of its messages, contacts and other data from the device."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"This change isn\'t allowed by your admin"</string>
<string name="provider_label" msgid="7724593781904508866">"Push subscriptions"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2580,7 +2622,8 @@
<item quantity="other">Check certificates</item>
<item quantity="one">Check certificate</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Users & profiles"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Add user or profile"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
@@ -2770,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</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="account_dashboard_title" msgid="4936890821712178853">"Users & accounts"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2801,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"don\'t disturb, interrupt, interruption, break"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"nearby, location, history, reporting"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"accuracy"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
<string name="keywords_users" msgid="3434190133131387942">"restriction, restrict, restricted"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international"</string>
@@ -2868,6 +2911,7 @@
<item quantity="one">1 rule</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Do Not Disturb"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Turn on Do Not Disturb"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Behaviour"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Allow sounds & vibrations from"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"No sound"</string>
@@ -2877,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Turn on automatically"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Automatic rules"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Automatic rule"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Set Do Not Disturb rules"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limit sounds & vibrations at certain times"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Silence phone at certain times"</string>
+ <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"Set do not disturb rules"</string>
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Use rule"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priority only"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Total silence"</string>
@@ -2886,12 +2931,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Block visual disturbances"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Add"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"TURN ON NOW"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"TURN OFF NOW"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Turn on"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Turn on now"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Turn off now"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Do Not Disturb is on until <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Do Not Disturb will stay on until you turn it off"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Do Not Disturb was automatically turned on by a rule (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Do Not Disturb was automatically turned on by an app (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Priority only"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Use personal profile sounds"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sounds are the same for work and personal profiles"</string>
@@ -2907,6 +2955,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Ringtones"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Other sounds and vibrations"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Recently sent"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Allow notification dots"</string>
@@ -2926,7 +2975,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Notification category group"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Behaviour"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
@@ -2944,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent importance"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Show notifications"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Access to work profile notifications is blocked"</string>
@@ -2974,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android is blocking this group of notifications from appearing on this device"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3121,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Yes"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"No"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Require PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Require pattern?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Require password?"</string>
@@ -3393,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Current user: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Signed in as <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> is default"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ON / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"OFF"</string>
<string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
<string name="about_summary" msgid="924181828102801010">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3403,6 +3456,7 @@
<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="6346948990624612516">"Can\'t turn off backups"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"This action is disabled. To find out more, contact your organisation\'s admin."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"More details"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
@@ -3426,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Work profile is off"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Apps, background sync and other features related to your work profile are turned off."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Set Night Light schedule"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tint screen amber to help you fall asleep"</string>
+ <string name="night_display_suggestion_summary" msgid="228346372178218442">"Automatically tint screen every night"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"Night Light is on"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Screen is tinted amber. This may help you fall asleep."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Suggested for You"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> more"</string>
@@ -3533,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"None"</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>
@@ -3555,31 +3612,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"We\'re here for you 24/7"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"We\'re here for you 24/7"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Our support team is here to help address any issue"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Our support team is available all day, every day"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Search help or come back during support hours (local time):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Phone support hours (local time)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Search help or explore tips & tricks"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Support for:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Travelling abroad?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"International charges may apply"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Phone"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explore tips & tricks"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Search help & send feedback"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contact support"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Sign In"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Can\'t sign in?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Send system information"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Do not show this again"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Requesting as"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Add account"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"System information"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Window Trace"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Surface Trace"</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>
@@ -3595,11 +3629,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
<item quantity="one">1 second</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> wait"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Manage storage"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remove photos & videos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Storage manager"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Use Storage Manager"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Free up space now"</string>
@@ -3610,32 +3644,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Open camera quickly"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Press power button twice to open camera"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Take selfies faster"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Double-twist phone for selfie mode"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Double-twist tablet for selfie mode"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Double-twist device for selfie mode"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Check notifications when screen is off"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Check notifications when screen is off"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"To check your notifications, swipe down on the fingerprint sensor on the back of your tablet."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"To check your notifications, swipe down on the fingerprint sensor on the back of your device."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"See notifications quickly"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Swipe down on the fingerprint sensor"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"On"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is already unlocked"</string>
@@ -3765,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Directory access"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"directory access"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"My Phone"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"My Tablet"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"My Device"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Account"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Device name"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
</resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 1e36841..2b3388b 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Push button"</item>
<item msgid="1624323946324499595">"PIN from peer device"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 hour"</item>
<item msgid="5198271470953124739">"Never time out"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (Default)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Poor"</item>
<item msgid="2042505933058940139">"Poor"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Over 60 days old"</item>
<item msgid="5692284879054004388">"Over 90 days old"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Use network preference"</item>
+ <item msgid="8745603368609022803">"Treat as metered"</item>
+ <item msgid="2266114985518865625">"Treat as unmetered"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index aa94d86..3fc7a8c 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Allow device to pair and connect to Bluetooth devices"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Disable in-band ringing"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Don’t play custom phone ringtones on Bluetooth headsets"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Set date"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sort alphabetically"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sort by time zone"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> starts on <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"British Summer Time (also known as daylight savings time)"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Standard time"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Time zone by region"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fixed offset time zones"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
<string name="time_picker_title" msgid="483460752287255019">"Time"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Automatically lock"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Lock screen message"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Enable widgets"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disabled by admin"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Show lockdown option"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Display power button option that turns off extended access and fingerprint unlocking."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"None"</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">"e.g. Joe\'s Android."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profile info"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Use location"</string>
<string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Security & location"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption & credentials"</string>
@@ -459,9 +469,11 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google account."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Switch input method"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Set screen lock"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protect your device"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Use fingerprint"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Set screen lock for security"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Prevent others from using your tablet"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Prevent others from using your device"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Prevent others from using your phone"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Unlock with fingerprint"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Unlock with your fingerprint"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Choose work lock"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum connected Bluetooth audio devices"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Select maximum number of connected Bluetooth audio devices"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Sign in"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn on Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn off Wi-Fi"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Turn on Wi‑Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Use Wi‑Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi settings"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Set up & manage wireless access points"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz band"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz band"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP settings"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi network"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -921,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi Calling"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Turn on Wi-Fi Calling"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Use Wi-Fi instead of mobile network"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Extend coverage by calling over Wi-Fi"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Calling preference"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi Calling mode"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Roaming preference"</string>
@@ -959,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Emergency Address"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Used as your location when you make an emergency call over Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Learn more"</annotation>" about Private DNS features"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
<string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1173,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Mobile network type"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Operator info"</string>
<string name="status_data_state" msgid="5503181397066522950">"Mobile network state"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Service status"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Signal strength"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -1306,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Your new <xliff:g id="NAME">^1</xliff:g> is working. \n\nTo move photos, files and app data to this device, go to Settings > Storage."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Move <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Moving <xliff:g id="APP">^1</xliff:g> and its data to <xliff:g id="NAME_0">^2</xliff:g> will take only a few moments. You won\'t be able to use the app until the move is complete. \n\nDon\'t remove the <xliff:g id="NAME_1">^2</xliff:g> during the move."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"To move data you need to unlock user <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moving <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> during the move. \n\nThe <xliff:g id="APP">^2</xliff:g> app on this device won\'t be available until the move is complete."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancel move"</string>
@@ -1358,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Network, apps or device can be reset"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Reset Wi-Fi, mobile & Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Also reset eSIMs"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Erase all eSIMs on the phone. You’ll have to contact your operator to re-download your eSIMs. This will not cancel your mobile service plan."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Reset all network settings? You can\'t undo this action!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Reset settings"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Network reset is not available for this user"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Can\'t reset eSIMs"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"The eSIMs can’t be reset due to an error."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operators on eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMs"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"This will not cancel your mobile service plan."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
@@ -1430,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Please connect to the internet"</string>
<string name="location_title" msgid="1029961368397484576">"My Location"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Device only"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Location off"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"App-level permissions"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Low battery use"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Use GPS, Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Use Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Use GPS and device sensors to determine location"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi scanning"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Improve location by allowing system apps and services to detect Wi‑Fi networks at any time."</string>
@@ -1466,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Location sources"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"About tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"About phone"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"About device"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"About emulated device"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
<string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
@@ -1573,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Your device and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your device or loss of data that may result from their use."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Enable more settings options"</string>
<string name="application_info_label" msgid="5736524913065714880">"App info"</string>
@@ -1872,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after cursor stops moving"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ON"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
@@ -1985,7 +2005,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> remaining"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> to charge"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Background activity"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Restricted"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Allow the app to run in the background"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"App can run in the background when not in use"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"App\'s background activity is limited when not in use"</string>
@@ -2030,10 +2050,29 @@
<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="7060523369832289878">"Battery is in good shape"</string>
<string name="battery_tip_summary_summary" msgid="7832491466325707487">"Apps are behaving normally"</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Low battery capacity"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Battery can\'t provide good battery life"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Turn on smart battery manager"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Turn on to optimise battery usage"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Turn on Low Battery Mode"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Extend your battery life"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Low Battery Mode is on"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Some features are limited"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Phone used heavily"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet used heavily"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Device used heavily"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"About <xliff:g id="HOUR">%1$s</xliff:g> used since last full charge"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Your phone was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your phone was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Your tablet was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your tablet was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Your device was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your device was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Smart battery manager"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Auto-manage battery"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Automatically adjust power usage by apps based on usage"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Restricted apps"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d apps</item>
+ <item quantity="one">%1$d app</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Stop app?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
@@ -2142,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Media server"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App optimisation"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Use Battery Saver"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Turn on automatically"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Never"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"at <xliff:g id="PERCENT">%1$s</xliff:g> battery"</string>
@@ -2329,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Sync is currently experiencing problems. It will be back shortly."</string>
<string name="add_account_label" msgid="7811707265834013767">"Add account"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Work profile isn\'t available yet"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Work mode"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Allow work profile to function, including apps, background sync and related features"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Work profile"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Managed by your organisation"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Apps and notifications are off"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Remove work profile"</string>
<string name="background_data" msgid="5779592891375473817">"Background data"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Apps can sync, send and receive data at any time"</string>
@@ -2362,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Remove account?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Removing this account will delete all of its messages, contacts and other data from the tablet!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Removing this account will delete all of its messages, contacts and other data from the phone!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Removing this account will delete all of its messages, contacts and other data from the device."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"This change isn\'t allowed by your admin"</string>
<string name="provider_label" msgid="7724593781904508866">"Push subscriptions"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2580,7 +2622,8 @@
<item quantity="other">Check certificates</item>
<item quantity="one">Check certificate</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Users & profiles"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Add user or profile"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
@@ -2770,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</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="account_dashboard_title" msgid="4936890821712178853">"Users & accounts"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2801,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"don\'t disturb, interrupt, interruption, break"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"nearby, location, history, reporting"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"accuracy"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
<string name="keywords_users" msgid="3434190133131387942">"restriction, restrict, restricted"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international"</string>
@@ -2868,6 +2911,7 @@
<item quantity="one">1 rule</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Do Not Disturb"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Turn on Do Not Disturb"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Behaviour"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Allow sounds & vibrations from"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"No sound"</string>
@@ -2877,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Turn on automatically"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Automatic rules"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Automatic rule"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Set Do Not Disturb rules"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limit sounds & vibrations at certain times"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Silence phone at certain times"</string>
+ <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"Set do not disturb rules"</string>
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Use rule"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priority only"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Total silence"</string>
@@ -2886,12 +2931,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Block visual disturbances"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Add"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"TURN ON NOW"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"TURN OFF NOW"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Turn on"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Turn on now"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Turn off now"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Do Not Disturb is on until <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Do Not Disturb will stay on until you turn it off"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Do Not Disturb was automatically turned on by a rule (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Do Not Disturb was automatically turned on by an app (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Priority only"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Use personal profile sounds"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sounds are the same for work and personal profiles"</string>
@@ -2907,6 +2955,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Ringtones"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Other sounds and vibrations"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Recently sent"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Allow notification dots"</string>
@@ -2926,7 +2975,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Notification category group"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Behaviour"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
@@ -2944,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent importance"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Show notifications"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Access to work profile notifications is blocked"</string>
@@ -2974,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android is blocking this group of notifications from appearing on this device"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3121,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Yes"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"No"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Require PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Require pattern?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Require password?"</string>
@@ -3393,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Current user: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Signed in as <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> is default"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ON / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"OFF"</string>
<string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
<string name="about_summary" msgid="924181828102801010">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3403,6 +3456,7 @@
<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="6346948990624612516">"Can\'t turn off backups"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"This action is disabled. To find out more, contact your organisation\'s admin."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"More details"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
@@ -3426,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Work profile is off"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Apps, background sync and other features related to your work profile are turned off."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Set Night Light schedule"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tint screen amber to help you fall asleep"</string>
+ <string name="night_display_suggestion_summary" msgid="228346372178218442">"Automatically tint screen every night"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"Night Light is on"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Screen is tinted amber. This may help you fall asleep."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Suggested for You"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> more"</string>
@@ -3533,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"None"</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>
@@ -3555,31 +3612,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"We\'re here for you 24/7"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"We\'re here for you 24/7"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Our support team is here to help address any issue"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Our support team is available all day, every day"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Search help or come back during support hours (local time):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Phone support hours (local time)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Search help or explore tips & tricks"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Support for:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Travelling abroad?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"International charges may apply"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Phone"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explore tips & tricks"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Search help & send feedback"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contact support"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Sign In"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Can\'t sign in?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Send system information"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Do not show this again"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Requesting as"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Add account"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"System information"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Window Trace"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Surface Trace"</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>
@@ -3595,11 +3629,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
<item quantity="one">1 second</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> wait"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Manage storage"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remove photos & videos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Storage manager"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Use Storage Manager"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Free up space now"</string>
@@ -3610,32 +3644,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Open camera quickly"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Press power button twice to open camera"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Take selfies faster"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Double-twist phone for selfie mode"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Double-twist tablet for selfie mode"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Double-twist device for selfie mode"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Check notifications when screen is off"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Check notifications when screen is off"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"To check your notifications, swipe down on the fingerprint sensor on the back of your tablet."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"To check your notifications, swipe down on the fingerprint sensor on the back of your device."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"See notifications quickly"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Swipe down on the fingerprint sensor"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"On"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is already unlocked"</string>
@@ -3765,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Directory access"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"directory access"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"My Phone"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"My Tablet"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"My Device"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Account"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Device name"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
</resources>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index 27e5bb2..3caf221 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"1 hour"</item>
<item msgid="5198271470953124739">"Never time out"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (Default)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Poor"</item>
<item msgid="2042505933058940139">"Poor"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"Over 60 days old"</item>
<item msgid="5692284879054004388">"Over 90 days old"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Use network preference"</item>
+ <item msgid="8745603368609022803">"Treat as metered"</item>
+ <item msgid="2266114985518865625">"Treat as unmetered"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 14c2641..009367f 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -169,6 +169,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Allow device to pair and connect to bluetooth devices"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Disable in-band ringing"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Don’t play custom phone ringtones on Bluetooth headsets"</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>
@@ -329,6 +331,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Set date"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sort alphabetically"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sort by time zone"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> starts on <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Daylight savings time"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Standard time"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Time zone by region"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fixed offset time zones"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
<string name="time_picker_title" msgid="483460752287255019">"Time"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Automatically lock"</string>
@@ -347,6 +354,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profile info"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Use location"</string>
<string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Security & location"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption & credentials"</string>
@@ -690,6 +698,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum connected Bluetooth audio devices"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Select maximum number of connected Bluetooth audio devices"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -704,6 +714,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Sign in"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn on Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn off Wi-Fi"</string>
@@ -721,6 +732,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Turn on Wi‑Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Use Wi‑Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi settings"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Set up & manage wireless access points"</string>
@@ -832,7 +844,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Carrier Wi‑Fi network"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -958,6 +970,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Emergency Address"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Used as your location when you make an emergency call over Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">""<annotation id="url">"Learn more"</annotation>" about Private DNS features"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
<string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1305,6 +1318,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Your new <xliff:g id="NAME">^1</xliff:g> is working. \n\nTo move photos, files, and app data to this device, go to Settings > Storage."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Move <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Moving <xliff:g id="APP">^1</xliff:g> and its data to <xliff:g id="NAME_0">^2</xliff:g> will take only a few moments. You won’t be able to use the app until the move is complete. \n\nDon’t remove the <xliff:g id="NAME_1">^2</xliff:g> during the move."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"To move data you need to unlock user <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moving <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> during the move. \n\nThe <xliff:g id="APP">^2</xliff:g> app on this device won’t be available until the move is complete."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancel move"</string>
@@ -1465,6 +1479,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Location sources"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"About tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"About phone"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"About device"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"About emulated device"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
<string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
@@ -1572,6 +1587,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Your device and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your device or loss of data that may result from their use."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Enable more settings options"</string>
<string name="application_info_label" msgid="5736524913065714880">"App info"</string>
@@ -1871,6 +1887,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after pointer stops moving"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ON"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
@@ -2029,10 +2048,33 @@
<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="7060523369832289878">"Battery is in good shape"</string>
<string name="battery_tip_summary_summary" msgid="7832491466325707487">"Apps are behaving normally"</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Low battery capacity"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Battery can\'t provide good battery life"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Turn on smart battery manager"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Turn on to optimize battery usage"</string>
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+ <skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Phone used heavily"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet used heavily"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Device used heavily"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"About <xliff:g id="HOUR">%1$s</xliff:g> used since last full charge"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Your phone was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your phone was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Your tablet was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your tablet was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Your device was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your device was used for about <xliff:g id="HOUR">%1$s</xliff:g> since last full charge.\n\n Total usage:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Smart battery manager"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Auto-manage battery"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Automatically adjust power usage by apps based on usage"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Restricted apps"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d apps</item>
+ <item quantity="one">%1$d app</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Stop app?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
@@ -2141,6 +2183,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App optimization"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Use Battery Saver"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Turn on automatically"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Never"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"at <xliff:g id="PERCENT">%1$s</xliff:g> battery"</string>
@@ -2361,6 +2404,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Remove account?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Removing this account will delete all of its messages, contacts, and other data from the tablet!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Removing this account will delete all of its messages, contacts, and other data from the phone!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Removing this account will delete all of its messages, contacts, and other data from the device!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"This change isn\'t allowed by your admin"</string>
<string name="provider_label" msgid="7724593781904508866">"Push subscriptions"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2885,8 +2929,8 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Block visual disturbances"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Add"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"TURN ON NOW"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"TURN OFF NOW"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Turn on now"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Turn off now"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Do Not Disturb is on until <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Do Not Disturb will stay on until you turn it off"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Do Not Disturb was automatically turned on by a rule (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2925,7 +2969,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Notification category group"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Behavior"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
@@ -2943,6 +2987,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent importance"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Show notifications"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Access to work profile notifications is blocked"</string>
@@ -2973,9 +3018,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android is blocking this group of notifications from appearing on this device"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3554,31 +3599,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"We\'re here for you 24/7"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"We\'re here for you 24 7"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Our support team is here to help address any issue"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Our support team is available all day, every day"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Search help or come back during support hours (local time):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Phone support hours (local time)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Search help or explore tips & tricks"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Support for:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Traveling abroad?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"International charges may apply"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Phone"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explore tips & tricks"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Search help & send feedback"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contact support"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Sign in"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Can\'t sign in?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Send system information"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Do not show again"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Requesting as"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Add account"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"System information"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Window Trace"</string>
+ <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Layer Trace"</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>
@@ -3594,11 +3616,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
<item quantity="one">1 second</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> wait"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Manage storage"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remove photos & videos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Storage manager"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Use Storage manager"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Free up space now"</string>
@@ -3764,8 +3786,8 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
- <skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <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="storage_access" msgid="8905018810338984531">"Storage access"</string>
+ <string name="keywords_storage_access" msgid="3708874088152933579">"storage access scoped directory"</string>
</resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index c80097f..9f4721f 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"1 hora"</item>
<item msgid="5198271470953124739">"Siempre visible"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (predeterminado)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Baja calidad"</item>
<item msgid="2042505933058940139">"Baja"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"Más de sesenta días"</item>
<item msgid="5692284879054004388">"Más de noventa días"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Usar preferencia de red"</item>
+ <item msgid="8745603368609022803">"Tratar como red con tarifa plana"</item>
+ <item msgid="2266114985518865625">"Tratar como red sin tarifa plana"</item>
+ </string-array>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6b65671..ec77c70 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar dispositivo nuevo"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permite que el dispositivo se sincronice y se conecte con dispositivos Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Inhabilitar sonido dentro de banda"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"No reproducir tonos del teléfono personalizados en auriculares Bluetooth"</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>
@@ -330,6 +332,16 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Establecer la fecha"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabéticamente"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
+ <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+ <skip />
+ <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+ <skip />
+ <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+ <skip />
<string name="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
<string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automáticamente"</string>
@@ -348,6 +360,8 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Datos del perfil"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Cuentas"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
+ <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+ <skip />
<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">"Encriptación y credenciales"</string>
@@ -691,6 +705,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y medios"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recordar la configuración"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Máximo de dispositivos de audio Bluetooth conectados"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecciona una cantidad máxima de dispositivos de audio Bluetooth conectados"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmitir"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No se encontraron dispositivos cercanos."</string>
@@ -705,6 +721,8 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nombre"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+ <skip />
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> quiere activar la conexión Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> quiere desactivar la conexión Wi-Fi"</string>
@@ -722,6 +740,8 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activar Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+ <skip />
<string name="wifi_settings_category" msgid="8719175790520448014">"Configuración de Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Configurar y administrar los puntos de acceso de teléfonos inalámbricos"</string>
@@ -833,7 +853,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ingresa la contraseña de la red."</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Red Wi‑Fi del proveedor"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectarse mediante <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectarse mediante <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes, incluso cuando la conexión Wi-Fi esté desactivada.\n\n¿Quieres permitir esto para todas las aplicaciones que deseen buscar redes?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desactivar la opción, accede a la sección Avanzada del menú ampliado."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -909,10 +929,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Los hotspots brindan acceso a Internet mediante una conexión de datos móviles. Configura uno a fin de crear una red Wi‑Fi para otros dispositivos. Es posible que se apliquen cargos por el uso de datos móviles."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Las apps pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Desactivar el hotspot de manera automática"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"El hotspot de Wi‑Fi se desactivará si no hay dispositivos conectados"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
@@ -961,6 +979,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Dirección de emergencia"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Se usa como tu ubicación cuando haces una llamada de emergencia mediante Wi-Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Más información"</annotation>" sobre las funciones de DNS privado"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
<string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
@@ -1308,6 +1327,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"El nuevo dispositivo <xliff:g id="NAME">^1</xliff:g> está funcionando. \n\nPara transferir fotos, archivos y datos de aplicaciones a este dispositivo, ve a Configuración y almacenamiento."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Transferir la aplicación <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Transferir la aplicación <xliff:g id="APP">^1</xliff:g> y los datos relacionados al dispositivo <xliff:g id="NAME_0">^2</xliff:g> solo demorará un momento. Hasta que no se complete la transferencia, no podrás usar la aplicación. \n\nNo extraigas el dispositivo <xliff:g id="NAME_1">^2</xliff:g> durante el proceso."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Para transferir datos, debes desbloquear al usuario <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Transfiriendo la aplicación <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Durante el proceso, no extraigas el dispositivo <xliff:g id="NAME">^1</xliff:g>. \n\nLa aplicación <xliff:g id="APP">^2</xliff:g> estará disponible en este dispositivo cuando se complete el proceso."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferencia"</string>
@@ -1468,6 +1488,8 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Fuentes de ubicación"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca de la tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Acerca del dispositivo"</string>
+ <!-- no translation found for about_settings (6717640957897546887) -->
+ <skip />
<string name="about_settings" product="emulator" msgid="221313099578564438">"Acerca del dispositivo emulado"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Ver información legal, estado, versión de software del tablet"</string>
<string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
@@ -1575,6 +1597,8 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Ver las <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tu tablet y tus datos personales son más vulnerables a los ataques de apps desconocidas. Si instalas apps de esta fuente, serás responsable de los daños que sufra tu tablet y la pérdida de datos debido al uso de estas apps."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Tu teléfono y tus datos personales son más vulnerables a los ataques de apps desconocidas. Si instalas apps de esta fuente, serás responsable de los daños que sufra tu teléfono y la pérdida de datos debido al uso de estas apps."</string>
+ <!-- no translation found for install_all_warning (3648003301476423145) -->
+ <skip />
<string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Activar más opciones de configuración"</string>
<string name="application_info_label" msgid="5736524913065714880">"Información de la aplicación"</string>
@@ -1874,6 +1898,12 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Puede afectar el rendimiento"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic cuando deja de moverse el puntero"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Tiempo de espera antes del clic"</string>
+ <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+ <skip />
+ <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+ <skip />
+ <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+ <skip />
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVADO"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en Configuración rápida"</string>
@@ -2030,14 +2060,37 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"La batería se encuentra en buen estado"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Las apps funcionan de manera correcta"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Capacidad de batería baja"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La batería no tiene una buena duración"</string>
+ <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
<skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+ <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+ <skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Se usó el teléfono durante bastante tiempo"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Se usó la tablet durante bastante tiempo"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Se usó el dispositivo durante bastante tiempo"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Usaste el teléfono durante bastante tiempo, lo que consumió mucha batería. Sin embargo, la batería está funcionando de manera normal.\n\n Se usó el teléfono durante aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa.\n\n Uso total:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Usaste la tablet durante bastante tiempo, lo que consumió mucha batería. Sin embargo, la batería está funcionando de manera normal.\n\n Se usó la tablet durante aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa.\n\n Uso total:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Usaste el dispositivo durante bastante tiempo, lo que consumió mucha batería. Sin embargo, la batería está funcionando de manera normal.\n\n Se usó el dispositivo durante aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa.\n\n Uso total:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Administrador de batería inteligente"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Administración automática de batería"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Ajustar automáticamente el consumo de energía de las apps en función de su uso"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Apps restringidas"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d apps</item>
+ <item quantity="one">%1$d app</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"¿Quieres detener la app?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Tu teléfono no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionar este problema, detén la app.\n\nSi el problema persiste, es posible que debas desinstalarla para mejorar el rendimiento de la batería."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tu tablet no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> la mantiene activa.\n\nPara solucionar este problema, detén la app.\n\nSi el problema persiste, es posible que debas desinstalarla para mejorar el rendimiento de la batería."</string>
@@ -2146,6 +2199,8 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de medios"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimización de las aplicaciones"</string>
<string name="battery_saver" msgid="8172485772238572153">"Ahorro de batería"</string>
+ <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+ <skip />
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activar automáticamente"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"con <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
@@ -2366,6 +2421,8 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"¿Deseas eliminar la cuenta?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Si eliminas esta cuenta, se borrarán todos sus mensajes, contactos y otros datos de la tablet."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Si eliminas esta cuenta, se borrarán todos sus mensajes, contactos y otros datos del dispositivo."</string>
+ <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+ <skip />
<string name="remove_account_failed" msgid="3901397272647112455">"El administrador no permite este cambio"</string>
<string name="provider_label" msgid="7724593781904508866">"Suscripciones de inserción"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear alteraciones visuales"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir señales visuales"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Agregar"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ACTIVAR AHORA"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESACTIVAR AHORA"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Activar ahora"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desactivar ahora"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"El modo \"No interrumpir\" estará activado hasta la(s) <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"El modo \"No interrumpir\" permanecerá activado hasta que lo desactives"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Una regla (<xliff:g id="RULE_NAME">%s</xliff:g>) activó el modo \"No interrumpir\" automáticamente"</string>
@@ -2930,7 +2987,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Categoría de notificaciones"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Categoría del grupo de notificaciones"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Comportamiento"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir sonido"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"No mostrar notificaciones"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"No emitir sonido ni mostrar"</string>
@@ -2948,6 +3005,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Mediana importancia"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Importancia alta"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgente"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Ver notificaciones"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Asistente de notificaciones"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificaciones"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"El acceso a las notificaciones del perfil de trabajo está bloqueado"</string>
@@ -2976,9 +3034,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso en No molestar"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada solicitó acceso en No molestar."</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bloquea las notificaciones de esta app para que no aparezcan en el dispositivo"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloquea esta categoría de notificaciones para que no aparezca en el dispositivo"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bloquea este grupo de notificaciones para que no aparezca en el dispositivo"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Como lo solicitaste, Android bloquea las notificaciones de esta app para que no se muestren en el dispositivo"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Como lo solicitaste, Android bloquea esta categoría de notificaciones para que no se muestren en el dispositivo"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Como lo solicitaste, Android bloquea este grupo de notificaciones para que no se muestren en el dispositivo"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categorías"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Otros"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3100,7 +3158,7 @@
<string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Permitir que las notificaciones silenciadas por el modo \"No interrumpir\" activen la pantalla"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
<string name="suggestion_button_text" msgid="3275010948381252006">"Aceptar"</string>
- <string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
+ <string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios del dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ingresa el PIN de administrador"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
<string name="switch_off_text" msgid="1139356348100829659">"Desactivado"</string>
@@ -3557,31 +3615,10 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos de configuración rápida para programadores"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aquí para ayudarte"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos disponibles todos los días, las 24 horas."</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos disponibles todos los días, las 24 horas."</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Nuestro equipo de asistencia está disponible para solucionar cualquier problema"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nuestro equipo de asistencia está disponible a toda hora, todos los días"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Busca ayuda o vuelve en el horario de atención (hora local):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Horario de atención telefónica (hora local)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Busca ayuda o explora sugerencias y trucos"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Compatibilidad con:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"¿Vas a viajar al extranjero?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Pueden aplicarse cargos internacionales"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Teléfono"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorar sugerencias y trucos"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Buscar ayuda y enviar comentarios"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Comunícate con el equipo de asistencia"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Acceder"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"¿No puedes acceder?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar información del sistema"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"No volver a mostrar"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Solicitando como"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Agregar cuenta"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Información del sistema"</string>
+ <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+ <skip />
+ <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+ <skip />
<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>
@@ -3597,11 +3634,12 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
<item quantity="one">1 segundo</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Espera estimada: alrededor de <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Administrar el almacenamiento"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"El administrador de almacenamiento quita de tu dispositivo las fotos y los videos con copia de seguridad para liberar espacio de almacenamiento."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Quitar fotos y videos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Administrador de almacenamiento"</string>
+ <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+ <skip />
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espacio ahora"</string>
@@ -3767,8 +3805,10 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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>
+ <!-- no translation found for storage_access (8905018810338984531) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for keywords_storage_access (3708874088152933579) -->
<skip />
</resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 8fcdf75..ce3daf5 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Botón WPS"</item>
<item msgid="1624323946324499595">"PIN del otro dispositivo"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 hora"</item>
<item msgid="5198271470953124739">"Siempre visible"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (predeterminado)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Mala"</item>
<item msgid="2042505933058940139">"Mala"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Más de 60 días de antigüedad"</item>
<item msgid="5692284879054004388">"Más de 90 días de antigüedad"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Utilizar preferencias de red"</item>
+ <item msgid="8745603368609022803">"Tratar como red de uso no medido"</item>
+ <item msgid="2266114985518865625">"Tratar como red de uso medido"</item>
+ </string-array>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 75808de..425d71f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Emparejar dispositivo nuevo"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permitir que el dispositivo se vincule y se conecte con dispositivos Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Inhabilitar tono de llamada por Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"No reproducir los tonos de llamada personalizados del teléfono en auriculares Bluetooth"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Establecer fecha"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabéticamente"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> empieza el <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Horario de verano"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Hora estándar"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Zona horaria por región"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Zonas horarias con compensación fija"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
<string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automáticamente"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Mensaje en la pantalla de bloqueo"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Habilitar widgets"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Inhabilitado por el administrador"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ninguno"</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">"p. ej., Android de Juan"</string>
@@ -348,6 +359,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="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>
@@ -459,9 +471,16 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"La contraseña que has introducido es correcta pero, lamentablemente, tus datos están dañados. \n\nPara seguir utilizando el tablet, debes restablecer el estado de fábrica. Al configurar el dispositivo después de este proceso, podrás restaurar los datos incluidos en la copia de seguridad de tu cuenta de Google."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"La contraseña que has introducido es correcta pero, lamentablemente, tus datos están dañados. \n\nPara seguir utilizando el teléfono, debes restablecer el estado de fábrica. Al configurar el dispositivo después de este proceso, podrás restaurar los datos incluidos en la copia de seguridad de tu cuenta de Google."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar método de entrada"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Establecer el bloqueo de pantalla"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protege tu dispositivo"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utilizar huella digital"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear con tu huella digital"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Elige un bloqueo de pantalla"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Bloqueo de trabajo"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz del teléfono"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y contenido multimedia"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ajustes de recordatorio"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Máximo de dispositivos de audio conectados por Bluetooth"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecciona el número máximo de dispositivos de audio conectados por Bluetooth"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Enviar pantalla"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No hay dispositivos cercanos."</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nombre"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Iniciar sesión"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> quiere activar la conexión Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> quiere desactivar la conexión Wi-Fi"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activar conexión Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Utilizar redes Wi‑Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Ajustes de Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Configurar y administrar puntos de acceso inalámbricos"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Contraseña"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contraseña"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Seleccionar banda de AP"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automáticamente"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Ajustes de IP"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce la contraseña de tu red"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Red Wi‑Fi del operador"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectar a través de <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectar a través de <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes aunque la conexión Wi-Fi esté desactivada.\n\n¿Permitir para todas las aplicaciones que quieran buscar redes?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desactivar esta opción, accede a las opciones avanzadas del menú adicional."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -921,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Llamadas Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activa la Llamada por Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Utiliza una red Wi-Fi en lugar de la red móvil"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferencia de llamada"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de llamadas Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Preferencia de itinerancia"</string>
@@ -959,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Dirección de emergencia"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Se utiliza como tu ubicación al hacer una llamada de emergencia por Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Más información"</annotation>" sobre las funciones de DNS privado"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
<string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
@@ -1173,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"Tipo de red móvil"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Información de operador"</string>
<string name="status_data_state" msgid="5503181397066522950">"Estado de la red móvil"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"Estado del servicio"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Intensidad de la señal"</string>
<string name="status_roaming" msgid="2638800467430913403">"Itinerancia"</string>
@@ -1306,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Tu nueva <xliff:g id="NAME">^1</xliff:g> está lista. \n\nPara mover fotos, archivos y datos de aplicaciones a este dispositivo, accede a Ajustes > Almacenamiento."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"La migración de <xliff:g id="APP">^1</xliff:g> y de sus datos a tu <xliff:g id="NAME_0">^2</xliff:g> solo durará un momento. No podrás utilizar la aplicación hasta que finalice el proceso. \n\nNo extraigas tu <xliff:g id="NAME_1">^2</xliff:g> durante la migración."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Debes desbloquear el usuario <xliff:g id="APP">^1</xliff:g> para transferir datos."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moviendo <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"No extraigas tu <xliff:g id="NAME">^1</xliff:g> durante la migración \n\nLa aplicación <xliff:g id="APP">^2</xliff:g> de este dispositivo no estará disponible hasta que finalice el proceso."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar migración"</string>
@@ -1358,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Se puede recuperar la configuración de la red, de las aplicaciones o del dispositivo"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Recuperar ajustes de Wi-Fi, red móvil y Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Se recuperarán todos los ajustes de red, como:\n\n"<li>"Wi‑Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Recuperar también el estado de las tarjetas eSIM"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"Recuperar ajustes"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"¿Quieres recuperar todos los ajustes de red? Esta acción no se puede deshacer."</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Recuperar ajustes"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"¿Restablecer?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Este usuario no puede restablecer la red"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Se han recuperado los ajustes de red"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"No se ha podido recuperar el estado de las tarjetas eSIM"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"No se ha podido recuperar el estado de las tarjetas eSIM debido a un error."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Borrar todos los datos (recuperar estado de fábrica)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Has iniciado sesión en las cuentas que se indican a continuación:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadores de la eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMs"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tu plan de servicios móviles no se cancelará."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
@@ -1430,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Debes conectarte a Internet"</string>
<string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ubicación para el perfil de trabajo"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisión"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Solo dispositivo"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ubicación desactivada"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Permisos de las aplicaciones"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitudes de ubicación recientes"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Ninguna aplicación ha solicitado la ubicación recientemente"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Servicios de ubicación"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Uso de batería elevado"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Poco uso de batería"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Preferencias de ubicación"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usa las redes móviles, la conexión Wi-Fi, el Bluetooth o el GPS para determinar la ubicación"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usa las redes móviles, la conexión Wi‑Fi o el Bluetooth para determinar la ubicación"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Utiliza el GPS y los sensores del dispositivo para determinar la ubicación"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Búsqueda"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Búsqueda de redes Wi‑Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Los servicios y las aplicaciones del sistema pueden detectar redes Wi‑Fi en cualquier momento para mejorar la precisión de la ubicación."</string>
@@ -1466,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Fuentes de ubicación"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Información del tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Información del teléfono"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Información del dispositivo"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Información sobre el dispositivo emulado"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Ver información legal, estado, versión del software"</string>
<string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
@@ -1573,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Ver todas las aplicaciones (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tu tablet y tus datos personales son más vulnerables a los ataques de aplicaciones desconocidas. Al instalar aplicaciones de esta fuente, aceptas ser responsable de cualquier daño que sufra tu tablet o la pérdida de datos que se pueda derivar de su uso."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Tu teléfono y tus datos personales son más vulnerables a los ataques de aplicaciones desconocidas. Al instalar aplicaciones de esta fuente, aceptas ser responsable de cualquier daño que sufra tu teléfono o la pérdida de datos que se pueda derivar de su uso."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Tu dispositivo y tus datos personales son más vulnerables a los ataques de aplicaciones desconocidas. Al instalar aplicaciones de esta fuente, aceptas ser responsable de cualquier daño que sufra tu dispositivo o de la pérdida de datos que se pueda derivar de su uso."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Ajustes avanzados"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Habilitar más opciones de configuración"</string>
<string name="application_info_label" msgid="5736524913065714880">"Información de la aplicación"</string>
@@ -1745,7 +1772,7 @@
<string name="language_settings" msgid="8758655933029560944">"Idiomas e introducción de texto"</string>
<string name="language_empty_list_user_restricted" msgid="5984015900102140696">"No tienes permiso para cambiar el idioma del dispositivo."</string>
<string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e introducción de texto"</string>
- <string name="input_assistance" msgid="7577795275222555487">"Asistencia de entrada"</string>
+ <string name="input_assistance" msgid="7577795275222555487">"Asistencia de introducción de texto"</string>
<string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado e introducción de texto"</string>
<string name="phone_language" msgid="7116581601133118044">"Idiomas"</string>
<string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1872,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Puede afectar al rendimiento"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic después de que el puntero deje de moverse"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Retraso antes del clic"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ACTIVADO"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en ajustes rápidos"</string>
@@ -1985,7 +2015,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">"Quedan <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> para completar la carga"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Actividad en segundo plano"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Con restricciones"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Permite que la aplicación se ejecute en segundo plano"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"La aplicación puede funcionar en segundo plano cuando no se está usando"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"La actividad de la aplicación en segundo plano es limitada cuando no se está utilizando"</string>
@@ -2030,10 +2060,29 @@
<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="7060523369832289878">"La batería funciona correctamente"</string>
<string name="battery_tip_summary_summary" msgid="7832491466325707487">"Las aplicaciones funcionan correctamente"</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"La capacidad de la batería es baja"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Queda poca batería"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Activar el gestor de batería inteligente"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Activa esta opción para optimizar el uso de la batería"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Activa el modo de batería baja"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Consigue que tu batería dure más"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Modo de batería baja activado"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Algunas funciones están limitadas"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Mucho uso del teléfono"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Mucho uso del tablet"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Mucho uso del dispositivo"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Usado durante aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Has dado mucho uso a tu teléfono y se ha consumido mucha batería. La batería está funcionando de manera normal.\n\n El teléfono se ha usado durante aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa.\n\n Uso total:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Has dado mucho uso a tu tablet y se ha consumido mucha batería. La batería está funcionando de manera normal.\n\n El tablet se ha usado durante aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa.\n\n Uso total:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Has dado mucho uso a tu dispositivo y se ha consumido mucha batería. La batería está funcionando de manera normal.\n\n El dispositivo se ha usado durante aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa.\n\n Uso total:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gestor de batería inteligente"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Administrar batería automáticamente"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Ajusta automáticamente el consumo de batería de las aplicaciones según su uso"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Aplicaciones restringidas"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d aplicaciones</item>
+ <item quantity="one">%1$d aplicación</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"¿Detener la aplicación?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Tu teléfono no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionarlo, detén la aplicación.\n\nSi el problema persiste, desinstala la aplicación para mejorar el rendimiento de la batería."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tu tablet no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionarlo, detén la aplicación.\n\nSi el problema persiste, desinstala la aplicación para mejorar el rendimiento de la batería."</string>
@@ -2142,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimedia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimización de aplicación"</string>
<string name="battery_saver" msgid="8172485772238572153">"Ahorro de batería"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Utilizar la función Ahorro de batería"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activar automáticamente"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"con un <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
@@ -2329,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"En este momento hay incidencias con la sincronización. Se restablecerá en breve."</string>
<string name="add_account_label" msgid="7811707265834013767">"Añadir cuenta"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"El perfil de trabajo aún no está disponible"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Modo de trabajo"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Permitir que se utilice el modo de trabajo, incluidas las aplicaciones, la sincronización en segundo plano y las funciones relacionadas"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Quitar perfil de trabajo"</string>
<string name="background_data" msgid="5779592891375473817">"Datos en segundo plano"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Las aplicaciones pueden sincronizar datos, enviarlos y recibirlos."</string>
@@ -2362,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"¿Quitar cuenta?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Si quitas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos del tablet."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Si quitas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos del teléfono."</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Si quitas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos del dispositivo."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"El administrador no permite realizar este cambio"</string>
<string name="provider_label" msgid="7724593781904508866">"Enviar suscripciones"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2463,13 +2518,13 @@
<string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: unos <xliff:g id="TOTAL">%1$s</xliff:g> usados (según el cálculo del tablet). El cálculo del uso de datos del operador puede variar."</string>
<string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: unos <xliff:g id="TOTAL">%1$s</xliff:g> usados (según el cálculo del teléfono). El cálculo del uso de datos del operador puede variar."</string>
<string name="data_usage_metered_title" msgid="7383175371006596441">"Restricciones de red"</string>
- <string name="data_usage_metered_body" msgid="7655851702771342507">"Las redes sin tarifa plana 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_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 tarifa plana"</string>
- <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes sin tarifa plana, activa el Wi‑Fi."</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_auto" msgid="1262028400911918865">"Automática"</string>
- <string name="data_usage_metered_yes" msgid="9217539611385225894">"Sin tarifa plana"</string>
- <string name="data_usage_metered_no" msgid="4025232961929071789">"Con tarifa plana"</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>
<string name="data_usage_disclaimer" msgid="6887858149980673444">"El uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
<string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
<string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver a llamada"</string>
@@ -2580,7 +2635,8 @@
<item quantity="other">Comprobar certificados</item>
<item quantity="one">Comprobar certificado</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Usuarios y perfiles"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Añadir usuario o perfil"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Añadir usuario"</string>
@@ -2770,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, enviar contenido"</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="account_dashboard_title" msgid="4936890821712178853">"Usuarios y cuentas"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicaciones predeterminadas"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, hora, copias de seguridad y actualizaciones"</string>
<string name="search_results_title" msgid="1796252422574886932">"Ajustes"</string>
@@ -2789,7 +2846,7 @@
<string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño del texto"</string>
<string name="keywords_display_cast_screen" msgid="7684618996741933067">"proyectar, enviar"</string>
<string name="keywords_storage" msgid="3299217909546089225">"espacio, disco, disco duro, uso del dispositivo"</string>
- <string name="keywords_battery" msgid="1173830745699768388">"consumo de energía, carga"</string>
+ <string name="keywords_battery" msgid="1173830745699768388">"consumo de batería, carga"</string>
<string name="keywords_spell_checker" msgid="1399641226370605729">"ortografía, diccionarios, corrector ortográfico, corrección automática"</string>
<string name="keywords_voice_input" msgid="769778245192531102">"herramienta de reconocimiento, entrada, síntesis de voz, hablar, idioma, manos libres, reconocimiento, ofensiva, palabra, audio, historial, auriculares bluetooth"</string>
<string name="keywords_text_to_speech_output" msgid="5150660047085754699">"valorar, idioma, predeterminado, hablar, síntesis de voz, accesibilidad, lector de pantalla, ciego"</string>
@@ -2801,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"no molestar, interrumpir, interrupción, descanso"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"nearby, cercano, ubicación, historial, informes"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"precisión"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"cuenta"</string>
<string name="keywords_users" msgid="3434190133131387942">"restricción, restringir, restringido"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"corrección de texto, corregir, sonido, vibración, automático, idioma, gesto, sugerencia, tema, ofensivo, palabra, escribir, emoji, internacional"</string>
@@ -2868,6 +2924,7 @@
<item quantity="one">1 regla</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"No molestar"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Activar el modo No molestar"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportamiento"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permitir sonidos/vibraciones de"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Sin sonido"</string>
@@ -2877,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Activar automáticamente"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Reglas automáticas"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Regla automática"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir reglas de No molestar"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitar sonido y vibración en algunos momentos"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Usar regla"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Solo prioritarias"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo alarmas"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silencio total"</string>
@@ -2886,12 +2946,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear interrupciones visuales"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir señales visuales"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Añadir"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ACTIVAR AHORA"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESACTIVAR AHORA"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Activar"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Activar ahora"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desactivar ahora"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"El modo No molestar está activado hasta esta hora: <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"El modo No molestar permanecerá habilitado hasta que lo desactives"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Una regla (<xliff:g id="RULE_NAME">%s</xliff:g>) ha activado automáticamente el modo No molestar"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Una aplicación (<xliff:g id="APP_NAME">%s</xliff:g>) ha activado automáticamente el modo No molestar"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Solo prioritarias"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Sonidos del perfil de trabajo"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Utilizar sonidos del perfil personal"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Los sonidos de los perfiles personal y de trabajo son los mismos"</string>
@@ -2907,6 +2970,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Tonos de llamada"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Otros sonidos y vibraciones"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificaciones"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Enviadas recientemente"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Ajustes avanzados"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificaciones de trabajo"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Permitir burbujas de notificación"</string>
@@ -2926,7 +2990,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Categoría de notificaciones"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoría de notificaciones"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Comportamiento"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir sonido"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"No mostrar notificaciones nunca"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Sin sonido ni interrupción visual"</string>
@@ -2944,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Algo importante"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Muy importante"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgente"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Mostrar notificaciones"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Asistente de notificaciones"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificaciones"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Se ha bloqueado el acceso a las notificaciones del perfil de trabajo"</string>
@@ -2974,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso a No molestar"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada ha solicitado acceso de No molestar"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bloquea las notificaciones de esta aplicación para que no aparezcan en el dispositivo"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloquea esta categoría de notificaciones para que no aparezcan en el dispositivo"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bloquea este grupo de notificaciones para que no aparezcan en el dispositivo"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Como solicitaste, Android está bloqueando las notificaciones de esta aplicación para que no aparezcan en el dispositivo"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Como solicitaste, Android está bloqueando esta categoría de notificaciones para que no aparezcan en el dispositivo"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Como solicitaste, Android está bloqueando este grupo de notificaciones para que no aparezcan en el dispositivo"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categorías"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Otros"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3121,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Además de utilizar tu huella digital para desbloquear el dispositivo, puedes protegerlo aún más configurándolo para que solicite una contraseña antes de que se inicie. Hasta entonces, no podrás recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsto permite proteger los datos en dispositivos perdidos o robados. ¿Quieres que el dispositivo pida la contraseña para iniciarse?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sí"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Sí"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"No"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"¿Solicitar PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"¿Solicitar patrón?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"¿Solicitar contraseña?"</string>
@@ -3251,7 +3318,7 @@
<string name="high_power_system" msgid="7362862974428225301">"Optimización de batería no disponible"</string>
<string name="high_power_desc" msgid="6283926163708585760">"No se aplica la optimización de la batería, por lo que se puede agotar más rápido."</string>
<string name="high_power_prompt_title" msgid="6358673688590282655">"¿Permitir que la aplicación esté activa siempre en segundo plano?"</string>
- <string name="high_power_prompt_body" msgid="1031422980602565049">"Si permites que <xliff:g id="APP_NAME">%1$s</xliff:g> está activa siempre en segundo plano, es posible que se reduzca la duración de la batería. \n\nPuedes cambiar esta opción en cualquier momento en Ajustes > Aplicaciones y notificaciones."</string>
+ <string name="high_power_prompt_body" msgid="1031422980602565049">"Si permites que <xliff:g id="APP_NAME">%1$s</xliff:g> esté activa siempre en segundo plano, es posible que se reduzca la duración de la batería. \n\nPuedes cambiar esta opción en cualquier momento en Ajustes > Aplicaciones y notificaciones."</string>
<string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> de uso desde la última carga completa"</string>
<string name="battery_power_management" msgid="5571519699679107523">"Gestión de la batería"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"No ha usado batería desde la última carga completa"</string>
@@ -3393,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Usuario actual: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Has iniciado sesión como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"Aplicación predeterminada: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ACTIVADO / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"DESACTIVADO"</string>
<string name="backup_disabled" msgid="485189128759595412">"Copia de seguridad inhabilitada"</string>
<string name="about_summary" msgid="924181828102801010">"Actualizado a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3403,6 +3471,7 @@
<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="6346948990624612516">"No se pueden desactivar las copias de seguridad"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Esta acción está inhabilitada. Para obtener más información, ponte en contacto con el administrador de la organización."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Más información"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"El administrador puede supervisar y gestionar las aplicaciones y los datos asociados a tu perfil de trabajo, como los ajustes, los permisos, el acceso corporativo, la actividad de red y la información de ubicación del dispositivo."</string>
@@ -3426,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabajo desactivado"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Las aplicaciones, la sincronización en segundo plano y otras funciones relacionadas con tu perfil de trabajo están desactivadas."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Definir horario de luz nocturna"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Pantalla ámbar para ayudar a conciliar sueño"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"Luz nocturna activada"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"La pantalla adopta un tono ámbar que puede ayudarte a conciliar el sueño."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Sugerencias personalizadas"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Sugerencias"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"Más de <xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"<xliff:g id="ID_1">%1$d</xliff:g> más"</string>
@@ -3533,6 +3604,8 @@
<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">"Simula una pantalla con un recorte"</string>
+ <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ninguna"</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>
@@ -3555,31 +3628,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Ajustes rápidos de mosaicos de desarrolladores"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Queremos ayudarte"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos disponibles las 24 horas del día, 7 días a la semana"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos disponibles las 24 horas del día, 7 días a la semana"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Nuestro equipo de asistencia está a tu disposición para ayudarte a solucionar cualquier problema"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nuestro equipo de asistencia está disponible siempre que lo necesites"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Busca en la ayuda o vuelve durante nuestro horario de asistencia (hora local):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Horario del servicio de asistencia telefónica (hora local)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Busca en la Ayuda o consulta la sección Consejos y sugerencias"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Asistencia en:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"¿Vas a viajar al extranjero?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Pueden aplicarse cargos internacionales."</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Teléfono"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Consulta la sección Consejos y sugerencias"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Buscar en la ayuda y enviar sugerencias"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Ponte en contacto con el servicio de asistencia"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Iniciar sesión"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"¿No puedes iniciar sesión?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar información del sistema"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"No volver a mostrar"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Solicitando como"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Añadir cuenta"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Información del sistema"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Captura de ventanas"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Captura de superficies"</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>
@@ -3595,11 +3645,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
<item quantity="one">1 segundo</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tiempo de espera aproximado: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gestionar almacenamiento"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para liberar espacio, el Administrador de Almacenamiento borrará de tu dispositivo las fotos y vídeos que tengan copia de seguridad."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Borrar fotos y vídeos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Administrador de Almacenamiento"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Utilizar el Administrador de Almacenamiento"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espacio"</string>
@@ -3610,32 +3660,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Acceso rápido a la cámara"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pulsa dos veces el botón de encendido para abrir la cámara rápidamente. Funciona desde cualquier pantalla."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Abrir la cámara rápidamente"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Pulsa el botón de encendido dos veces para abrir la cámara"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Cambiar de cámara"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Hacer selfies más rápido"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Gira el teléfono dos veces para activar el modo selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Gira el tablet dos veces para activar el modo selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Gira el dispositivo dos veces para activar el modo selfie"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Consulta notificaciones cuando la pantalla esté apagada"</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">"Coger el teléfono para ver la hora, los iconos de notificación y otra información"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Consulta notificaciones cuando la pantalla esté apagada"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales situado en la parte trasera del tablet."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales situado en la parte trasera del dispositivo."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ver las notificaciones más rápido"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Desliza el dedo hacia abajo en sensor de huellas digitales"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Activado"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Desactivado"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"El gestor de arranque ya está desbloqueado"</string>
@@ -3765,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Acceso al directorio"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"acceso al directorio"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index b89700f..4b35fd5 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Sakatu botoia"</item>
<item msgid="1624323946324499595">"Pareko gailuaren PINa"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 ordu"</item>
<item msgid="5198271470953124739">"Ez gainditu inoiz denbora-muga"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (lehenetsia)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Eskasa"</item>
<item msgid="2042505933058940139">"Txarra"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 egunetik gorakoak"</item>
<item msgid="5692284879054004388">"90 egunetik gorakoak"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Erabili sarearen hobespena"</item>
+ <item msgid="8745603368609022803">"Tratatu sare mugatu gisa"</item>
+ <item msgid="2266114985518865625">"Tratatu mugatu gabeko sare gisa"</item>
+ </string-array>
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 072d879..ce9a3e6 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Zure gailuak"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parekatu gailu batekin"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Baimendu gailuari Bluetooth gailuekin parekatzea eta konektatzea"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Desgaitu tonuak audio-kanal berean erreproduzitzeko aukera"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Ez erreproduzitu telefonoko tonu pertsonalizatuak Bluetooth entzungailuetan"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Ezarri data"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenatu alfabetikoki"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenatu ordu-zonaren arabera"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> egun honetan hasiko da: <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Udako ordutegia"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Ordu arrunta"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Lurraldearen araberako ordu-zona"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Ordu-zonen arteko diferentzia konpondu da"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
<string name="time_picker_title" msgid="483460752287255019">"Ordua"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Blokeatu automatikoki"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Pantaila blokeatuaren mezua"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Gaitu widgetak"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Administratzaileak desgaitu du"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Bat ere ez"</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">"Adibidez, Jonen Android gailua."</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profilaren informazioa"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Kontuak"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Kokapena"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Erabili kokapena"</string>
<string name="account_settings_title" msgid="626177544686329806">"Kontuak"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Segurtasuna eta kokapena"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptatzea eta kredentzialak"</string>
@@ -459,9 +471,16 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Idatzi duzun pasahitza zuzena da, baina datuak hondatuta daude. \n\nTableta erabiltzen jarraitzeko, jatorrizko ezarpenak berrezarri beharko dituzu. Berrezarri ondoren, tableta konfiguratzen duzunean, Google kontuan egindako babeskopiak leheneratu ahal izango dituzu."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Idatzi duzun pasahitza zuzena da, baina datuak hondatuta daude. \n\nTelefonoa erabiltzen jarraitzeko, jatorrizko ezarpenak berrezarri beharko dituzu. Berrezarri ondoren, telefonoa konfiguratzen duzunean, Google kontuan egindako babeskopiak leheneratu ahal izango dituzu."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Aldatu idazketa-metodoa"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Ezarri pantailaren blokeoa"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Babestu gailua"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Erabili hatz-marka"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desblokeatu hatz-markarekin"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Aukeratu pantailaren blokeoa"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Aukeratu laneko blokeoa"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Bozgorailu gisa"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musikarako eta multimedia-edukirako"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Gogoratu ezarpenak"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Gehienez ere konekta daitezkeen Bluetooth audio-gailuak"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Hautatu gehienez ere konekta daitezkeen Bluetooth audio-gailuak"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Igorpena"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Gaitu hari gabeko bistaratzea"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Ez da gailurik aurkitu inguruan."</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Izena"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Hasi saioa"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mb/s"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> aplikazioak Wi-Fi konexioa aktibatu nahi du"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> aplikazioak Wi-Fi konexioa desaktibatu nahi du"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Aktibatu Wi-Fia"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Erabili Wi-Fi konexioa"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi ezarpenak"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguratu eta kudeatu hari gabeko sarbide-puntuak"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Pasahitza"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Erakutsi pasahitza"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Hautatu AP banda"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatikoa"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz-ko banda"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz-ko banda"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ezarpenak"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSa erabilgarri)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Idatzi sarearen pasahitza"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Operadorearen Wi‑Fi sarea"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Konektatu <xliff:g id="NAME">%1%s</xliff:g> bidez"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Konektatu <xliff:g id="NAME">%1$s</xliff:g> bidez"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Kokapenaren zehaztasuna hobetzeko eta beste helburu batzuetarako, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak sare-bilaketa aktibatu nahi du, Wi-Fia desaktibatuta egonda ere.\n\nBilaketa egin nahi duten beste aplikazio guztiei ere baimendu nahi diezu?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Desaktibatzeko, joan menuko \"Ezarpen aurreratuak\" aukerara."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Baimendu"</string>
@@ -921,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidSarePublikoa"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi bidezko deiak"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Aktibatu Wi-Fi bidezko deiak"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Erabili Wi-Fi sarea sare mugikorraren ordez"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Deitzeko aukera lehenetsiak"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi bidez deitzeko modua"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Ibiltaritzako hobespena"</string>
@@ -959,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Larrialdietarako helbidea"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Kokapen gisa erabiliko da larrialdi-zerbitzuetara Wi-Fi bidez deituz gero"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Lortu informazio gehiago"</annotation>" DNS pribatuaren eginbideei buruz"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Bistaratzea"</string>
<string name="sound_settings" msgid="5534671337768745343">"Soinua"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Bolumenak"</string>
@@ -1173,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"Sare mugikor mota"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Operadorearen informazioa"</string>
<string name="status_data_state" msgid="5503181397066522950">"Sare mugikorraren egoera"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"Zerbitzuaren egoera"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Seinalearen indarra"</string>
<string name="status_roaming" msgid="2638800467430913403">"Ibiltaritzan"</string>
@@ -1306,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> memoria berria abian da. \n\nArgazkiak, fitxategiak eta aplikazioaren datuak gailu honetara ekartzeko, zoaz Ezarpenak > Memoria atalera."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mugitu <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> aplikazioa eta bere datuak <xliff:g id="NAME_0">^2</xliff:g> memoriara eramateak denboratxo bat behar du. Ezin izango duzu aplikazioa erabili transferentzia osatzen den arte. \n\n Ez kendu <xliff:g id="NAME_1">^2</xliff:g> transferentzia egiten den bitartean."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Datuak mugitzeko, <xliff:g id="APP">^1</xliff:g> erabiltzailea desblokeatu behar duzu."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> mugitzen…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ez kendu <xliff:g id="NAME">^1</xliff:g> transferentzia egiten den bitartean. \n\nGailuko <xliff:g id="APP">^2</xliff:g> aplikazioa ez da erabilgarri egongo transferentzia osatzen den arte."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Utzi transferentzia"</string>
@@ -1358,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Sarea, aplikazioak edota gailua berrezar daitezke"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Berrezarri Wi-Fi, Bluetooth eta sare mugikorraren ezarpenak"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Hori eginez gero, sare guztien ezarpenak berrezarri egingo dira, besteak beste: \n\n"<li>"Wi‑Fi"</li>\n<li>"Datu-konexioa"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Gainera, berrezarri eSIM txartelak"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"Berrezarri ezarpenak"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Sareko ezarpen guztiak berrezarri nahi dituzu? Ekintza hori ezin da desegin."</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Berrezarri ezarpenak"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Berrezarri?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Erabiltzaileak ez du sarea berrezartzeko baimenik"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Berrezarri dira sareko ezarpenak"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Ezin dira berrezarri eSIM txartelak"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Ezin dira berrezarri eSIM txartelak errore bat gertatu delako."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Ezabatu datu guztiak (berrezarri fabrikako ezarpenak)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazioen datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazioen datuak nahiz ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Badaude erabiltzaile gehiago gailu honetan.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Argazkiak"</li>\n<li>"Bestelako erabiltzaile-datuak"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM txartela onartzen duten operadoreak"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM txartelak"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Horrek ez du utziko bertan behera operadorearekin kontratatuta duzun zerbitzu-plana."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"USB memoria"</b>" ezabatu behar da."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"SD txartela"</b>" ezabatu behar da."</string>
@@ -1379,8 +1413,8 @@
<string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ezabatu barneko USB memoriako datu guztiak, adibidez, musika edo argazkiak"</string>
<string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ezabatu SD txarteleko datu guztiak, besteak beste, musika edo argazkiak."</string>
<string name="erase_esim_storage" msgid="1886761972867390123">"Ezabatu eSIM txartelak"</string>
- <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Ezabatu telefonoko eSIM txartel guztiak. Ez da bertan behera utziko zerbitzu mugikorraren plana."</string>
- <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Ezabatu tabletako eSIM txartel guztiak. Ez da bertan behera utziko zerbitzu mugikorraren plana."</string>
+ <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Ezabatu telefonoko eSIM txartel guztiak. Ez da bertan behera utziko mugikorreko zerbitzu-plana."</string>
+ <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Ezabatu tabletako eSIM txartel guztiak. Ez da bertan behera utziko mugikorreko zerbitzu-plana."</string>
<string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Berrezarri tableta"</string>
<string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Berrezarri telefonoa"</string>
<string name="master_clear_final_desc" msgid="7318683914280403086">"Informazio pertsonal guztia eta deskargatutako aplikazioak ezabatu nahi dituzu? Ekintza hori ezin da desegin."</string>
@@ -1430,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Konektatu Internetera"</string>
<string name="location_title" msgid="1029961368397484576">"Nire kokapena"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Laneko profilaren kokapena"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Modua"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Zehaztasun handia"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Bateria aurreztea"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Gailua soilik"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Kokapena desaktibatuta"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Aplikazio-mailako baimenak"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Azken kokapen-eskaerak"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Ez dago kokapena duela gutxi eskatu duen aplikaziorik"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Kokapen-zerbitzuak"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Bateria-erabilera handia"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Bateria-erabilera txikia"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Kokapen modua"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Erabili GPS sistema edota Wi‑Fi, Bluetooth edo telefonia mugikorreko sareak kokapena zehazteko"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Erabili Wi‑Fi, Bluetooth edo telefonia mugikorreko sareak kokapena zehazteko"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Erabili GPS sistema eta gailuaren sentsoreak kokapena zehazteko"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Bilaketa"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi sareak bilatzea"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Hobetu kokapenaren zehaztasuna sistemaren aplikazioei eta zerbitzuei Wi-Fi sareak edonoiz hautemateko aukera emanda."</string>
@@ -1466,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Kokapenaren iturburuak"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Tabletari buruz"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Telefonoari buruz"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Gailuari buruz"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Emulatutako gailuari buruz"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Ikusi legezko informazioa, egoera, software-bertsioa"</string>
<string name="legal_information" msgid="5769301644270604095">"Lege-informazioa"</string>
@@ -1573,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Ikusi <xliff:g id="COUNT">%1$d</xliff:g> aplikazioak"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tabletak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik tabletari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonoak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik telefonoari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Gailuak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartu egingo duzu haiek erabiltzeagatik gailuari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu izango zarela."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Ezarpen aurreratuak"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Gaitu ezarpenen aukera gehiago"</string>
<string name="application_info_label" msgid="5736524913065714880">"Aplikazioen informazioa"</string>
@@ -1868,10 +1895,13 @@
<string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio monofonikoa"</string>
<string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Konbinatu kanalak audioa erreproduzitzean"</string>
<string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Sakatuta edukitzearen atzerapena"</string>
- <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Koloreak alderantzikatzeko aukera"</string>
+ <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Koloreen alderantzikatzea"</string>
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Baliteke errendimenduan eragina izatea"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Egin klik erakusleak mugitzeari uztean"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Klik egin aurretiko atzerapena"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"AKTIBATUTA"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESAKTIBATUTA"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Erakutsi Ezarpen bizkorretan"</string>
@@ -1985,7 +2015,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">"Geratzen den denbora: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"Kargatu arteko denbora: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Atzeko planoko jarduerak"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Murriztua"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Baimendu aplikazioari atzeko planoan funtzionatzea"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Erabiltzen ari ez zarenean, atzeko planoan exekuta daiteke aplikazioa"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Erabiltzen ari ez zarenean, aplikazioak murriztuta izaten ditu atzeko planoko jarduerak"</string>
@@ -2030,10 +2060,29 @@
<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="7060523369832289878">"Bateriaren egoera ona da"</string>
<string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikazioen portaera normala da"</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Bateriaren edukiera txikiegia da"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateriak ezin du eskaini iraupen onargarria"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Aktibatu bateria-kudeatzaile adimenduna"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Aktiba ezazu bateriaren erabilera optimizatzeko"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Aktibatu bateria gutxiko modua"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Luzatu bateriaren iraupena"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Aktibatu da bateria gutxiko modua"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Eginbide batzuk mugatuta daude"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefonoa asko erabili da"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tableta asko erabili da"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Gailua asko erabili da"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"<xliff:g id="HOUR">%1$s</xliff:g> inguru erabili da bateria guztiz kargatu zenetik"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Telefonoa asko erabili da eta bateria asko kontsumitu da. Modu normalean dabil bateria.\n\n <xliff:g id="HOUR">%1$s</xliff:g> inguru erabili da telefonoa bateria guztiz kargatu zenetik.\n\n Erabilera, guztira:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Tableta asko erabili da eta bateria asko kontsumitu da. Modu normalean dabil bateria.\n\n <xliff:g id="HOUR">%1$s</xliff:g> inguru erabili da tableta bateria guztiz kargatu zenetik.\n\n Erabilera, guztira:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Gailua asko erabili da eta bateria asko kontsumitu da. Modu normalean dabil bateria.\n\n <xliff:g id="HOUR">%1$s</xliff:g> inguru erabili da gailua bateria guztiz kargatu zenetik.\n\n Erabilera, guztira:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Bateria-kudeatzaile adimenduna"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Kudeatu automatikoki bateria"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Doitu automatikoki aplikazioek erabiltzen duten bateria, erabileran oinarrituta"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Aplikazio murriztuak"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d aplikazio</item>
+ <item quantity="one">%1$d aplikazio</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Aplikazioa gelditu nahi duzu?"</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">"Tabletak ezin du kudeatu bateria modu normalean <xliff:g id="APP">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi aplikazioa.\nArazoa horrela ere konpontzen ez bada\n, agian aplikazioa desinstalatu beharko duzu bateriak gehiago iraun dezan."</string>
@@ -2142,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Multimedia-zerbitzaria"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Aplikazio-optimizazioa"</string>
<string name="battery_saver" msgid="8172485772238572153">"Bateria-aurrezlea"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Erabili Bateria-aurrezlea"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Aktibatu automatikoki"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Inoiz ez"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"bateriaren maila <xliff:g id="PERCENT">%1$s</xliff:g> denean"</string>
@@ -2266,7 +2316,7 @@
<string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
<string name="backup_erase_dialog_message" msgid="5221011285568343155">"Wi-Fi pasahitzen, laster-marken, bestelako ezarpenen eta aplikazioetako datuen babeskopiak egiteari utzi eta Google zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
<string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Gailuko datuen (adibidez, Wi-Fi pasahitzak eta deien historia) eta aplikazioetako datuen (besteak beste, ezarpenak eta aplikazioek gordetako fitxategiak) babeskopiak egiteari utzi nahi diozu eta urruneko zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
- <string name="fullbackup_data_summary" msgid="960850365007767734">"Egin babeskopiak automatikoki urrunetik, bai gailuetako datuenak (esaterako, Wi-Fi sareetako pasahitzak eta deien historia), bai aplikazioetako datuenak (esaterako, ezarpenak eta aplikazioek gordetako fitxategiak).\n\nBabeskopiak automatikoki egiteko aukera aktibatzean, gailuko eta aplikazioetako datuak urrunetik gordetzen dira aldizka. Aplikazioetako datuak aplikazioek gordetako edozein datu izan daitezke (garatzailearen ezarpenen arabera), eta isilpekoa izan litekeen informazioa ere sar daiteke (adibidez, kontaktuak, mezuak eta argazkiak)."</string>
+ <string name="fullbackup_data_summary" msgid="960850365007767734">"Egin babeskopiak automatikoki urrunetik, bai gailuetako datuenak (esaterako, Wi-Fi sareetako pasahitzak eta deien historia), bai aplikazioetako datuenak (esaterako, ezarpenak eta aplikazioek gordetako fitxategiak).\n\nBabeskopiak automatikoki egiteko aukera aktibatzean, gailuko eta aplikazioetako datuak urrunetik gordetzen dira aldizka. Aplikazioetako datuak aplikazioek gordetako edozein datu izan daitezke (garatzailearen ezarpenen arabera), eta kontuzkoak izan litezkeen datuak ere sar daitezke (adibidez, kontaktuak, mezuak eta argazkiak)."</string>
<string name="device_admin_settings_title" msgid="4960761799560705902">"Gailua administratzeko aplikazioaren ezarpenak"</string>
<string name="active_device_admin_msg" msgid="578748451637360192">"Gailua administratzeko aplikazioa"</string>
<string name="remove_device_admin" msgid="9207368982033308173">"Desaktibatu gailua administratzeko aplikazioa"</string>
@@ -2329,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Sinkronizazioak arazoak ditu. Laster egongo da berriro erabilgarri."</string>
<string name="add_account_label" msgid="7811707265834013767">"Gehitu kontua"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Laneko profila ez dago oraindik erabilgarri"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Lan modua"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Baimendu laneko profilak funtzionatzea, besteak beste, aplikazioak, atzeko planoko sinkronizazioa eta erlazionatutako eginbideak"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Kendu laneko profila"</string>
<string name="background_data" msgid="5779592891375473817">"Atzeko planoko datuak"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Aplikazioek datuak edonoiz sinkroniza, bidal eta jaso ditzakete"</string>
@@ -2362,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Kontua kendu?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Kontua kentzen baduzu, bere mezu, kontaktu eta bestelako datu guztiak tabletatik ezabatuko dira!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Kontua kentzen baduzu, bere mezu, kontaktu eta bestelako datu guztiak telefonotik ezabatuko dira!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Kontua kentzen baduzu, bertako mezu, kontaktu eta bestelako datu guztiak ezabatuko dira gailutik!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Administratzaileak ez du eman aldaketa egiteko baimena"</string>
<string name="provider_label" msgid="7724593781904508866">"Push-harpidetzak"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2580,7 +2635,8 @@
<item quantity="other">Ikusi ziurtagiriak</item>
<item quantity="one">Ikusi ziurtagiria</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Erabiltzaileak"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Erabiltzaileak eta profilak"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Gehitu erabiltzailea edo profila"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Gehitu erabiltzailea"</string>
@@ -2676,7 +2732,7 @@
<string name="extreme_threats_summary" msgid="8777860706500920667">"Jaso bizitza eta jabetzen aurkako mehatxu oso larrien alertak"</string>
<string name="severe_threats_title" msgid="8362676353803170963">"Mehatxu larriak"</string>
<string name="severe_threats_summary" msgid="8848126509420177320">"Jaso bizitza eta jabetzen aurkako mehatxu larrien alertak"</string>
- <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER abisuak"</string>
+ <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER alertak"</string>
<string name="amber_alerts_summary" msgid="4312984614037904489">"Jaso umeen bahiketei buruzko mezuak"</string>
<string name="repeat_title" msgid="6473587828597786996">"Errepikapena"</string>
<string name="call_manager_enable_title" msgid="7718226115535784017">"Gaitu dei-kudeatzailea"</string>
@@ -2684,7 +2740,7 @@
<string name="call_manager_title" msgid="4479949569744516457">"Dei-kudeatzailea"</string>
<!-- no translation found for call_manager_summary (5918261959486952674) -->
<skip />
- <string name="cell_broadcast_settings" msgid="4124461751977706019">"Larrialdi-abisuak"</string>
+ <string name="cell_broadcast_settings" msgid="4124461751977706019">"Larrialdi-alertak"</string>
<string name="network_operators_settings" msgid="2583178259504630435">"Sare-operadoreak"</string>
<string name="access_point_names" msgid="1381602020438634481">"Sarbide-puntuen izenak"</string>
<string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"4G LTE modu hobetua"</string>
@@ -2770,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, igorpenak"</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="account_dashboard_title" msgid="4936890821712178853">"Erabiltzaileak eta kontuak"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2801,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ez molestatu, eten, etenaldi, atseden"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"inguruko, inguruan, kokapen, historia, hautemate, hauteman, detektatu"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"zehaztasun"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"kontu"</string>
<string name="keywords_users" msgid="3434190133131387942">"muga, mugatu, murriztu, murriztapen, debekatu, debeku"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"testua, zuzenketa, zuzendu, soinua, dardara, automatikoa, hizkuntza, keinua, iradoki, iradokizuna, gaia, iraingarria, hitza, mota, emotikonoa, nazioartekoa"</string>
@@ -2859,7 +2915,7 @@
<string name="dock_audio_media_disabled" msgid="3430953622491538080">"Audio guztia"</string>
<string name="dock_audio_media_enabled" msgid="667849382924908673">"Multimedia-edukiaren audioa bakarrik"</string>
<string name="emergency_tone_silent" msgid="1067515631635824291">"Isilik"</string>
- <string name="emergency_tone_alert" msgid="8941852695428130667">"Abisua"</string>
+ <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
<string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dar-dar"</string>
<string name="boot_sounds_title" msgid="567029107382343709">"Pizteko soinuak"</string>
<string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Inoiz ez"</string>
@@ -2868,6 +2924,7 @@
<item quantity="one">1 arau</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Ez molestatu"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Aktibatu \"Ez molestatu\" modua"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Jokabidea"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Baimendu soinu eta dardara hauek:"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ez egin soinurik"</string>
@@ -2877,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Aktibatu automatikoki"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Arau automatikoak"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Arau automatikoa"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Ezarri \"Ez molestatu\" arauak"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Mugatu soinuak eta dardarak ordu jakinetara"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Erabili araua"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Lehentasuna dutenak soilik"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmak soilik"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Isiltasun osoa"</string>
@@ -2886,12 +2946,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokeatu oztopo bisualak"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Baimendu seinale bisualak"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Gehitu"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"AKTIBATU"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESAKTIBATU"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Aktibatu"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Aktibatu"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desaktibatu"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> arte egongo da aktibatuta \"Ez molestatu\" modua"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Desaktibatzen duzun arte egongo da aktibatuta \"Ez molestatu\" modua"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"<xliff:g id="RULE_NAME">%s</xliff:g> arauak automatikoki aktibatu du \"Ez molestatu\" modua"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"<xliff:g id="APP_NAME">%s</xliff:g> aplikazioak automatikoki aktibatu du \"Ez molestatu\" modua"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Lehentasuna dutenak soilik"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Laneko profilaren soinuak"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Erabili profil pertsonalaren soinuak"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Soinu berberak erabiltzen dira laneko profilean nahiz profil pertsonalean"</string>
@@ -2907,6 +2970,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Tonuak"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Beste soinu eta dardara batzuk"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Jakinarazpenak"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Berriki bidalitakoak"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Ezarpen aurreratuak"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Laneko jakinarazpenak"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Baimendu jakinarazteko biribiltxoak"</string>
@@ -2926,7 +2990,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Aplikazioen jakinarazpenak"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Jakinarazpenaren kategoria"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Jakinarazpenen kategoria-taldea"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Garrantzia"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Jokabidea"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Baimendu soinua egitea"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Ez erakutsi jakinarazpenik inoiz"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Ez egin soinurik eta ez erakutsi"</string>
@@ -2944,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Garrantzi ertainekoa"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Garrantzi handikoa"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Premiazkoa"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Erakutsi jakinarazpenak"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Jakinarazpenen laguntzailea"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Jakinarazpenetarako sarbidea"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Blokeatuta dago laneko profileko jakinarazpenetarako sarbidea"</string>
@@ -2974,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"\"Ez molestatu\" aukerarako sarbidea"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Ez dago \"Ez molestatu\" aukerarako sarbidea eskatu duen aplikaziorik"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Aplikazioak kargatzen…"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Aplikazio honen jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Kategoria honetako jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Talde honetako jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Zure eskaerari jarraiki, aplikazio honen jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Zure eskaerari jarraiki, jakinarazpen-kategoria hau gailu honetan erakustea galarazten ari da Android"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Zure eskaerari jarraiki, jakinarazpen talde hau gailu honetan erakustea galarazten ari da Android"</string>
<string name="notification_channels" msgid="5346841743182627500">"Kategoriak"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Beste batzuk"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3121,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Gailua babestuago izan dezazun, desblokeatzeko hatz-marka erabiltzeaz gain, pasahitza eska dezakezu gailua abiarazterakoan. Abiarazi ezean, gailuak ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuetan dauden datuak babesteko balio du neurri horrek. Pasahitza eskatzea nahi duzu gailua abiarazterakoan?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Bai"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Ez"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Bai"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Ez"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN kodea eskatzea nahi duzu?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Eredua eskatzea nahi duzu?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Pasahitza eskatzea nahi duzu?"</string>
@@ -3141,7 +3208,7 @@
<string name="storage_type_internal" msgid="6042049833565674948">"Barneko memoria"</string>
<string name="storage_type_external" msgid="7738894330670001898">"Kanpoko memoria"</string>
<string name="app_data_usage" msgid="7942375313697452803">"Aplikazioak erabilitako datuak"</string>
- <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g>, <xliff:g id="DATE">%2$s</xliff:g> eta gero"</string>
+ <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g>, <xliff:g id="DATE">%2$s</xliff:g>az geroztik"</string>
<string name="storage_used" msgid="7128074132917008743">"Erabilitako memoria"</string>
<string name="change" msgid="6657848623929839991">"Aldatu"</string>
<string name="change_storage" msgid="600475265207060436">"Aldatu biltegia"</string>
@@ -3233,7 +3300,7 @@
<string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Bateria-optimizazioa"</string>
- <string name="additional_battery_info" msgid="4754099329165411970">"Erabilera-abisuak"</string>
+ <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>
@@ -3393,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Uneko erabiltzailea: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> gisa hasi duzu saioa"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> da aplikazio lehenetsia"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"AKTIBATUTA / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"DESAKTIBATUTA"</string>
<string name="backup_disabled" msgid="485189128759595412">"Desgaituta dago babeskopiak egiteko aukera"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> bertsiora eguneratuta"</string>
@@ -3403,6 +3471,7 @@
<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="6346948990624612516">"Ezin dira desaktibatu babeskopiak"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Desgaituta dago hori egiteko aukera. Informazio gehiago lortzeko, jarri erakundearen administratzailearekin harremanetan."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Xehetasun gehiago"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Administratzaileak gainbegiratu eta kudeatu egin ditzake laneko profilarekin erlazionatutako aplikazioak eta datuak, besteak beste, ezarpenak, baimenak, enpresaren sarbide-baimenak, sareko jarduerak eta gailuaren kokapen-informazioa."</string>
@@ -3426,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"Laneko profila desaktibatuta"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Desaktibatuta daude aplikazioak, atzeko planoko sinkronizazioa eta laneko profilarekin erlazionatutako bestelako eginbideak."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Ezarri gaueko argiaren ordutegia"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Erabili pantaila horikara errazago lokartzeko"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"Gaueko argia aktibatuta"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Pantaila tindu horikaraz jantzi dugu. Errazago hartuko zaitu loak horrela."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Zuri iradokiak"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Iradokizunak"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+ beste <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3533,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"Bat ere ez"</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>
@@ -3555,31 +3628,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Ezarpen bizkorretako garatzaileentzako lauzak"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Laguntzeko gauzkazu"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Laguntzeko prest gauzkazu beti, gau eta egun."</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Laguntzeko prest gauzkazu beti, gau eta egun"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Arazoak konpontzen laguntzeko prest duzu gure laguntza-taldea"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Gure laguntza-taldea laguntzeko prest izango duzu egunero-egunero, gau eta egun"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Bilatu laguntzan edo itzuli laguntza eskaintzen dugun orduetan (bertako orduan):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Telefono bidezko laguntza-zerbitzuaren ordutegia (bertako orduan)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Bilatu laguntza edo arakatu aholkuak"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Jaso laguntza hemen:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Atzerrira zoaz?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Nazioarteko gastuak izan ditzakezu"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefonoa"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Txateatu"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Irakurri aholkuak eta trikimailuak"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Egin bilaketak laguntza-edukian eta eman zure iritzia"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Jarri laguntza-zerbitzuarekin harremanetan"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Hasi saioa"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Ezin duzu saioa hasi?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Bidali sistemari buruzko informazioa"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ez erakutsi berriro"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Kontu honen izenean egin da eskaera:"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Gehitu kontua"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Sistemari buruzko informazioa"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Leihoen arrastoa"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Azalerako arrastoa"</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>
@@ -3595,11 +3645,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundo</item>
<item quantity="one">Segundo bat</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"<xliff:g id="ESTIMATE">%1$s</xliff:g> inguru itxaron behar izaten da"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Kudeatu memoria"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Memorian tokia egiteko, babeskopiak dituzten argazkiak eta bideoak gailutik kentzen ditu memoria-kudeatzaileak."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Kendu argazkiak eta bideoak"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Memoria-kudeatzailea"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Erabili Memoria-kudeatzailea"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatikoa"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Eskuzko ezarpenak"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Egin tokia"</string>
@@ -3610,32 +3660,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Ireki kamera"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kamera bizkor irekitzeko, sakatu birritan etengailua. Edozein pantailatan zaudela egin dezakezu hori."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Ireki kamera bizkor"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Kamera irekitzeko, sakatu birritan etengailua"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Biratu kamera"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Atera autoargazkiak bizkorrago"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Autoargazki modua erabiltzeko, biratu telefonoa birritan"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Autoargazki modua erabiltzeko, biratu tableta birritan"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Autoargazki modua erabiltzeko, biratu gailua birritan"</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 dagoena ikusteko"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Sakatu birritan gailua bertan dagoena ikusteko"</string>
<string name="ambient_display_summary" msgid="525662960806416373">"Ordua, jakinarazpenen ikonoak eta bestelako informazioa begiratzeko, sakatu pantaila birritan."</string>
- <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Ikusi jakinarazpenak pantaila itzalita dagoenean"</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 dagoena ikusteko"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Jaso gailua bertan dagoena 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_pickup_suggestion_summary" msgid="7014700589991761035">"Ikusi jakinarazpenak pantaila itzalita dagoenean"</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 hatz-marka"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Jakinarazpenei begiratu bat emateko, pasatu hatza beherantz telefonoaren atzealdeko hatz-marken sentsorean."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Jakinarazpenei begiratu bat emateko, pasatu hatza beherantz tabletaren atzealdeko hatz-marken sentsorean."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Jakinarazpenei begiratu bat emateko, pasatu hatza beherantz gailuaren atzealdeko hatz-marken sentsorean."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ikusi jakinarazpenak bizkor"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Pasatu hatza beherantz hatz-marken sentsorean"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Aktibatuta"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Desaktibatuta"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Abiarazlea desblokeatuta dago dagoeneko"</string>
@@ -3765,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Direktoriorako sarbidea"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"direktoriorako sarbidea"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 2b9a5a6..bf49b06 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Bouton de commande"</item>
<item msgid="1624323946324499595">"NIP de l\'appareil associé"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 heure"</item>
<item msgid="5198271470953124739">"Aucun délai"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (par défaut)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Faible"</item>
<item msgid="2042505933058940139">"Faible"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Datées de plus de 60 jours"</item>
<item msgid="5692284879054004388">"Datées de plus de 90 jours"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Utiliser la préférence de réseau"</item>
+ <item msgid="8745603368609022803">"Traiter comme mesuré"</item>
+ <item msgid="2266114985518865625">"Traiter comme non mesuré"</item>
+ </string-array>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 9e6ca69..9282af6 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer un nouvel appareil"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Autorisez l\'appareil à s\'associer et à se connecter à des appareils Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Désactiver la signalisation intra-bande"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Ne pas faire jouer de sonneries téléphoniques personnalisées sur les écouteurs Bluetooth"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Définir la date"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Trier par ordre alphabétique"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Trier par fuseau horaire"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> commence le <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Heure avancée"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Heure normale"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Fuseau horaire par région"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fuseaux horaires à décalage fixe"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
<string name="time_picker_title" msgid="483460752287255019">"Heures"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Verrouiller automatiquement après"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Message écran verrouillage"</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>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<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>
<string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Par exemple : le téléphone Android de Jonathan"</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Infos de profil"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Position"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Utiliser ma position"</string>
<string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Sécurité et localisation"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Cryptage et authentifiants"</string>
@@ -459,9 +471,16 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Changer le mode de saisie"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Configurer le verrouillage de l\'écran"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protégez votre appareil"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utiliser le capteur d\'empreinte digitale"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Déverrouiller avec votre empreinte digitale"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Verrouillage de l\'écran"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Verrouill. profil pro"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum d\'appareils audio Bluetooth connectés"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Sélectionnez le nombre maximal d\'appareils Bluetooth connectés"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nom"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Connexion"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mb/s"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> souhaite activer le Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> souhaite désactiver le Wi-Fi"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activer le Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Utiliser le Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Paramètres Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Configurer et gérer les points d\'accès sans fil"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Mot de passe"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Afficher le mot de passe"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Sélectionner la bande du point d\'accès"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Bande de 2,4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Bande de 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Paramètres IP"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Entrez votre mot de passe réseau"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Réseau Wi-Fi du fournisseur de services"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Se connecter au réseau de <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Se connecter au réseau de <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Pour désactiver cette option, sélectionnez « Paramètres avancés » dans le menu à développer."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
@@ -909,10 +933,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bande du point d\'accès"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Un point d\'accès vous permet de créer un réseau Wi-Fi pour vos autres appareils. Il les connecte à Internet en utilisant votre connexion de données cellulaires. Des frais supplémentaires peuvent s\'appliquer."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Les applications peuvent créer un point d\'accès pour partager du contenu avec les appareils à proximité."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Désactiver automatiquement le point d\'accès Wi‑Fi"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Le point d\'accès Wi‑Fi se désactive si aucun appareil n\'est connecté"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Activation du point d\'accès Wi-Fi en cours…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Désactivation du point d\'accès Wi-Fi en cours…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> est actif"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Appels Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activer les appels Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Utiliser le Wi-Fi au lieu du réseau cellulaire"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Préférences d\'appel"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Mode d\'appel Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Préférences d\'itinérance"</string>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Adresse d\'urgence"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Cette adresse sera définie comme votre position géographique lorsque vous effectuerez des appels d\'urgence par Wi-Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"En savoir plus"</annotation>" sur la fonctionnalité de DNS privé"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
<string name="sound_settings" msgid="5534671337768745343">"Son"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"Type de réseau mobile"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Informations sur l\'opérateur"</string>
<string name="status_data_state" msgid="5503181397066522950">"État du réseau mobile"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"État du service"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Intensité du signal"</string>
<string name="status_roaming" msgid="2638800467430913403">"Itinérance"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Votre nouvelle mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » fonctionne correctement. \n\nPour déplacer des photos, des fichiers et des données d\'application sur cet appareil, sélectionnez Paramètres > Stockage."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Déplacer <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Le déplacement de l\'application « <xliff:g id="APP">^1</xliff:g> » et des données correspondantes vers « <xliff:g id="NAME_0">^2</xliff:g> » ne prend que quelques minutes. Vous ne pourrez pas utiliser l\'application tant que l\'opération n\'est pas terminée. \n\nNe retirez pas la mémoire de stockage « <xliff:g id="NAME_1">^2</xliff:g> » pendant le déplacement."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Pour déplacer des données, vous devez déverrouiller l\'utilisateur <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Déplacement de <xliff:g id="APP">^1</xliff:g> en cours..."</string>
<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 tant que l\'opération n\'est pas terminée."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annuler le déplacement"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Impossible de 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="5914265121343650792">"Réinitialiser aussi les cartes eSIM"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"Réinitialiser les paramètres"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Réinitialiser tous les paramètres réseau? Cette action est irréversible."</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Réinitialiser les paramètres"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Réinitialiser?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"La réinitialisation du réseau n\'est pas disponible pour cet utilisateur."</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Les paramètres réseau ont été réinitialisés"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Impossible de réinitialiser les cartes eSIM"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Les cartes eSIM ne peuvent pas être réinitialisées à cause d\'une erreur."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Effacer toutes les données (réinitialisation d\'usine)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Fournisseurs de services sur la carte eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"Cartes eSIM"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Cela n\'annulera pas votre forfait de services cellulaires."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connectez-vous à Internet."</string>
<string name="location_title" msgid="1029961368397484576">"My Location"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Position pour profil profess."</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économie de la pile"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Appareil uniquement"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Localisation désactivée"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Autor. à l\'échelle des applis"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Demandes localisation récentes"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Aucune application n\'a récemment demandé l\'accès à votre position"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Services de localisation"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Forte utilisation de la pile"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Faible utilisation de la pile"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode de localisation"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utiliser le GPS, le Wi‑Fi, le Bluetooth ou les réseaux cellulaires pour déterminer la position"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utiliser le Wi‑Fi, le Bluetooth ou les réseaux cellulaires pour déterminer la position"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Utiliser le GPS et les capteurs de l\'appareil pour déterminer la position"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Recherche"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Recherche de réseaux Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Améliorer la précision de la localisation en autorisant les applications et les services système à rechercher les réseaux Wi-Fi à tout moment."</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Sources de localisation"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"À propos de la tablette"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"À propos du téléphone"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"À propos de l\'appareil"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"À propos de l\'appareil émulé"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Informations légales, état et version du logiciel"</string>
<string name="legal_information" msgid="5769301644270604095">"Renseignements juridiques"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Afficher les <xliff:g id="COUNT">%1$d</xliff:g> applications"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Votre tablette et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre tablette ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Votre téléphone et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Votre appareil et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Activer d\'autres paramètres"</string>
<string name="application_info_label" msgid="5736524913065714880">"Informations sur l\'application"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pourrait nuire aux performances"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Cliquer lorsque curseur arrête"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Délai précédant le clic"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ACTIVÉ"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DÉSACTIVÉ"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Afficher dans la fenêtre de configuration rapide"</string>
@@ -1987,7 +2015,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">"Temps restant : <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> avant le chargement complet"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Activité en arrière-plan"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Limité."</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Autoriser l\'application à fonctionner en arrière-plan"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"L\'application peut fonctionner en arrière-plan lorsqu\'elle n\'est pas utilisée"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"L\'activité en arrière-plan de l\'application est limitée quand elle n\'est pas utilisée"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"La pile est en bon état"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Les applications se comportent normalement"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Pile faible"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La pile ne peut pas fournir une autonomie suffisante"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Activer le gestionnaire de pile intelligent"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Activer ce mode pour optimiser l\'utilisation de la pile"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Activer le mode Pile faible"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Prolongez l\'autonomie de la pile"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Le mode Pile faible est activé"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Certaines fonctionnalités sont limitées"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Téléphone utilisé intensément"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablette utilisée intensément"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Appareil utilisé intensément"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Utilisation approximative depuis la dernière charge complète : <xliff:g id="HOUR">%1$s</xliff:g>"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Votre téléphone a été utilisé intensément, et cela a consommé beaucoup d\'énergie. Sa pile fonctionne correctement.\n\nVotre téléphone a été utilisé pendant environ <xliff:g id="HOUR">%1$s</xliff:g> depuis sa dernière charge complète.\n\n Usage total :"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Votre tablette a été utilisée intensément, et cela a consommé beaucoup d\'énergie. Sa pile fonctionne correctement.\n\nVotre tablette a été utilisée pendant environ <xliff:g id="HOUR">%1$s</xliff:g> depuis sa dernière charge complète.\n\n Usage total :"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Votre appareil a été utilisé intensément, et cela a consommé beaucoup d\'énergie. Sa pile fonctionne correctement.\n\nVotre appareil a été utilisé pendant environ <xliff:g id="HOUR">%1$s</xliff:g> depuis sa dernière charge complète.\n\n Usage total :"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gestionnaire de pile intelligent"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Gérer automatiquement la pile"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Ajuster automatiquement la consommation d\'énergie des applications en fonction de l\'utilisation"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Applications restreintes"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d application</item>
+ <item quantity="other">%1$d applications</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Arrêter l\'application?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Votre téléphone n\'arrive pas à gérer sa pile normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez arrêter l\'application.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la pile."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Votre tablette n\'arrive pas à gérer sa pile normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> la maintient activée.\n\nPour y remédier, vous pouvez arrêter l\'application.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la pile."</string>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Serveur multimédia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimisation des applications"</string>
<string name="battery_saver" msgid="8172485772238572153">"Économie d\'énergie"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Utiliser le mode Économie d\'énergie"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activer automatiquement"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Jamais"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"à <xliff:g id="PERCENT">%1$s</xliff:g> d\'autonomie restante"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"La synchronisation rencontre actuellement des problèmes. Elle sera rétablie sous peu."</string>
<string name="add_account_label" msgid="7811707265834013767">"Ajouter un compte"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Le profil professionnel n\'est pas encore disponible"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Mode Travail"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Autoriser le fonctionnement du profil professionnel, y compris les applications, la synchronisation en arrière-plan et les fonctionnalités associées"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Supprimer le profil professionnel"</string>
<string name="background_data" msgid="5779592891375473817">"Données en arrière-plan"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Synchronisation, envoi et réception de données à tout moment"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Supprimer le compte?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"La suppression de ce compte entraînera la suppression de tous les messages, contacts et autres données de la tablette."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"La suppression de ce compte entraînera la suppression de tous les messages, contacts et autres données du téléphone."</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"La suppression de ce compte entraînera la suppression de tous les messages, les contacts et les autres données de l\'appareil."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Cette modification n\'est pas autorisée par votre administrateur"</string>
<string name="provider_label" msgid="7724593781904508866">"Abonnements Push"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="one">Vérifier le certificat</item>
<item quantity="other">Vérifier les certificats</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Utilisateurs"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Utilisateurs et profils"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ajouter un utilisateur ou un profil"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Ajouter un utilisateur"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, diffuser"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applications et notifications"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorisations, applications par défaut"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"Utilisateurs et comptes"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ne pas déranger, interrompre, interruption, pause"</string>
<string name="keywords_app" msgid="6334757056536837791">"Mémoire vive"</string>
<string name="keywords_location" msgid="6615286961552714686">"à proximité, position, historique, signalement"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"précision"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"compte"</string>
<string name="keywords_users" msgid="3434190133131387942">"restriction, restreindre, restreint"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"correction de texte, corriger, son, vibreur, automatique, langue, geste, suggérer, suggestion, thème, choquant, mot, type, emoji, international"</string>
@@ -2872,6 +2924,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> règles</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne pas déranger"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Activer la fonction « Ne pas déranger »"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportement"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Autoriser sons et vibrations de"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Aucun son"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Activer automatiquement"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Règles automatiques"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Règle automatique"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Créer règles Ne pas déranger"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limiter sons et vibrations à certains moments"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Utiliser la règle"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Prioritaires seulement"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes seulement"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Aucune interruption"</string>
@@ -2890,12 +2946,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquer dérangements visuels"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Autoriser les signaux visuels"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Ajouter"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ACTIVER MAINTENANT"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DÉSACTIVER MAINTENANT"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Activer"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Activer maintenant"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Désactiver maintenant"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Le mode Ne pas déranger est activé jusqu\'à <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Le mode Ne pas déranger restera actif jusqu\'à ce que vous le désactiviez"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Le mode Ne pas déranger a été activé par une règle (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Le mode Ne pas déranger a été activé par une application (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Priorités seulement"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Sons du profil professionnel"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Utiliser sons du profil perso"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Les sons du profil professionnel sont les mêmes que ceux du profil personnel"</string>
@@ -2911,6 +2970,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Sonneries"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Autres sons et vibrations"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Envoyées récemment"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Paramètres avancés"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notifications professionnelles"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Autoriser points de notification"</string>
@@ -2930,7 +2990,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'appli"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Catégorie de notifications"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Groupe de notifications"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Comportement"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Autoriser le son"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Ne jamais afficher les notifications"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Aucun son ni interruption visuelle"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Importance moyenne"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Importance élevée"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Importance urgente"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Afficher les notifications"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Assistant des notifications"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Accès aux notifications"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"L\'accès aux notifications du profil professionnel est bloqué"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Accès à « Ne pas déranger »"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Aune application installée n\'a demandé l\'accès au mode « Ne pas déranger »"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android empêche les notifications de cette application de s\'afficher sur cet appareil"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android empêche cette catégorie de notifications de s\'afficher sur cet appareil"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android empêche ce groupe de notifications de s\'afficher sur cet appareil"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"À votre demande, Android empêche les notifications de cette application de s\'afficher sur cet appareil"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"À votre demande, Android empêche cette catégorie de notifications de s\'afficher sur cet appareil"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"À votre demande, Android empêche ce groupe de notifications de s\'afficher sur cet appareil"</string>
<string name="notification_channels" msgid="5346841743182627500">"Catégories"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Autre"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<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_yes" msgid="4439509435889513411">"Oui"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Non"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Oui"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Non"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exiger le NIP?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Exiger le schéma?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Exiger le mot de passe?"</string>
@@ -3255,7 +3318,7 @@
<string name="high_power_system" msgid="7362862974428225301">"L\'optimisation de la pile n\'est pas disponible"</string>
<string name="high_power_desc" msgid="6283926163708585760">"N\'appliquer aucune optimisation de la pile. Cela risque de décharger la pile plus rapidement."</string>
<string name="high_power_prompt_title" msgid="6358673688590282655">"Autoriser l\'application à toujours fonctionner en arrière-plan?"</string>
- <string name="high_power_prompt_body" msgid="1031422980602565049">"Si vous autorisez <xliff:g id="APP_NAME">%1$s</xliff:g> à toujours fonctionner en arrière-plan, cela peut réduire l\'autonomie de la pile. \n\nVous pouvez modifier cela plus tard sous Paramètres > Applications et notifications."</string>
+ <string name="high_power_prompt_body" msgid="1031422980602565049">"Si vous autorisez <xliff:g id="APP_NAME">%1$s</xliff:g> à toujours fonctionner en arrière-plan, l\'autonomie de la pile peut être réduite. \n\nVous pouvez modifier cette option plus tard dans Paramètres > Applications et notifications."</string>
<string name="battery_summary" msgid="8044042095190688654">"Usage depuis la dernière charge complète : <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="battery_power_management" msgid="5571519699679107523">"Gestion de l\'alimentation"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"Aucune utilisation de la pile depuis la dernière charge complète"</string>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Utilisateur actuel : <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Connecté en tant que <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> est l\'application par défaut"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ACTIVÉ : <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"DÉSACTIVÉ"</string>
<string name="backup_disabled" msgid="485189128759595412">"Sauvegardes désactivées"</string>
<string name="about_summary" msgid="924181828102801010">"Mis à jour vers Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"Impossible de désactiver les sauvegardes"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Cette action est désactivée. Communiquez avec l\'administrateur de votre organisation pour en savoir plus."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Détails supplémentaires"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Votre administrateur peut surveiller et gérer les applications et les données associées à votre profil professionnel, y compris les paramètres, les autorisations, l\'accès aux contenus de l\'entreprise, l\'activité réseau et les données de localisation de l\'appareil."</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"Profil professionnel désactivé"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Les applications, la synchronisation en arrière-plan et d\'autres fonctionnalités liées à votre profil professionnel sont désactivées."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Créer un horaire pour le mode Éclairage nocturne"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Écran ambre pour vous aider à vous endormir"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"Éclairage nocturne activé"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"L\'écran a une teinte ambre qui peut vous aider à vous endormir."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Suggestions personnalisées"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> autre(s)"</string>
@@ -3537,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"Aucun"</string>
<string name="special_access" msgid="3458780842491881155">"Accès spéciaux aux 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>
@@ -3559,31 +3628,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Paramètres rapides, tuiles de concepteur"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Nous sommes là pour vous aider"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Nous sommes là pour vous aider, 24 heures sur 24, sept jours sur sept"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Nous sommes là pour vous aider, 24 heures sur 24, sept jours sur sept"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Notre équipe d\'assistance est là pour répondre à toutes vos questions"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Notre équipe d\'assistance est disponible 24 heures sur 24, sept jours sur sept"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Effectuez une recherche dans l\'aide ou revenez pendant les heures d\'ouverture du service d\'assistance (heure locale) :<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Heures d\'ouverture du service d\'assistance téléphonique (heure locale) <br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Effectuer une recherche dans l\'aide ou lire les conseils et astuces"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Assistance :"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Vous voyagez à l\'étranger?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Des frais d\'interurbain peuvent s\'appliquer"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Téléphone"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Clavardage"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Découvrir des conseils et des astuces"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Rechercher dans l\'aide et envoyer des commentaires"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Communiquer avec l\'équipe d\'assistance"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Connexion"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Vous n\'arrivez pas à vous connecter?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Envoyer les données système"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne plus afficher"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Effectuer la demande avec le compte"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Ajouter un compte"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Données sur le système"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Trace de fenêtre"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Trace de surface"</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>
@@ -3599,11 +3645,11 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconde</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondes</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Durée d\'attente : environ <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gérer l\'espace de stockage"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Pour vous aider à libérer de l\'espace, le Gestionnaire de stockage supprime les photos et les vidéos sauvegardées sur votre appareil."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Supprimer les photos et les vidéos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestionnaire de stockage"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Utiliser le gestionnaire de stockage"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatique"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuel"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libérer de l\'espace maintenant"</string>
@@ -3614,32 +3660,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accès rapide à l\'appareil photo"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pour ouvrir rapidement l\'appareil photo, il vous suffit d\'appuyer deux fois sur l\'interrupteur. Cela fonctionne à partir de n\'importe quel écran."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Ouvrez l\'appareil photo rapidement"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Appuyez deux fois sur l\'interrupteur pour ouvrir l\'app. photo"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Changer d\'appareil photo"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Prenez des égoportraits plus rapidement"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Pivotez deux fois le téléphone pour prendre un égoportrait"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Pivotez deux fois la tablette pour prendre un égoportrait"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Pivotez deux fois l\'appareil pour prendre un égoportrait"</string>
<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, touchez deux fois l\'écran."</string>
- <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Consulter les notifications lorsque l\'écran est éteint"</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, saisissez 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, saisissez votre appareil."</string>
- <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Consulter les notifications lorsque l\'écran est éteint"</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">"Balayez empreinte digitale"</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 capteur d\'empreintes digitales à l\'arrière du téléphone."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière de la tablette."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière de l\'appareil."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Affichez les notifications rapidement"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Glissez un doigt vers le bas sur le capteur d\'empr. digitales"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Activé"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Désactivé"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Le programme d\'amorçage est déjà déverrouillé"</string>
@@ -3769,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Accès au répertoire"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"accès au répertoire"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index b619da0..1907e41 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Pulsar o botón"</item>
<item msgid="1624323946324499595">"PIN do dispositivo mesmo nivel"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 hora"</item>
<item msgid="5198271470953124739">"Sen tempo de espera"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (predeterminado)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Baixa"</item>
<item msgid="2042505933058940139">"Baixa"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"De máis de 60 días"</item>
<item msgid="5692284879054004388">"De máis de 90 días"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Utilizar as preferencias da rede"</item>
+ <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>
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 03dce16..3c3fae6 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os teus dispositivos"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar dispositivo novo"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permite que o dispositivo se sincronice e conecte con dispositivos Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Desactivar a función de soar na mesma banda"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"No se reproducen tons de chamada personalizados nos auriculares Bluetooth"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabeticamente"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"Data de comezo de cambio do fuso horario <xliff:g id="TIME_TYPE">%1$s</xliff:g>: <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Horario de verán"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Horario estándar"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Fuso horario por rexión"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fusos horarios cunha diferenza horaria fixa"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
<string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Mensaxe en pantalla de bloqueo"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Activar os widgets"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desactivado polo administrador"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ningunha"</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">"Por exemplo: Android de Xoán."</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Información do perfil"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Localización"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Usar a localización"</string>
<string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Seguranza e localización"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptación e credenciais"</string>
@@ -459,9 +471,16 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"O contrasinal que introduciches é correcto, pero lamentablemente os teus datos están danados. \n\nPara continuar usando a túa tableta, necesitas realizar un restablecemento de fábrica. Cando configures a túa tableta despois do restablecemento, poderás restaurar os datos dos que se fixo unha copia de seguranza na túa conta de Google."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"O contrasinal que introduciches é correcto, pero lamentablemente os teus datos están danados. \n\nPara continuar usando o teu teléfono, necesitas realizar un restablecemento de fábrica. Cando configures o teu teléfono despois do restablecemento, poderás restaurar os datos dos que se fixo unha copia de seguranza na túa conta de Google."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar de método de introdución"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Definir bloqueo da pantalla"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protexe o teu dispositivo"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utilizar impresión dixital"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloqueo coa túa impresión dixital"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Bloqueo de pantalla"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Bloqueo do traballo"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altofalante"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e contido multimedia"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configuración"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Número máximo de dispositivos de audio Bluetooth conectados"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecciona o número máximo de dispositivos de audio Bluetooth conectados"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Emisión"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activar visualización sen fíos"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Non hai dispositivos cerca."</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Iniciar sesión"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> quere activar a wifi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> quere desactivar a wifi"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wifi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activar a wifi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wifi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Usar a wifi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Configuración da wifi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wifi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Configura e xestiona puntos de acceso sen fíos"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Contrasinal"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contrasinal"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Seleccionar banda AP"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automaticamente"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Configuración IP"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dispoñible)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce o contrasinal da túa rede"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede wifi do operador"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectar a través de <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectar a través de <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mellorar a precisión da localización e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> quere activar a exploración de redes, aínda que a wifi estea desactivada.\n\nQueres permitilo para todas as aplicacións que queren buscar redes?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desactivar esta función, accede ás opcións avanzadas no menú adicional."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -921,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Chamadas por wifi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activa as chamadas por wifi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Utiliza a wifi en lugar da rede de telefonía móbil"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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_roaming_mode_title" msgid="1565039047187685115">"Preferencia de itinerancia"</string>
@@ -931,12 +956,12 @@
<string-array name="wifi_calling_mode_choices">
<item msgid="2124257075906188844">"Wifi preferida"</item>
<item msgid="1335127656328817518">"Datos móbiles preferidos"</item>
- <item msgid="3132912693346866895">"Só wifi"</item>
+ <item msgid="3132912693346866895">"Só por wifi"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2">
<item msgid="742988808283756263">"Wifi"</item>
<item msgid="7715869266611010880">"Datos móbiles"</item>
- <item msgid="2838022395783120596">"Só wifi"</item>
+ <item msgid="2838022395783120596">"Só por wifi"</item>
</string-array>
<string-array name="wifi_calling_mode_values">
<item msgid="4799585830102342375">"2"</item>
@@ -959,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Enderezo de emerxencia"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Utilízase como a túa localización cando fas unha chamada de emerxencia por wifi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Máis información"</annotation>" sobre as funcións de DNS privado"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
<string name="sound_settings" msgid="5534671337768745343">"Son"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1173,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"Tipo de rede de telefonía móbil"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Información do operador"</string>
<string name="status_data_state" msgid="5503181397066522950">"Estado da rede de telefonía móbil"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"Estado do servizo"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Intensidade do sinal"</string>
<string name="status_roaming" msgid="2638800467430913403">"Itinerancia"</string>
@@ -1306,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"A túa nova <xliff:g id="NAME">^1</xliff:g> funciona. \n\nPara migrar fotos, ficheiros e datos de aplicacións a este dispositivo, accede a Configuración > Almacenamento."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Migrar <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Migrar <xliff:g id="APP">^1</xliff:g> e os seus datos á <xliff:g id="NAME_0">^2</xliff:g> só tardará un momento. Non poderás usar a aplicación ata que finalice a migración. \n\nNon retires a <xliff:g id="NAME_1">^2</xliff:g> durante a migración."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Para mover os datos, debes desbloquear o usuario <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Migrando <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Non retires a <xliff:g id="NAME">^1</xliff:g> durante a migración. \n\nA aplicación <xliff:g id="APP">^2</xliff:g> deste dispositivo non estará dispoñible ata que finalice a migración."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar migración"</string>
@@ -1358,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Pódense restablecer a rede, as aplicacións ou o dispositivo"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Restablecer wifi, rede móbil e Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Con esta selección, restableceranse todas as opcións de configuración da rede, entre elas as referentes a:\n\n"<li>"Wifi"</li>\n<li>"Datos móbiles"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Restablecer tamén as eSIM"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"Restablecer configuración"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Queres restablecer toda a configuración da rede? Esta acción non se pode desfacer."</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Restablecer configuración"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Restablecer?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"O restablecemento de rede non está dispoñible para este usuario"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Restableceuse a configuración da rede"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Non se puideron restablecer as eSIM"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Non se puideron restablecer as eSIM debido a un erro."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Borrar todos os datos (restablecemento de fábrica)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Esta acción borrará todos os datos do "<b>"almacenamento interno"</b>" da túa tableta, como:\n\n"<li>"A túa conta de Google"</li>\n<li>"Os datos e a configuracións do sistema e das aplicacións"</li>\n<li>"Aplicacións descargadas"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Esta acción borrará todos os datos do "<b>"almacenamento interno"</b>" do teléfono, como:\n\n"<li>"A túa conta de Google"</li>\n<li>"Datos e configuración do sistema e das aplicacións"</li>\n<li>"Aplicacións descargadas"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente tes sesión iniciada nas seguintes contas:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hai outros usuarios presentes neste dispositivo.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros datos do usuario"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadores da eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Con esta acción non se cancelará o teu plan de servizos móbiles."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar o "<b>"almacenamento USB"</b>"."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imaxes e outros datos de usuario, é necesario borrar a "<b>"tarxeta SD"</b>"."</string>
@@ -1430,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conéctate a Internet"</string>
<string name="location_title" msgid="1029961368397484576">"A miña localización"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Localización perfil traballo"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisión"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Aforro de batería"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Só dispositivo"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Localización desactivada"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Permisos de nivel aplicación"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitudes de localización recentes"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Ningunha aplicación solicitou a túa localización recentemente"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Servizos de localización"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Uso da batería elevado"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Uso da batería baixo"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localización"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utiliza o GPS, a wifi, o Bluetooth ou as redes de telefonía móbil para determinar a localización"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utiliza a wifi, o Bluetooth ou as redes de telefonía móbil para determinar a localización"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Usa o GPS e os sensores do dispositivo para determinar a localización"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Exploración de conexións"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Exploración de redes wifi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Mellora a localización permitindo que as aplicacións do sistema e os servizos detecten redes wifi en calquera momento."</string>
@@ -1466,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Fontes de localización"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca da tableta"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Acerca do teléfono"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Acerca do dispositivo"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Acerca do dispositivo emulado"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Mostra información legal, o estado e a versión do software"</string>
<string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
@@ -1571,8 +1597,9 @@
<string name="install_applications_title" msgid="4987712352256508946">"Permitir todas as fontes de aplicacións"</string>
<string name="recent_app_category_title" msgid="6673071268966003928">"Aplicacións abertas recentemente"</string>
<string name="see_all_apps_title" msgid="1317153498074308438">"Ver as <xliff:g id="COUNT">%1$d</xliff:g> aplicacións"</string>
- <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"A tableta e os datos persoais son máis vulnerables aos ataques de aplicacións descoñecidas. Ao instalar aplicacións desta fonte, aceptas que es responsable dos danos ocasionados na tableta ou da perda dos datos que se poden derivar do seu uso."</string>
- <string name="install_all_warning" product="default" msgid="1952257127370115988">"O teléfono e os datos persoais son máis vulnerables aos ataques de aplicacións descoñecidas. Ao instalar aplicacións desta fonte, aceptas que es responsable dos danos ocasionados no teléfono ou da perda dos datos que se poden derivar do seu uso."</string>
+ <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"A tableta e os datos persoais son máis vulnerables aos ataques de aplicacións descoñecidas. Ao instalar aplicacións desta fonte, aceptas que es responsable dos danos ocasionados na tableta ou da perda dos datos que se poidan derivar do seu uso."</string>
+ <string name="install_all_warning" product="default" msgid="1952257127370115988">"O teléfono e os datos persoais son máis vulnerables aos ataques de aplicacións descoñecidas. Ao instalar aplicacións desta fonte, aceptas que es responsable dos danos ocasionados no teléfono ou da perda dos datos que se poidan derivar do seu uso."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"O teu dispositivo e os datos persoais son máis vulnerables aos ataques de aplicacións descoñecidas. Ao instalar aplicacións desta fonte, aceptas que es responsable dos danos que se poidan producir no dispositivo ou da perda de datos que se poida derivar do seu uso."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Activa máis opcións de configuración"</string>
<string name="application_info_label" msgid="5736524913065714880">"Info da app"</string>
@@ -1872,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afectar ao rendemento"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic cando o punteiro pare"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Retardo antes de facer clic"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ACTIVADO"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en Configuración rápida"</string>
@@ -1985,7 +2015,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> restante(s)"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> para completar a carga"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Actividade en segundo plano"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Restrinxido"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Permite que a aplicación se execute en segundo plano"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"É posible que a aplicación se execute en segundo plano cando non se estea utilizando"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"A actividade en segundo plano da aplicación é limitada cando non se está utilizando"</string>
@@ -2030,10 +2060,29 @@
<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="7060523369832289878">"A batería funciona ben"</string>
<string name="battery_tip_summary_summary" msgid="7832491466325707487">"As aplicacións estanse comportando con normalidade"</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"A batería ten pouca capacidade"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"A batería dura pouco"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Activar o xestor de batería intelixente"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Activa a opción para optimizar o uso da batería"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Activa o modo Pouca batería"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Amplía a duración da batería"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Está activado o modo Pouca batería"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Algunhas funcións están limitadas"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Utilizaches moito o teléfono"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Utilizaches moito a tableta"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Utilizaches moito o dispositivo"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Utilizouse aproximadamente durante <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Utilizaches moito o teléfono e consumiches moita batería, a cal funciona con normalidade.\n\n O teléfono utilizouse aproximadamente durante <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Utilizaches moito a tableta e consumiches moita batería, a cal funciona con normalidade.\n\n A tableta utilizouse aproximadamente durante <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Utilizaches moito o dispositivo e consumiches moita batería, a cal funciona con normalidade.\n\n O dispositivo utilizouse aproximadamente durante <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Xestor de batería intelixente"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Xestionar a batería automaticamente"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Axusta automaticamente o consumo de batería por parte das aplicacións en función do uso"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Aplicacións restrinxidas"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d aplicacións</item>
+ <item quantity="one">%1$d aplicación</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Queres deter a aplicación?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"O teléfono non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> manteno activo.\n\nPara tentar solucionar este problema, podes deter a aplicación.\n\nSe o problema persiste, é posible que necesites desinstalala para mellorar o rendemento da batería."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"A tableta non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> mantena activa.\n\nPara tentar solucionar este problema, podes deter a aplicación.\n\nSe o problema persiste, é posible que necesites desinstalala para mellorar o rendemento da batería."</string>
@@ -2142,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimedia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimización da aplicación"</string>
<string name="battery_saver" msgid="8172485772238572153">"Aforro de batería"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Usar Aforro de batería"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activar automaticamente"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"coa batería ao <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2329,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"A sincronización experimenta problemas actualmente. Recuperarase en breve."</string>
<string name="add_account_label" msgid="7811707265834013767">"Engadir conta"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"O perfil de traballo aínda non está dispoñible"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Modo de traballo"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Permite que funcione o perfil de traballo, incluídas as aplicacións, a sincronización en segundo plano e as funcións relacionadas"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Eliminar perfil de traballo"</string>
<string name="background_data" msgid="5779592891375473817">"Datos en segundo plano"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Aplicacións poden sincronizar, enviar e recibir datos sempre"</string>
@@ -2356,12 +2410,13 @@
<string name="header_data_and_synchronization" msgid="5165024023936509896">"Datos e sincronización"</string>
<string name="preference_change_password_title" msgid="8955581790270130056">"Cambiar contrasinal"</string>
<string name="header_account_settings" msgid="5382475087121880626">"Configuración da conta"</string>
- <string name="remove_account_label" msgid="5921986026504804119">"Eliminar conta"</string>
+ <string name="remove_account_label" msgid="5921986026504804119">"Quitar conta"</string>
<string name="header_add_an_account" msgid="756108499532023798">"Engadir unha conta"</string>
<string name="finish_button_label" msgid="481587707657751116">"Finalizar"</string>
- <string name="really_remove_account_title" msgid="8800653398717172460">"Eliminar conta?"</string>
+ <string name="really_remove_account_title" msgid="8800653398717172460">"Queres quitar a conta?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"A eliminación desta conta eliminará todas as súas mensaxes, contactos e demais datos da tableta."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Se eliminas esta conta borraranse todas as súas mensaxes, contactos e demais datos do teléfono."</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Se quitas esta conta, eliminaranse todas as súas mensaxes, contactos e demais datos do dispositivo."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"O administrador non admite este cambio"</string>
<string name="provider_label" msgid="7724593781904508866">"Subscricións push"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2580,7 +2635,8 @@
<item quantity="other">Comprobar certificados</item>
<item quantity="one">Comprobar certificado</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Usuarios e perfís"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Engadir usuario ou perfil"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Engadir usuario"</string>
@@ -2770,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</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="account_dashboard_title" msgid="4936890821712178853">"Usuarios e contas"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2801,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"non non molestar, interromper, interrupción, pausa"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"cerca, localización, historial, informe"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"precisión"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
<string name="keywords_users" msgid="3434190133131387942">"restrición, restrinxir, restrinxido"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"corrección de texto, correcto, son, vibrar, automático, idioma, xesto, suxerir, suxestión, tema, ofensivo, palabra, escribir, emoji, internacional"</string>
@@ -2868,6 +2924,7 @@
<item quantity="one">1 norma</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Non molestar"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Activar modo Non molestar"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportamento"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permitir sons e vibracións de"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ningún son"</string>
@@ -2877,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Activar automaticamente"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Normas automáticas"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Norma automática"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir normas de Non molestar"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limita sons e vibracións en certos momentos"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Usar norma"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Só prioridade"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Só alarmas"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silencio total"</string>
@@ -2886,12 +2946,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear ruído visual"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Engadir"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ACTIVAR AGORA"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESACTIVAR AGORA"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Activar"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Activar agora"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desactivar agora"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"O modo Non molestar estará activado ata a seguinte hora: <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"O modo Non molestar permanecerá activado ata que o desactives"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Unha norma (<xliff:g id="RULE_NAME">%s</xliff:g>) activou automaticamente o modo Non molestar"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Unha aplicación (<xliff:g id="APP_NAME">%s</xliff:g>) activou automaticamente o modo Non molestar"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Só prioridade"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de traballo"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Usar sons do perfil persoal"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Os sons son iguais para o perfil persoal e o de traballo"</string>
@@ -2907,6 +2970,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Tons de chamada"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Outros sons e vibracións"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificacións"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Notificacións enviadas recentemente"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Configuración avanzada"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificacións do traballo"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Permitir puntos de notificación"</string>
@@ -2926,7 +2990,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Notificacións de aplicacións"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Categoría da notificación"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoría de notificación"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Comportamento"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir son"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Non mostra nunca as notificacións"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Nin son nin interrupción visual"</string>
@@ -2944,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Importancia media"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Importancia alta"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Importancia urxente"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Mostrar notificacións"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Asistente de notificacións"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificacións"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acceso ás notificacións do perfil de traballo está bloqueado"</string>
@@ -2974,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso en modo 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="4882445501376722969">"Android bloquea a visualización de notificacións desta aplicación neste dispositivo"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloquea a visualización de notificacións desta categoría neste dispositivo"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bloquea a visualización deste grupo de notificacións neste dispositivo"</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>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Segundo solicitaches, Android bloquea a visualización desta categoría de notificacións neste dispositivo"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Segundo solicitaches, Android bloquea a visualización deste grupo de notificacións neste dispositivo"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categorías"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Outro"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3121,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Ademais de usar a túa impresión dixital para desbloquear o dispositivo, tamén podes protexelo solicitando o teu contrasinal antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tan sequera alarmas.\n\nDeste xeito, axúdache a protexer os datos en caso de perda ou roubo dos dispositivos. Queres solicitar o contrasinal para iniciar o dispositivo?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Si"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Non"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Si"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Non"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Requirir PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Requirir padrón?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Requirir contrasinal?"</string>
@@ -3251,7 +3318,7 @@
<string name="high_power_system" msgid="7362862974428225301">"A optimización da batería non está dispoñible"</string>
<string name="high_power_desc" msgid="6283926163708585760">"Non aplicar a optimización da batería, xa que esta pode esgotarse máis rápido."</string>
<string name="high_power_prompt_title" msgid="6358673688590282655">"Queres permitir que esta aplicación se execute sempre en segundo plano?"</string>
- <string name="high_power_prompt_body" msgid="1031422980602565049">"É posible que permitir a <xliff:g id="APP_NAME">%1$s</xliff:g> executarse sempre en segundo plano reduza a duración da batería. \n\nPodes cambiar esta opción máis tarde en Configuración > Aplicacións e notificacións."</string>
+ <string name="high_power_prompt_body" msgid="1031422980602565049">"Se permites que <xliff:g id="APP_NAME">%1$s</xliff:g> estea executándose sempre en segundo plano, é posible que se reduza a duración da batería. \n\nPodes cambiar esta opción máis tarde en Configuración > Aplicacións e notificacións."</string>
<string name="battery_summary" msgid="8044042095190688654">"Uso do <xliff:g id="PERCENTAGE">%1$s</xliff:g> desde a última carga completa"</string>
<string name="battery_power_management" msgid="5571519699679107523">"Xestión da batería"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"Non hai uso da batería desde a última carga completa"</string>
@@ -3393,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Usuario actual: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Iniciaches sesión como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"Aplicación predeterminada: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ACTIVADA/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"DESACTIVADA"</string>
<string name="backup_disabled" msgid="485189128759595412">"Desactivouse a función de copia de seguranza"</string>
<string name="about_summary" msgid="924181828102801010">"Actualizouse a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3403,6 +3471,7 @@
<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="6346948990624612516">"Non se poden desactivar as copias de seguranza"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Esta acción está desactivada. Para obter máis información, contacta co administrador da túa organización."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Máis detalles"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"O teu administrador pode supervisar e xestionar as aplicacións e os datos asociados ao teu perfil de traballo, mesmo os permisos, a configuración, o acceso corporativo, a actividade da rede e a información de localización do dispositivo."</string>
@@ -3420,15 +3489,17 @@
<string name="condition_battery_title" msgid="3272131008388575349">"Aforro de batería activado"</string>
<string name="condition_battery_summary" msgid="4418839236027977450">"Reduciuse o rendemento. Desactiváronse os servizos de localización e os datos en segundo plano."</string>
<string name="condition_cellular_title" msgid="1327317003797575735">"Datos móbiles desactivados"</string>
- <string name="condition_cellular_summary" msgid="1818046558419658463">"Só hai Internet a través de wifi"</string>
+ <string name="condition_cellular_summary" msgid="1818046558419658463">"Só hai Internet a través da wifi"</string>
<string name="condition_bg_data_title" msgid="2483860304802846542">"Economizador de datos activado"</string>
- <string name="condition_bg_data_summary" msgid="656957852895282228">"Os datos en segundo plano só están dispoñibles a través de wifi. Esta opción pode afectar a algunhas aplicacións ou servizos cando non haxa wifi."</string>
+ <string name="condition_bg_data_summary" msgid="656957852895282228">"Os datos en segundo plano só están dispoñibles a través da wifi. Esta opción pode afectar a algunhas aplicacións ou servizos cando non haxa wifi."</string>
<string name="condition_work_title" msgid="7293722361184366648">"Perfil de traballo desactivado"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"As aplicacións, a sincronización en segundo plano e outras funcións relacionadas co teu perfil de traballo están desactivadas."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Define a programación da Luz nocturna"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Ton ámbar na pantalla para coller o sono"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"A luz nocturna está activada"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"A pantalla ten un ton ámbar que che pode axudar a coller o sono."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Suxestións personalizadas"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Suxestións"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> máis"</string>
@@ -3533,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"Ningunha simulación"</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>
@@ -3555,31 +3628,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos para programadores de configuración rápida"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Se precisas axuda, conta connosco"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos á túa disposición as 24 horas do día, os 7 días da semana"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos á túa disposición as 24 horas do día, os 7 días da semana"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"O noso equipo de asistencia está dispoñible para resolver os problemas que xurdan"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"O noso equipo de asistencia está dispoñible as 24 horas do día, os 7 días da semana"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Busca axuda ou téntao de novo durante o horario de asistencia (hora local):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Horario de asistencia telefónica (hora local)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Busca axuda ou consulta consellos e trucos"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Asistencia telefónica para:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Vas viaxar ao estranxeiro?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"É posible que se apliquen tarifas internacionais"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Teléfono"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Consultar consellos e trucos"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Buscar axuda e enviar comentarios"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contacta co servizo de asistencia"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Iniciar sesión"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Non podes iniciar sesión?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar información do sistema"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Non mostrar de novo"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Enviar solicitude desde a conta"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Engadir conta"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Información do sistema"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Seguimento de ventás"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Seguimento de superficie"</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>
@@ -3595,11 +3645,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
<item quantity="one">1 segundo</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Espera de aproximadamente <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Xestionar almacenamento"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para axudar a liberar espazo de almacenamento, o xestor de almacenamento elimina as fotos e vídeos con copia de seguranza do teu dispositivo."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Eliminar fotos e vídeos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Xestor de almacenamento"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Usar xestor de almacenamento"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espazo agora"</string>
@@ -3610,32 +3660,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Acceso rápido á cámara"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir rapidamente a cámara, preme dúas veces o botón de acendido. Isto funciona en calquera pantalla."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Abre a cámara rapidamente"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Preme o botón de acendido dúas veces para abrir a cámara"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Voltear a cámara"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Fai autofotos máis rápido"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Xira o teléfono dúas veces para acceder ao modo autofoto"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Xira a tableta dúas veces para acceder ao modo autofoto"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Xira o dispositivo dúas veces para acceder ao modo autofoto"</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="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_suggestion_summary" msgid="5987443721392571847">"Consulta as notificacións coa pantalla apagada"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Consulta as notificacións coa pantalla apagada"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira da tableta."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do dispositivo."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Consultar notificacións rapidamente"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Pasa o dedo cara abaixo no sensor de impresión dixital"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Activado"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Desactivado"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O cargador de inicio xa está desbloqueado"</string>
@@ -3765,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Acceso ao directorio"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"acceso ao directorio"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index e50afeb..2594b0a 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"પુશ બટન"</item>
<item msgid="1624323946324499595">"પીઅર ઉપકરણ પરથી પિન"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 કલાક"</item>
<item msgid="5198271470953124739">"ક્યારેય સમયસમાપ્તિ નહીં"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (ડિફૉલ્ટ)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"નબળું"</item>
<item msgid="2042505933058940139">"નબળી"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 દિવસથી વધુ જૂના"</item>
<item msgid="5692284879054004388">"90 દિવસથી વધુ જૂના"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"નેટવર્ક પસંદગીનો ઉપયોગ કરો"</item>
+ <item msgid="8745603368609022803">"મીટર કરેલ તરીકે ગણો"</item>
+ <item msgid="2266114985518865625">"મીટર ન કરેલ તરીકે ગણો"</item>
+ </string-array>
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 9099dcf..d7fa2be 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"તમારા ઉપકરણો"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"નવા ઉપકરણ સાથે જોડાણ બનાવો"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"ઉપકરણને જોડી બનાવવા અને અન્ય બ્લૂટૂથ ઉપકરણો સાથે કનેક્ટ કરવાની મંજૂરી આપો"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"બેંડમાં રિંગ વાગવાનું બંધ કરો"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"બ્લૂટૂથ હૅડસેટ પર કસ્ટમ ફોન રિંગટોન વગાડશો નહીં"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"તારીખ સેટ કરો"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"મૂળાક્ષરો પ્રમાણે સૉર્ટ કરો"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"સમય ઝોન પ્રમાણે સૉર્ટ કરો"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TRANSITION_DATE">%2$s</xliff:g> ના રોજથી <xliff:g id="TIME_TYPE">%1$s</xliff:g> શરૂ થાય છે."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"ડેલાઇટ સેવિંગ ટાઇમ"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"માનક સમય"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"પ્રદેશ દ્વારા સમય ઝોન"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"ઑફસેટ સમય ઝોન ઠીક કર્યા"</string>
<string name="date_picker_title" msgid="1338210036394128512">"તારીખ"</string>
<string name="time_picker_title" msgid="483460752287255019">"સમય"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"આપમેળે લૉક"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"લૉક સ્ક્રીન સંદેશ"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"વિજેટ્સને સક્ષમ કરો"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"વ્યવસ્થાપકે અક્ષમ કરેલ"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"કોઈ નહીં"</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">"દા.ત., જો નું Android."</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"પ્રોફાઇલ માહિતી"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"એકાઉન્ટ્સ"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"એન્ક્રિપ્શન અને ઓળખપત્રો"</string>
@@ -459,9 +471,16 @@
<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="8971630898700461034">"સ્ક્રીન લૉક સેટ કરો"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"તમારા ઉપકરણને સુરક્ષિત કરો"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"ફિંગરપ્રિન્ટનો ઉપયોગ કરો"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"તમારી ફિંગરપ્રિંટ વડે અનલૉક કરો"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"સ્ક્રીન લૉક પસંદ કરો"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"કાર્ય લૉક પસંદ કરો"</string>
@@ -567,7 +586,7 @@
<string name="lockpassword_pin_too_long" msgid="2079396149560490458">"<xliff:g id="NUMBER">%d</xliff:g>થી ઓછા અંક હોવા આવશ્યક છે"</string>
<string name="lockpassword_pin_contains_non_digits" msgid="7284664023164191198">"માત્ર 0-9 અંક શામેલ હોવા આવશ્યક છે"</string>
<string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"ઉપકરણ વ્યવસ્થાપક તાજેતરનાં પિનનો ઉપયોગ કરવાની મંજૂરી આપતા નથી"</string>
- <string name="lockpassword_pin_blacklisted_by_admin" msgid="8563366383328811472">"સામાન્ય પિન તમારા IT વ્યવસ્થાપક દ્વારા બ્લૉક કરવામાં આવે છે.એક અલગ પિન અજમાવી જુઓ."</string>
+ <string name="lockpassword_pin_blacklisted_by_admin" msgid="8563366383328811472">"સામાન્ય પિન તમારા IT વ્યવસ્થાપક દ્વારા બ્લૉક કરવામાં આવે છે. એક અલગ પિન અજમાવી જુઓ."</string>
<string name="lockpassword_illegal_character" msgid="8049611046639943217">"આમાં અમાન્ય અક્ષરોનો સમાવેશ થઈ શકતો નથી"</string>
<string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"ઓછામાં ઓછો એક વર્ણ હોવો આવશ્યક છે"</string>
<string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"ઓછામાં ઓછો એક અંક હોવો આવશ્યક છે"</string>
@@ -597,7 +616,7 @@
<item quantity="other">ઓછામાં ઓછા <xliff:g id="COUNT">%d</xliff:g> વર્ણ સિવાયના અક્ષર ધરાવતો હોવો જોઈએ</item>
</plurals>
<string name="lockpassword_password_recently_used" msgid="942665351220525547">"ઉપકરણ વ્યવસ્થાપક તાજેતરનાં પાસવર્ડનો ઉપયોગ કરવાની મંજૂરી આપતા નથી"</string>
- <string name="lockpassword_password_blacklisted_by_admin" msgid="9105101266246197027">"સામાન્ય પાસવર્ડ તમારા IT વ્યવસ્થાપક દ્વારા બ્લૉક કરવામાં આવે છે.એક અલગ પાસવર્ડ અજમાવી જુઓ."</string>
+ <string name="lockpassword_password_blacklisted_by_admin" msgid="9105101266246197027">"સામાન્ય પાસવર્ડ તમારા IT વ્યવસ્થાપક દ્વારા બ્લૉક કરવામાં આવે છે. એક અલગ પાસવર્ડ અજમાવી જુઓ."</string>
<string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"અંકોના ચઢતા ક્રમની, ઉતરતા ક્રમની અથવા પુનરાવર્તિત અનુક્રમની મંજૂરી નથી"</string>
<string name="lockpassword_confirm_label" msgid="8176726201389902380">"પુષ્ટિ કરો"</string>
<string name="lockpassword_cancel_label" msgid="8818529276331121899">"રદ કરો"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"સ્પીકર ફોન તરીકે"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"સંગીત અને મીડિયા માટે"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"સેટિંગ્સ યાદ રાખો"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"મહત્તમ સંખ્યામાં કનેક્ટ થયેલા બ્લૂટૂથ ઑડિઓ ઉપકરણો"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"મહત્તમ સંખ્યામાં કનેક્ટ થયેલા બ્લૂટૂથ ઑડિઓ ઉપકરણો પસંદ કરો"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"કાસ્ટ કરો"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"વાયરલેસ ડિસ્પ્લે સક્ષમ કરો"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"કોઇ નજીકના ઉપકરણો મળ્યાં નથી"</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"નામ"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"સાઇન ઇન કરો"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g>, વાઇ-ફાઇ ચાલુ કરવા માગે છે"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g>, વાઇ-ફાઇ બંધ કરવા માગે છે"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"વાઇ-ફાઇ"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"વાઇ-ફાઇ ચાલુ કરો"</string>
<string name="wifi_settings" msgid="29722149822540994">"વાઇ-ફાઇ"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"વાઇ-ફાઇનો ઉપયોગ કરો"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"વાઇ-ફાઇ સેટિંગ્સ"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"વાઇ-ફાઇ"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"વાયરલેસ ઍક્સેસ બિંદુઓને સેટ અને સંચાલિત કરો"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"પાસવર્ડ"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"પાસવર્ડ બતાવો"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP બેન્ડ પસંદ કરો"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"આપમેળે"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz બેન્ડ"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz બેન્ડ"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP સેટિંગ્સ"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ઉપલબ્ધ)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"તમારો નેટવર્ક પાસવર્ડ દાખલ કરો"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"કૅરિઅર વાઇ-ફાઇ નેટવર્ક"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> દ્વારા કનેક્ટ કરો"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> દ્વારા કનેક્ટ કરો"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"સ્થાન સચોટતા બહેતર બનાવવા માટે અને અન્ય હેતુઓ માટે, વાઇ-ફાઇ બંધ હોય ત્યારે પણ <xliff:g id="APP_NAME">%1$s</xliff:g> નેટવર્ક સ્કેનિંગ ચાલુ કરવા માંગે છે.\n\nસ્કેન કરવા માંગે છે તે બધી ઍપ્લિકેશનો માટે આને મંજૂરી આપીએ?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"આ બંધ કરવા માટે, ઓવરફ્લો મેનૂમાં વિગતવાર પર જાઓ."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"મંજૂરી આપો"</string>
@@ -909,10 +933,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP બૅન્ડ"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"તમારા અન્ય ઉપકરણો માટે વાઇ-ફાઇ નેટવર્ક બનાવવા હૉટસ્પૉટનો ઉપયોગ કરો. હૉટસ્પૉટ તમારા મોબાઇલ ડેટા કનેક્શનનો ઉપયોગ કરીને ઇન્ટરનેટ પૂરું પાડે છે. વધારાનો મોબાઇલ ડેટા શુલ્ક લાગુ થઈ શકે છે."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ઍપ્લિકેશનો નજીકના ઉપકરણો સાથે કન્ટેન્ટ શેર કરવા માટે હૉટસ્પૉટ બનાવી શકે છે."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"હૉટસ્પૉટ આપમેળે બંધ કરો"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"જો કોઈ ઉપકરણો કનેક્ટ થયેલા ન હશે તો વાઇ-ફાઇ હૉટસ્પૉટ બંધ થઈ જશે"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"હૉટસ્પૉટ ચાલુ કરી રહ્યું છે…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"હૉટસ્પૉટ બંધ કરી રહ્યું છે…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> સક્રિય છે"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"વાઇ-ફાઇ કૉલિંગ"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"વાઇ-ફાઇ કૉલિંગ ચાલુ કરો"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"મોબાઇલ નેટવર્કને બદલે વાઇ-ફાઇ નો ઉપયોગ કરો"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"કટોકટીનું સરનામું"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"જ્યારે તમે વાઇ-ફાઇનો ઉપયોગ કરીને કોઈ કટોકટીનો કૉલ કરો તો તેનો તમારા સ્થાન તરીકે ઉપયોગ કરવામાં આવશે"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"ખાનગી DNS સુવિધા વિશે "<annotation id="url">"વધુ જાણો"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"ડિસ્પ્લે"</string>
<string name="sound_settings" msgid="5534671337768745343">"ધ્વનિ"</string>
<string name="all_volume_title" msgid="4296957391257836961">"વૉલ્યૂમ્સ"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"મોબાઇલ નેટવર્ક પ્રકાર"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"ઓપરેટર માહિતી"</string>
<string name="status_data_state" msgid="5503181397066522950">"મોબાઇલ નેટવર્ક સ્થિતિ"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"સેવા સ્થિતિ"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"સિગ્નલ પ્રબળતા"</string>
<string name="status_roaming" msgid="2638800467430913403">"રોમિંગ"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"તમારું નવું <xliff:g id="NAME">^1</xliff:g> કાર્ય કરી રહ્યું છે. \n\nઆ ઉપકરણ પર ફોટો, ફાઇલો અને ઍપ્લિકેશન ડેટા ખસેડવા માટે, સેટિંગ્સ > સ્ટોરેજ પર જાઓ."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ને ખસેડો"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ને તેના ડેટાને <xliff:g id="NAME_0">^2</xliff:g> પર ખસેડવામાં થોડો જ સમય લાગશે. જ્યાં સુધી ખસેડવાનું પૂર્ણ ન થાય ત્યાં સુધી તમે એપ્લિકેશનનો ઉપયોગ કરી શકશો નહીં. \n\nખસેડવા દરમિયાન <xliff:g id="NAME_1">^2</xliff:g> ને દૂર કરશો નહીં."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ડેટા ખસેડવા માટે તમારે વપરાશકર્તા <xliff:g id="APP">^1</xliff:g> અનલૉક કરવાની જરૂર છે."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ને ખસેડી રહ્યાં છે…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ખસેડવા દરમિયાન <xliff:g id="NAME">^1</xliff:g> ને દૂર કરશો નહીં. \n\nજ્યાં સુધી ખસેડવાનું પૂર્ણ થતું નથી ત્યાં સુધી આ ઉપકરણ પરની <xliff:g id="APP">^2</xliff:g> ઍપ્લિકેશન ઉપલબ્ધ થશે નહીં."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ખસેડવાનું રદ કરો"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"નેટવર્ક, ઍપ અથવા ઉપકરણ રીસેટ કરી શકાય છે"</string>
<string name="reset_network_title" msgid="6166025966016873843">"વાઇ-ફાઇ, મોબાઇલ અને બ્લૂટૂથ રીસેટ કરો"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"આ બધી નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરશે, જેમાં સમાવિષ્ટ છે: \n\n"<li>"Wi‑Fi"</li>\n<li>"મોબાઇલ ડેટા"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"ઇ-સિમને પણ રીસેટ કરો"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"સેટિંગ્સ ફરીથી સેટ કરો"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"બધી નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરીએ? તમે આ ક્રિયાને પૂર્વવત્ કરી શકતાં નથી!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"સેટિંગ્સ ફરીથી સેટ કરો"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"ફરીથી સેટ કરીએ?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"આ વપરાશકર્તા માટે નેટવર્ક ફરીથી સેટ કરો ઉપલબ્ધ નથી"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરવામાં આવી છે"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"ઇ-સિમ રીસેટ કરી શકાતા નથી"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"એક ભૂલને કારણે ઇ-સિમ રીસેટ કરી શકાતા નથી."</string>
<string name="master_clear_title" msgid="3531267871084279512">"બધો ડેટા ભૂંસી નાખો (ફેક્ટરી રીસેટ)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM પરના કૅરિઅર"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"ઇ-સિમ"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"આનાથી તમારો મોબાઇલ સેવા પ્લાન રદ થશે"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"સંગીત, ચિત્રો અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"USB સંગ્રહ"</b>"ને કાઢી નાખવાની જરૂર છે."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"સંગીત, ચિત્રો અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"SD કાર્ડ"</b>"ને કાઢી નાખવાની જરૂર છે."</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"કૃપા કરીને ઇન્ટરનેટ સાથે કનેક્ટ કરો"</string>
<string name="location_title" msgid="1029961368397484576">"મારું સ્થાન"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"કાર્યાલયની પ્રોફાઇલ માટે સ્થાન"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"મોડ"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ઉચ્ચ સચોટતા"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"બૅટરી બચત"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"ફક્ત ઉપકરણ"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"સ્થાન બંધ"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"ઍપ્લિકેશન સ્તરની મંજૂરી"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"તાજેતરની સ્થાન વિનંતિ"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"હાલમાં કોઈ એપ્લિકેશને સ્થાન વિનંતી કરી નથી"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"સ્થાન સેવાઓ"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"વધુ બૅટરી ઉપયોગ"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"ઓછો બૅટરી ઉપયોગ"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"સ્થાન મોડ"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"સ્થાન નક્કી કરવા માટે GPS, વાઇ-ફાઇ, બ્લૂટૂથ અથવા મોબાઇલ નેટવર્કોનો ઉપયોગ કરો"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"સ્થાન નક્કી કરવા માટે વાઇ-ફાઇ, બ્લૂટૂથ અથવા મોબાઇલ નેટવર્કોનો ઉપયોગ કરો"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"સ્થાન નક્કી કરવા માટે GPS અને ઉપકરણ સેન્સરનો ઉપયોગ કરો"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"સ્કેન કરી રહ્યું છે"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"વાઇ-ફાઇ સ્કેનિંગ"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"કોઈપણ સમયે વાઇ-ફાઇ નેટવર્ક્સને શોધવા માટે સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓને મંજૂરી આપીને સ્થાન બહેતર બનાવો."</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"સ્થાન સ્ત્રોતો"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"કાનૂની માહિતી, સ્થિતિ, સોફ્ટવેર સંસ્કરણ જુઓ"</string>
<string name="legal_information" msgid="5769301644270604095">"કાનૂની માહિતી"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"બધી <xliff:g id="COUNT">%1$d</xliff:g> ઍપ્લિકેશન જુઓ"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"તમારું ટૅબ્લેટ અને વ્યક્તિગત ડેટા અજાણી ઍપ્લિકેશનોના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ્લિકેશનો ઇન્સ્ટૉલ કરીને તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ટૅબ્લેટને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"તમારો ફોન અને વ્યક્તિગત ડેટા અજાણી ઍપ્લિકેશનોના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ્લિકેશનો ઇન્સ્ટૉલ કરીને તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ફોનને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"તમારું ઉપકરણ અને વ્યક્તિગત ડેટા અજાણી ઍપના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ ઇન્સ્ટૉલ કરીને, તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ઉપકરણને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
<string name="advanced_settings" msgid="1777249286757067969">"વિગતવાર સેટિંગ્સ"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"વધુ સેટિંગ્સ વિકલ્પો સક્ષમ કરો"</string>
<string name="application_info_label" msgid="5736524913065714880">"ઍપ્લિકેશન માહિતી"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"કાર્યપ્રદર્શનને અસર થઈ શકે છે"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"પોઇન્ટર અટકે પછી ક્લિક કરો"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ક્લિક કરતાં પહેલાં વિલંબ"</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_summary_state_enabled" msgid="8359913912320966304">"ચાલુ"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"બંધ"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"ઝડપી સેટિંગ્સમાં બતાવો"</string>
@@ -1987,7 +2015,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> બાકી"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"ચાર્જ થવામાં <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"પૃષ્ઠભૂમિની પ્રવૃત્તિ"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"પ્રતિબંધિત"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"ઍપ્લિકેશનને પૃષ્ઠભૂમિમાં ચાલવાની મંજૂરી આપો"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"ઍપ્લિકેશન ઉપયોગમાં ન હોય ત્યારે પૃષ્ઠભૂમિમાં ચાલે છે"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"ઍપ્લિકેશનની બૅકગ્રાઉન્ડ પ્રવૃત્તિ ઉપયોગમાં ન હોય ત્યારે મર્યાદિત હોય છે"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"બૅટરી સારી અવસ્થામાં છે"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ઍપ સામાન્ય રીતે વર્તન કરે છે"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"બેટરીની ક્ષમતા ઓછી છે"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"આ બૅટરી બહુ લાંબી ચાલશે નહીં"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"સ્માર્ટ બૅટરી મેનેજર ચાલુ કરો"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"બૅટરી વપરાશ ઑપ્ટિમાઇઝ કરવા માટે ચાલુ કરો"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"ઓછી બૅટરી મોડ ચાલુ કરો"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"તમારી બૅટરીની આવરદા વધારો"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"ઓછી બૅટરી મોડ ચાલુ છે"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"અમુક સુવિધાઓ મર્યાદિત છે"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ફોનનો ભારે ઉપયોગ કર્યો"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ટૅબ્લેટનો ભારે ઉપયોગ કર્યો"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ઉપકરણનો ભારે ઉપયોગ કર્યો"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"છેલ્લે સંપૂર્ણ ચાર્જ કર્યાં પછી લગભગ <xliff:g id="HOUR">%1$s</xliff:g> કલાકનો ઉપયોગ"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"તમારા ફોનનો ભારે ઉપયોગ કરવામાં આવ્યો હતો અને તેને લીધે બૅટરીનો વપરાશ વધુ થયો હતો. તમારી બૅટરી સામાન્ય રીતે વર્તી રહી છે.\n\n છેલ્લે સંપૂર્ણ ચાર્જ કર્યાં પછી તમારા ફોનનો ઉપયોગ લગભગ <xliff:g id="HOUR">%1$s</xliff:g> કલાક કરવામાં આવ્યો હતો.\n\n કુલ વપરાશ:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"તમારા ટૅબ્લેટનો ભારે ઉપયોગ કરવામાં આવ્યો હતો અને તેને લીધે બૅટરીનો વપરાશ વધુ થયો હતો. તમારી બૅટરી સામાન્ય રીતે વર્તી રહી છે.\n\n છેલ્લે સંપૂર્ણ ચાર્જ કર્યાં પછી તમારા ટૅબ્લેટનો ઉપયોગ લગભગ <xliff:g id="HOUR">%1$s</xliff:g> કલાક કરવામાં આવ્યો હતો.\n\n કુલ વપરાશ:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"તમારા ઉપકરણનો ભારે ઉપયોગ કરવામાં આવ્યો હતો અને તેને લીધે બૅટરીનો વપરાશ વધુ થયો હતો. તમારી બૅટરી સામાન્ય રીતે વર્તી રહી છે.\n\n છેલ્લે સંપૂર્ણ ચાર્જ કર્યાં પછી તમારા ઉપકરણનો ઉપયોગ લગભગ <xliff:g id="HOUR">%1$s</xliff:g> કલાક કરવામાં આવ્યો હતો.\n\n કુલ વપરાશ:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"સ્માર્ટ બૅટરી મેનેજર"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"આપમેળે-મેનેજ થતી બૅટરી"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"વપરાશના આધારે ઍપ દ્વારા આપમેળે પાવર વપરાશ ઓછો-વધતો કરવામાં આવે છે"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"પ્રતિબંધિત ઍપ"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d ઍપ</item>
+ <item quantity="other">%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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ઍપ્લિકેશન ઓપ્ટિમાઇઝેશન"</string>
<string name="battery_saver" msgid="8172485772238572153">"બૅટરી સેવર"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"બૅટરી સેવરનો ઉપયોગ કરો"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"આપમેળે ચાલુ કરો"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ક્યારેય નહીં"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> બૅટરી પર"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"સમન્વયનમાં હાલમાં સમસ્યા આવી રહી છે. તે ટૂંક સમયમાં પાછું આવશે."</string>
<string name="add_account_label" msgid="7811707265834013767">"એકાઉન્ટ ઉમેરો"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"કાર્યાલયની પ્રોફાઇલ હજી સુધી ઉપલબ્ધ નથી"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"કાર્ય મોડ"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"કાર્ય પ્રોફાઇલને ઍપ્લિકેશનો, બૅકગ્રાઉન્ડ સમન્વયન અને સંબંધિત સુવિધાઓ સહિતનું કાર્ય કરવાની મંજૂરી આપો"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"કાર્યાલયની પ્રોફાઇલ દૂર કરો"</string>
<string name="background_data" msgid="5779592891375473817">"બૅકગ્રાઉન્ડ ડેટા"</string>
<string name="background_data_summary" msgid="8328521479872763452">"ઍપ્લિકેશનો કોઈપણ સમયે ડેટાને સમન્વયિત, મોકલી અને પ્રાપ્ત કરી શકે છે"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"એકાઉન્ટ દૂર કરીએ?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"આ એકાઉન્ટને દૂર કરવું તેનાં તમામ સંદેશા, સંપર્કો અને ટેબ્લેટમાંના અન્ય ડેટાને કાઢી નાંખશે!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"આ એકાઉન્ટને દૂર કરવું તેનાં તમામ સંદેશા, સંપર્કો અને ફોનમાંના અન્ય ડેટાને કાઢી નાંખશે!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"આ એકાઉન્ટને કાઢી નાખવાથી તેના બધા સંદેશા, સંપર્કો તેમજ ઉપકરણમાંનો અન્ય ડેટા ડિલીટ થઈ જશે!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"તમારા વ્યવસ્થાપકે આ ફેરફારની મંજૂરી આપી નથી"</string>
<string name="provider_label" msgid="7724593781904508866">"સબ્સ્ક્રિપ્શન્સ પુશ કરો"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="one">પ્રમાણપત્રો તપાસો</item>
<item quantity="other">પ્રમાણપત્રો તપાસો</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"વપરાશકર્તાઓ"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"વપરાશકર્તાઓ અને પ્રોફાઇલ્સ"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"વપરાશકર્તા અથવા પ્રોફાઇલ ઉમેરો"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"વપરાશકર્તા ઉમેરો"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"બ્લૂટૂથ, કાસ્ટ કરો"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ઍપ્લિકેશનો અને સૂચનાઓ"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"પરવાનગીઓ, ડિફૉલ્ટ ઍપ્લિકેશનો"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"વપરાશકર્તાઓ અને એકાઉન્ટો"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ખલેલ પાડવી નહીં ખલેલ પાડશો નહીં, વિક્ષેપ કરો, વિક્ષેપ, વિરામ"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"નજીકના, સ્થાન, ઇતિહાસ, જાણ કરવી"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"સચોટતા"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"એકાઉન્ટ"</string>
<string name="keywords_users" msgid="3434190133131387942">"પ્રતિબંધ, પ્રતિબંધિત કરો, પ્રતિબંધિત"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ટેક્સ્ટ સુધારણા, સુધારો, સાઉન્ડ, વાઇબ્રેટ, સ્વતઃ, ભાષા, હાવભાવ, સૂચવો, સૂચન, થીમ, અપમાનકારક, શબ્દ, પ્રકાર, ઇમોજી, આંતરરાષ્ટ્રીય"</string>
@@ -2872,6 +2924,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> નિયમ</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"ખલેલ પાડશો નહીં"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"ખલેલ પાડશો નહીં ચાલુ કરો"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"વર્તણૂક"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"આના ધ્વનિ અને વાઇબ્રેશનની મંજૂરી આપો"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"કોઈ ધ્વનિ નહીં"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"આપમેળે ચાલુ કરો"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"ઑટોમૅટિક નિયમો"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"આપમેળે નિયમ"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"ખલેલ પાડશો નહીં નિયમો સેટ કરો"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"અમુક સમયે ધ્વનિ અને વાઇબ્રેશન મર્યાદિત કરો"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"સાવ શાંતિ"</string>
@@ -2890,12 +2946,15 @@
<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_add" msgid="90014394953272517">"ઉમેરો"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"હમણાં ચાલુ કરો"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"હમણાં બંધ કરો"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"ચાલુ કરો"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"હમણાં ચાલુ કરો"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"હમણાં બંધ કરો"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"ખલેલ પાડશો નહીં મોડ <xliff:g id="FORMATTED_TIME">%s</xliff:g> સુધી ચાલુ છે"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"ખલેલ પાડશો નહીં મોડને તમે જ્યાં સુધી બંધ નહીં કરો ત્યાં સુધી તે ચાલુ રહેશે."</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"ખલેલ પાડશો નહીં મોડ એક <xliff:g id="RULE_NAME">%s</xliff:g> નિયમ દ્વારા આપમેળે ચાલુ કરવામાં આવ્યું હતું"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"ખલેલ પાડશો નહીં મોડ એક <xliff:g id="APP_NAME">%s</xliff:g> ઍપ દ્વારા આપમેળે ચાલુ કરવામાં આવ્યું હતું"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"માત્ર પ્રાધાન્યતા"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2970,7 @@
<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="recent_notifications" msgid="5660639387705060156">"તાજેતરમાં મોકલેલ"</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>
@@ -2930,7 +2990,7 @@
<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_importance_title" msgid="848692592679312666">"મહત્વ"</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="5455049524984686275">"કોઈ અવાજ અથવા વિઝ્યુઅલ અવરોધ નહીં"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"સામાન્ય મહત્ત્વની"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"નોટિફિકેશન ઍક્સેસ"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"કાર્યાલયની પ્રોફાઇલની સૂચનાઓનો ઍક્સેસ બ્લૉક કરવામાં આવ્યો છે"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"ખલેલ પાડશો નહીં નો ઍક્સેસ"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"કોઇ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સએ ખલેલ પાડશો નહીં ઍક્સેસ કરવાની વિનંતી કરી નથી"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"આ ઍપ્લિકેશનની નોટિફિકેશન આ ઉપકરણ પર પ્રદર્શિત થતા Android અવરોધિત કરી રહ્યું છે"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"આ કૅટેગરીની નોટિફિકેશન આ ઉપકરણ પર પ્રદર્શિત થતા Android અવરોધિત કરી રહ્યું છે"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android આ નોટિફિકેશનના જૂથોને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનની કૅટેગરીને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનના જૂથોને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
<string name="notification_channels" msgid="5346841743182627500">"કૅટેગરીઓ"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"અન્ય"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણ શરૂ થાય તે પહેલા તમારો પાસવર્ડ જરૂરી બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે અલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી.\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="1793719723017395175">"હા"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"ના"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"પિનની જરૂર છે?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"પૅટર્ન જરૂરી છે?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"પાસવર્ડ આવશ્યક છે?"</string>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"હાલના વપરાશકર્તા: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> તરીકે સાઇન ઇન કર્યું"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ડિફોલ્ટ છે"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ચાલુ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"બંધ"</string>
<string name="backup_disabled" msgid="485189128759595412">"બેક અપ અક્ષમ કર્યું"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> પર અપડેટ કરેલ"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"બૅકઅપ બંધ કરી શકતા નથી"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"આ ક્રિયા અક્ષમ કરેલ છે. વધુ જાણવા માટે તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"વધુ વિગતો"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"તમારા વ્યવસ્થાપક સેટિંગ્સ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ઉપકરણની સ્થાન માહિતી સહિત તમારી કાર્યાલયની પ્રોફાઇલ સાથે સંકળાયેલ ઍપ્લિકેશનો અને ડેટાનું નિયમન અને સંચાલન કરી શકે છે."</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"કાર્યાલયની પ્રોફાઇલ બંધ છે"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"તમારી કાર્ય પ્રોફાઇલને સંબંધિત ઍપ્લિકેશનો, બૅકગ્રાઉન્ડ સમન્વયન અને અન્ય સુવિધાઓ બંધ છે."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"રાત્રિ પ્રકાશ માટે શેડ્યૂલ સેટ કરો"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ઊંઘવામાં સહાય માટે સ્ક્રીન અમ્બર રંગછટા બનાવો"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"રાત્રિ પ્રકાશ ચાલુ છે"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+વધુ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3537,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"કોઈ નહીં"</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>
@@ -3559,31 +3628,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"બહુવિધ ઉપકરણો સાથે કનેક્ટ કરેલું છે"</string>
<string name="demo_mode" msgid="2798762752209330277">"સિસ્ટમ UI ડેમો મોડ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ઝપડી સેટિંગ્સ વિકાસકર્તા ટાઇલ"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"સહાય કરવા માટે અમે અહીં ઉપલબ્ધ છીએ"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"અમે તમારા માટે 24/7 અહીં ઉપલબ્ધ છીએ"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"અમે તમારા માટે 24/7 અહીં ઉપલબ્ધ છીએ"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"કોઈપણ સમસ્યાના સમાધાનમાં સહાય કરવા માટે અમારી સમર્થન ટીમ અહીં ઉપલબ્ધ છે"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"અમારી સમર્થન ટીમ આખો દિવસ, દરરોજ ઉપલબ્ધ છે"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"સહાયમાં શોધો અથવા સમર્થન સમય (સ્થાનિક સમય) દરમિયાન પાછા આવો:<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ફોન માટેનો સમર્થન સમય (સ્થાનિક સમય)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"સહાય શોધો અથવા ટિપ્સ અને યુક્તિઓનું અન્વેષણ કરો"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"આ માટે સમર્થન:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"વિદેશની મુસાફરી કરી રહ્યાં છો?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"આંતરરાષ્ટ્રીય શુલ્ક લાગુ થઈ શકે"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"ફોન"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"ચેટ"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ટિપ્સ અને યુક્તિઓનું અન્વેષણ કરો"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"સહાય શોધો અને પ્રતિસાદ મોકલો"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"સમર્થનનો સંપર્ક કરો"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"સાઇન ઇન કરો"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"શું સાઇન ઇન કરી શકતાં નથી?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"સિસ્ટમ માહિતી મોકલો"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ફરી બતાવશો નહીં"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"આ તરીકે વિનંતી કરી રહ્યું છે"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"એકાઉન્ટ ઉમેરો"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"સિસ્ટમ માહિતી"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"વિંડો ટ્રેસ"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"સપાટી ટ્રેસ"</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>
@@ -3599,11 +3645,11 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> સેકન્ડ</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> સેકન્ડ</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> રાહ જુઓ"</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="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>
@@ -3614,32 +3660,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"કૅમેરા ચાલુ કરવા માટે પાવર બટન બે વાર દબાવો"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"સેલ્ફી મોડ માટે ફોનને બે વાર વાંકો કરો"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"સેલ્ફી મોડ માટે ટૅબ્લેટને બે વાર વાંકું કરો"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"સેલ્ફી મોડ માટે ઉપકરણને બે વાર વાંકું કરો"</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_suggestion_summary" msgid="5987443721392571847">"જ્યારે સ્ક્રીન બંધ હોય, ત્યારે સૂચનાઓ તપાસો"</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_pickup_suggestion_summary" msgid="7014700589991761035">"જ્યારે સ્ક્રીન બંધ હોય, ત્યારે સૂચનાઓ તપાસો"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"તમારી સૂચનાઓને જોવા માટે, તમારા ઉપકરણની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"સૂચનાઓ ઝડપથી જુઓ"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"ચાલુ"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"બંધ"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"બૂટલોડર પહેલાંથી અનલૉક કરેલ છે"</string>
@@ -3769,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"ડિરેક્ટરીનો ઍક્સેસ"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"ડિરેક્ટરીનો ઍક્સેસ"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 3e237ea..3051579 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"1 घंटा"</item>
<item msgid="5198271470953124739">"कभी टाइम आउट नहीं होगा"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (डिफ़ॉल्ट)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"कमज़ोर"</item>
<item msgid="2042505933058940139">"कमज़ोर"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"60 दिन से अधिक पुराने"</item>
<item msgid="5692284879054004388">"90 दिन से अधिक पुराने"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"अपनी पसंद का नेटवर्क इस्तेमाल करें"</item>
+ <item msgid="8745603368609022803">"इस कनेक्शन में डेटा से जुड़ी पाबंदी है"</item>
+ <item msgid="2266114985518865625">"इस कनेक्शन में डेटा से जुड़ी पाबंदी नहीं है"</item>
+ </string-array>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a34f498..39d66d3 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"आपके डिवाइस"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नया डिवाइस जोड़ें"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"डिवाइस को ब्लूटूथ डिवाइस से जुड़ने और कनेक्ट होने की मंज़ूरी दें"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"\'इन-बैंड रिंगिंग\' (पसंद वाली रिंगटोन) बंद करें"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"फ़ोन पर मौजूद पसंद के मुताबिक बनी रिंगटोन ब्लूटूथ हेडसेट पर न चलाएं"</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>
@@ -330,6 +332,16 @@
<string name="date_time_set_date" msgid="7021491668550232105">"दिनांक सेट करें"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"वर्णानुक्रम में क्रमित करें"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"समय क्षेत्र द्वारा क्रमित करें"</string>
+ <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+ <skip />
+ <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+ <skip />
+ <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+ <skip />
<string name="date_picker_title" msgid="1338210036394128512">"तारीख"</string>
<string name="time_picker_title" msgid="483460752287255019">"समय"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"अपने आप लॉक करें"</string>
@@ -348,6 +360,8 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफ़ाइल की जानकारी"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"खाते"</string>
<string name="location_settings_title" msgid="1369675479310751735">"जगह"</string>
+ <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+ <skip />
<string name="account_settings_title" msgid="626177544686329806">"खाते"</string>
<string name="security_settings_title" msgid="4918904614964215087">"सुरक्षा और जगह"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"सुरक्षित करना और क्रेडेंशियल"</string>
@@ -691,6 +705,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्पीकर फ़ोन के रूप में"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत और मीडिया के लिए"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग याद रखें"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ब्लूटूथ के ज़रिए ज़्यादा से ज़्यादा कितने ऑडियो डिवाइस जुड़ सकते हैं"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"यह चुनें कि ब्लूटूथ के ज़रिए ज़्यादा से ज़्यादा कितने ऑडियो डिवाइस जुड़ सकते हैं"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"कास्ट करें"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"बिना वायर के स्क्रीन दिखाना (वायरलेस डिसप्ले) चालू करें"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"आस-पास कोई भी डिवाइस नहीं मिला."</string>
@@ -705,6 +721,8 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"नाम"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+ <skip />
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> वाई-फ़ाई को चालू करना चाहता है"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> वाई-फ़ाई को बंद करना चाहता है"</string>
@@ -722,6 +740,8 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"वाई-फ़ाई"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"वाई-फ़ाई चालू करें"</string>
<string name="wifi_settings" msgid="29722149822540994">"वाई-फ़ाई"</string>
+ <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+ <skip />
<string name="wifi_settings_category" msgid="8719175790520448014">"वाई-फ़ाई सेटिंग"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"वाई-फ़ाई"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस पहुंच बिंदुओं को सेट अप और प्रबंधित करें"</string>
@@ -833,7 +853,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"अपना नेटवर्क पासवर्ड डालें"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी वाई-फ़ाई नेटवर्क"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> से कनेक्ट करें"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> से कनेक्ट करें"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"जगह की सटीकता को बेहतर बनाने और दुसरे कामों के लिए, Wi-Fi बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क को स्कैन करना चालू करना चाहता है.\n\nउन सभी ऐप को इसकी अनुमति दें जो स्कैन करना चाहते हैं?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"इसे बंद करने के लिए, ओवरफ़्लो मेन्यू में बेहतर पर जाएं."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दें"</string>
@@ -909,10 +929,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP बैंड"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"अपने दूसरे डिवाइस के लिए हॉटस्पॉट का इस्तेमाल करके वाई-फ़ाई नेटवर्क बनाएं. हॉटस्पॉट आपके मोबाइल डेटा कनेक्शन के ज़रिए इंटरनेट की सुविधा देता है. मोबाइल डेटा के लिए अतिरिक्त भुगतान करना पड़ सकता है."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ऐप्लिकेशन आस-पास के डिवाइस से सामग्री साझा करने के लिए कोई हॉटस्पॉट बना सकते हैं."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"हॉटस्पॉट अपने आप बंद करें"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"कोई डिवाइस कनेक्ट नहीं होने पर, वाई-फ़ाई हॉटस्पॉट बंद हो जाएगा"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्पॉट को चालू किया जा रहा है…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्पॉट को बंद किया जा रहा है…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय है"</string>
@@ -961,6 +979,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"आपातकालीन पता"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"जब आप वाई-फ़ाई पर आपातकालीन कॉल करते हैं, तब आपकी मौजूदा जगह को आपके पते के तौर पर इस्तेमाल किया जाता है"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"निजी डीएनएस की सुविधाओं के बारे में "<annotation id="url">"ज़्यादा जानें"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
<string name="sound_settings" msgid="5534671337768745343">"आवाज़"</string>
<string name="all_volume_title" msgid="4296957391257836961">"आवाज़"</string>
@@ -1308,6 +1327,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"आपका नया <xliff:g id="NAME">^1</xliff:g> काम कर रहा है. \n\nफ़ोटो, फ़ाइलों और ऐप डेटा को इस डिवाइस में ले जाने के लिए, सेटिंग > मेमोरी पर जाएं."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> को ले जाएं"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> और उसके डेटा को <xliff:g id="NAME_0">^2</xliff:g> में ले जाने में कुछ ही समय लगेगा. ले जाने का काम पूर्ण होने तक आप ऐप का उपयोग नहीं कर पाएंगे. \n\nले जाने के दौरान <xliff:g id="NAME_1">^2</xliff:g> को ना निकालें."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"उपयोगकर्ता <xliff:g id="APP">^1</xliff:g> को अनलॉक करके ही डेटा लाया या ले जाया जा सकता है."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> को ले जाया जा रहा है…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ले जाने के दौरान <xliff:g id="NAME">^1</xliff:g> को ना निकालें. \n\nइस डिवाइस में मौजूद <xliff:g id="APP">^2</xliff:g> ले जाने का काम पूर्ण होने तक ऐप उपलब्ध नहीं रहेगा."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ले जाना रोकें"</string>
@@ -1468,6 +1488,8 @@
<string name="location_sources_heading" msgid="1278732419851088319">"स्थानीय स्रोत"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"टैबलेट के बारे में"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"फ़ोन के बारे में"</string>
+ <!-- no translation found for about_settings (6717640957897546887) -->
+ <skip />
<string name="about_settings" product="emulator" msgid="221313099578564438">"एम्युलेट किए गए डिवाइस के बारे में"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"क़ानूनी जानकारी, स्थिति, सॉफ़्टवेयर वर्शन देखें"</string>
<string name="legal_information" msgid="5769301644270604095">"कानूनी जानकारी"</string>
@@ -1537,7 +1559,7 @@
<string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"आकार रिकॉर्ड किया गया"</string>
<string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"पुष्टि के लिए आकार को फिर से बनाएं"</string>
<string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"आपका नया अनलॉक आकार"</string>
- <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"दोबारा पूछें"</string>
+ <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"पुष्टि करें"</string>
<string name="lockpattern_restart_button_text" msgid="3337574403350953926">"पुन: आरेखित करें"</string>
<string name="lockpattern_retry_button_text" msgid="3480423193273588166">"साफ़ करें"</string>
<string name="lockpattern_continue_button_text" msgid="4723771754714471410">"जारी रखें"</string>
@@ -1575,6 +1597,8 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"सभी <xliff:g id="COUNT">%1$d</xliff:g> ऐप देखें"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"आपके टैबलेट और व्यक्तिगत डेटा पर अनजान ऐप्लिकेशन की ओर से हमला किए जाने का जोखिम ज़्यादा है. इस स्रोत से आने वाले ऐप्लिकेशन इंस्टॉल करके, आप सहमति देते हैं कि उनके उपयोग के कारण आपके टैबलेट को होने वाले किसी भी नुकसान या डेटा की हानि के लिए आप ही ज़िम्मेदार हैं."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"आपके फ़ोन और व्यक्तिगत डेटा पर अनजान ऐप्लिकेशन की ओर से हमला किए जाने का जोखिम ज़्यादा है. इस स्रोत से आने वाले ऐप्लिकेशन इंस्टॉल करके, आप सहमति देते हैं कि उनके उपयोग के कारण आपके फ़ोन को होने वाले किसी भी नुकसान या डेटा की हानि के लिए आप ही ज़िम्मेदार हैं."</string>
+ <!-- no translation found for install_all_warning (3648003301476423145) -->
+ <skip />
<string name="advanced_settings" msgid="1777249286757067969">"बेहतर सेटिंग"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"और सेटिंग विकल्प चालू करें"</string>
<string name="application_info_label" msgid="5736524913065714880">"ऐप की जानकारी"</string>
@@ -1874,6 +1898,12 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"डिसप्ले पर असर पड़ सकता है"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"पॉइंटर के रुकने के बाद क्लिक करें"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक करने से पहले का विलंब"</string>
+ <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+ <skip />
+ <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+ <skip />
+ <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+ <skip />
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"चालू"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"बंद"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"त्वरित सेटिंग में दिखाएं"</string>
@@ -2030,14 +2060,37 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"बैटरी अच्छी हालत में है"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ऐप्लिकेशन सामान्य तरीके से काम कर रहे हैं"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"बहुत कम बैटरी बची है"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"बहुत कम बैटरी बची है"</string>
+ <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
<skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+ <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+ <skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"फ़ोन का बहुत ज़्यादा इस्तेमाल किया गया"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"टैबलेट का बहुत ज़्यादा इस्तेमाल किया गया"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"डिवाइस का बहुत ज़्यादा इस्तेमाल किया गया"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"पिछली बार पूरा चार्ज किए जाने के बाद से लगभग <xliff:g id="HOUR">%1$s</xliff:g> के लिए इस्तेमाल किया गया"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"आपके फ़ोन का बहुत ज़्यादा इस्तेमाल किया गया और इस वजह से बैटरी की काफ़ी खपत हुई. बैटरी सामान्य रूप से काम कर रही है.\n\n पिछली बार पूरा चार्ज किए जाने के बाद से फ़ोन को लगभग <xliff:g id="HOUR">%1$s</xliff:g> के लिए इस्तेमाल किया गया.\n\n इस्तेमाल किए जाने का कुल समय:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"आपके टैबलेट का बहुत ज़्यादा इस्तेमाल किया गया और इस वजह से बैटरी की काफ़ी खपत हुई. बैटरी सामान्य रूप से काम कर रही है.\n\n पिछली बार पूरा चार्ज किए जाने के बाद से टैबलेट को लगभग <xliff:g id="HOUR">%1$s</xliff:g> के लिए इस्तेमाल किया गया.\n\n इस्तेमाल किए जाने का कुल समय:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"आपके डिवाइस का बहुत ज़्यादा इस्तेमाल किया गया और इस वजह से बैटरी की काफ़ी खपत हुई. बैटरी सामान्य रूप से काम कर रही है.\n\n पिछली बार पूरा चार्ज किए जाने के बाद से डिवाइस को लगभग <xliff:g id="HOUR">%1$s</xliff:g> के लिए इस्तेमाल किया गया.\n\n इस्तेमाल किए जाने का कुल समय:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"स्मार्ट बैटरी मैनेजर"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"अपने आप बैटरी का बेहतर इस्तेमाल करें"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"इस्तेमाल के हिसाब से, ऐप्लिकेशन के बैटरी इस्तेमाल करने में अपने आप बदलाव करें"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"पाबंदी वाले ऐप्लिकेशन"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d ऐप्लिकेशन</item>
+ <item quantity="other">%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>
@@ -2146,6 +2199,8 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"मीडिया सर्वर"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ऐप्स ऑप्टिमाइज़ेशन"</string>
<string name="battery_saver" msgid="8172485772238572153">"बैटरी सेवर"</string>
+ <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+ <skip />
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"अपने आप चालू करें"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"कभी नहीं"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> बैटरी होने पर"</string>
@@ -2366,6 +2421,8 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"खाता मिटाएं?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"यह खाता निकालने से, टैबलेट से खाते के सभी संदेश, संपर्क और अन्य डेटा हट जाएंगे!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"यह खाता निकालने से, फ़ोन से इसके सभी संदेश, संपर्क और अन्य डेटा हट जाएंगे!"</string>
+ <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+ <skip />
<string name="remove_account_failed" msgid="3901397272647112455">"आपका व्यवस्थापक इस बदलाव की अनुमति नहीं देता"</string>
<string name="provider_label" msgid="7724593781904508866">"पुश सदस्यता"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
<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_add" msgid="90014394953272517">"जोड़ें"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"अभी चालू करें"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"अभी बंद करें"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"अभी चालू करें"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"अभी बंद करें"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"\'परेशान न करें\' <xliff:g id="FORMATTED_TIME">%s</xliff:g> तक चालू है"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"\'परेशान न करें\' तब तक चालू रहेगा जब तक आप इसे बंद नहीं करते"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"(<xliff:g id="RULE_NAME">%s</xliff:g>) नियम से \'परेशान न करें\' अपने आप चालू हो गया था"</string>
@@ -2930,7 +2987,7 @@
<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_importance_title" msgid="848692592679312666">"महत्व"</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="5455049524984686275">"ध्वनि या दृश्य संबंधी कोई रुकावट नहीं"</string>
@@ -2948,6 +3005,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"मध्यम महत्व"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"सूचना का एक्सेस"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफ़ाइल सूचना की पहुंच रोक दी गई है"</string>
@@ -2978,9 +3036,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"परेशान न करें एक्सेस"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"इंस्टॉल किए गए किसी भी ऐप ने परेशान ना करें सुविधा के इस्तेमाल का अनुरोध नहीं किया है"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android इस ऐप की सूचनाओं को इस डिवाइस पर दिखाई देने से रोक रहा है"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android सूचना की इस श्रेणी को इस डिवाइस पर दिखाई देने से रोक रहा है"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android इस तरह की सूचनाओं को इस डिवाइस पर दिखाई देने से रोक रहा है"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"आपके अनुरोध पर, Android इस ऐप्लिकेशन की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"आपके अनुरोध पर, Android इस श्रेणी की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"आपके अनुरोध पर, Android इस तरह की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
<string name="notification_channels" msgid="5346841743182627500">"श्रेणियां"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3222,9 +3280,9 @@
<string name="system_default_app" msgid="3091113402349739037">"(सिस्टम डिफ़ॉल्ट)"</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="permit_usage_access" msgid="4012876269445832300">"डेटा का इस्तेमाल देखने की अनुमति दें"</string>
<string name="app_usage_preference" msgid="7065701732733134991">"ऐप उपयोग की प्राथमिकताएं"</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>
@@ -3559,31 +3617,10 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"कई डिवाइस से कनेक्ट है"</string>
<string name="demo_mode" msgid="2798762752209330277">"सिस्टम यूज़र इंटरफ़ेस (यूआई) डेमो मोड"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"त्वरित सेटिंग डेवलपर टाइल"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"सहायता के लिए हम यहां हैं"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"हम आपके लिए पूरे सप्ताह, हर समय यहां उपलब्ध हैं"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"हम आपके लिए पूरे सप्ताह, हर समय यहां उपलब्ध हैं"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"हमारी सहायता टीम किसी भी समस्या को हल करने के लिए यहां उपलब्ध है"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"हमारी सहायता टीम हर दिन, हर समय उपलब्ध रहती है"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मदद ढूंढें या सहायता की अवधि (स्थानीय समय) के दौरान वापस आएं:<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"फ़ोन सहायता अवधि का समय (स्थानीय समय)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मदद ढूंढें या सलाह और सुझाव तलाशें"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"इसके लिए समर्थन:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"विदेश यात्रा कर रहे हैं?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"अंतर्राष्ट्रीय शुल्क लागू हो सकते हैं"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"फ़ोन"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"चैट करें"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"सलाह और सुझाव के बारे में और जानें"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"मदद ढूंढें और सुझाव भेजें"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"सहायता से संपर्क करें"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन करें"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"प्रवेश नहीं कर पा रहे हैं?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टम की जानकारी भेजें"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"दोबारा ना दिखाएं"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"के तौर पर अनुरोध किया जा रहा है"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"खाता जोड़ें"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टम की जानकारी"</string>
+ <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+ <skip />
+ <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+ <skip />
<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>
@@ -3599,11 +3636,12 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> सेकंड</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकंड</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> प्रतीक्षा करें"</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>
+ <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+ <skip />
<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>
@@ -3769,8 +3807,10 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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>
+ <!-- no translation found for storage_access (8905018810338984531) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for keywords_storage_access (3708874088152933579) -->
<skip />
</resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 4a38b51..41af930 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"1 sat"</item>
<item msgid="5198271470953124739">"Nikada ne istječe"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (zadano)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Loše"</item>
<item msgid="2042505933058940139">"Loša"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"Starije od 60 dana"</item>
<item msgid="5692284879054004388">"Starije od 90 dana"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Upotrijebi postavku mreže"</item>
+ <item msgid="8745603368609022803">"Mreža s ograničenim prometom"</item>
+ <item msgid="2266114985518865625">"Mreža bez ograničenja prometa"</item>
+ </string-array>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index eb9f923..82bab02 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -171,6 +171,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparivanje novog uređaja"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Uređaj se može upariti i povezati s Bluetooth uređajima"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Onemogući zvuk zvona unutar pojasne širine"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Nemoj reproducirati prilagođene melodije zvona putem Bluetooth slušalica"</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>
@@ -332,6 +334,16 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Postavi datum"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Poredaj abecedno"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Poredaj po vremenskoj zoni"</string>
+ <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+ <skip />
+ <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+ <skip />
+ <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+ <skip />
<string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
<string name="time_picker_title" msgid="483460752287255019">"Vrijeme"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Automatsko zaključavanje"</string>
@@ -350,6 +362,8 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informacije profila"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
+ <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+ <skip />
<string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Sigurnost i lokacija"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripcija i vjerodajnice"</string>
@@ -702,6 +716,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kao telefonski zvučnik"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glazbu i medije"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimalan broj povezanih Bluetooth audiouređaja"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Odaberite maksimalan broj povezanih Bluetooth audiouređaja"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Emitiranje"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogući bežični prikaz"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"U blizini nema uređaja."</string>
@@ -716,6 +732,8 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Naziv"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+ <skip />
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> želi uključiti Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> želi isključiti Wi-Fi"</string>
@@ -733,6 +751,8 @@
<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>
+ <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+ <skip />
<string name="wifi_settings_category" msgid="8719175790520448014">"Postavke Wi-Fi-ja"</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>
@@ -844,7 +864,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite mrežnu zaporku"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi mreža mobilnog operatera"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Povežite se putem mreže <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Povežite se putem mreže <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Radi poboljšanja preciznosti lokacije kao i u druge svrhe aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti pregledavanje mreže, čak i kada je Wi-Fi isključen.\n\nŽelite li to dozvoliti za sve aplikacije koje žele izvoditi pregledavanje?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Isključite putem opcije Napredno na dodatnom izborniku."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dopusti"</string>
@@ -971,6 +991,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Adresa za hitne pozive"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Upotrebljava se kao vaša lokacija kada upućujete hitne pozive putem Wi‑Fi-ja"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saznajte više"</annotation>" o značajkama privatnog DNS-a"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
<string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Glasnoća"</string>
@@ -1319,6 +1340,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Novi uređaj <xliff:g id="NAME">^1</xliff:g> funkcionira. \n\nDa biste premjestili fotografije, datoteke i podatke aplikacija na taj uređaj, otvorite Postavke > Pohrana."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Premjestite aplikaciju <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Premještanje aplikacije <xliff:g id="APP">^1</xliff:g> i njezinih podataka na uređaj <xliff:g id="NAME_0">^2</xliff:g> trajat će samo nekoliko trenutaka. Nećete moći upotrebljavati tu aplikaciju dok premještanje ne završi. \n\nNe uklanjajte uređaj <xliff:g id="NAME_1">^2</xliff:g> tijekom premještanja."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Da biste premjestili podatke, morate otključati korisnika <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Premještanje aplikacije <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ne uklanjajte uređaj <xliff:g id="NAME">^1</xliff:g> tijekom premještanja. \n\nAplikacija <xliff:g id="APP">^2</xliff:g> na ovom uređaju neće biti dostupna dok premještanje ne završi."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Otkaži premještanje"</string>
@@ -1479,6 +1501,8 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Izvori lokacije"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"O tabletnom uređaju"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"O telefonu"</string>
+ <!-- no translation found for about_settings (6717640957897546887) -->
+ <skip />
<string name="about_settings" product="emulator" msgid="221313099578564438">"O emuliranom uređaju"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Prikaži pravne informacije, status, verziju softvera"</string>
<string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
@@ -1586,6 +1610,8 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Pogledajte sve aplikacije (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Vaš tablet i osobni podaci izloženiji su napadima nepoznatih aplikacija. Instaliranjem aplikacija iz takvog izvora prihvaćate odgovornost za svu štetu nastalu na tabletu ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Vaš telefon i osobni podaci izloženiji su napadima nepoznatih aplikacija. Instaliranjem aplikacija iz takvog izvora prihvaćate odgovornost za svu štetu nastalu na telefonu ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
+ <!-- no translation found for install_all_warning (3648003301476423145) -->
+ <skip />
<string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Omogućiti više opcija postavki"</string>
<string name="application_info_label" msgid="5736524913065714880">"Info o aplikaciji"</string>
@@ -1886,6 +1912,12 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Može utjecati na izvedbu"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik kad se pokazivač zaustavi"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Odgoda prije klika"</string>
+ <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+ <skip />
+ <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+ <skip />
+ <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+ <skip />
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"UKLJUČENO"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ISKLJUČENO"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži u Brzim postavkama"</string>
@@ -2051,10 +2083,36 @@
<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="7060523369832289878">"Baterija je u dobrom stanju"</string>
<string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikacije se ponašaju na uobičajen način"</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Slaba baterija"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Baterija će se uskoro isprazniti"</string>
+ <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
<skip />
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+ <skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Intenzivna upotreba telefona"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Intenzivna upotreba tableta"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Intenzivna upotreba uređaja"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"<xliff:g id="HOUR">%1$s</xliff:g> upotrebe od zadnjeg potpunog punjenja"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Baterija se dosta ispraznila zbog intenzivne upotrebe telefona. Vaša se baterija normalno ponaša.\n\n Od zadnjeg potpunog punjenja uređaj ste upotrebljavali oko <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Ukupna upotreba:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Baterija se dosta ispraznila zbog intenzivne upotrebe tableta. Vaša se baterija normalno ponaša.\n\n Od zadnjeg potpunog punjenja uređaj ste upotrebljavali oko <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Ukupna upotreba:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Baterija se dosta ispraznila zbog intenzivne upotrebe uređaja. Vaša se baterija normalno ponaša.\n\n Od zadnjeg potpunog punjenja uređaj ste upotrebljavali oko <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Ukupna upotreba:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Pametno upravljanje baterijom"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Automatsko upravljanje baterijom"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Automatsko prilagođavanje potrošnje baterije po aplikacijama na temelju upotrebe"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Ograničene aplikacije"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d aplikacija</item>
+ <item quantity="few">%1$d aplikacije</item>
+ <item quantity="other">%1$d aplikacije</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Zaustaviti aplikaciju?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Vaš telefon ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP">%1$s</xliff:g> zadržava u aktivnom stanju.\n\nDa biste pokušali riješiti taj problem, možete zaustaviti tu aplikaciju.\n\nAko se problem ponovi, možda biste trebali deinstalirati tu aplikaciju da biste smanjili potrošnju baterije."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Vaš tablet ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP">%1$s</xliff:g> zadržava u aktivnom stanju.\n\nDa biste pokušali riješiti taj problem, možete zaustaviti tu aplikaciju.\n\nAko se problem ponovi, možda biste trebali deinstalirati tu aplikaciju da biste smanjili potrošnju baterije."</string>
@@ -2163,6 +2221,8 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Medijski poslužitelj"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizacija aplikacija"</string>
<string name="battery_saver" msgid="8172485772238572153">"Štednja baterije"</string>
+ <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+ <skip />
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Uključi automatski"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikada"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"na <xliff:g id="PERCENT">%1$s</xliff:g> baterije"</string>
@@ -2383,6 +2443,8 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Ukloniti račun?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Uklanjanjem ovog računa izbrisat će se sve njegove poruke, kontakti i ostali podaci s tabletnog računala!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Uklanjanjem ovog računa izbrisat će se sve njegove poruke, kontakti i ostali podaci s telefona!"</string>
+ <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+ <skip />
<string name="remove_account_failed" msgid="3901397272647112455">"Vaš administrator ne dopušta tu promjenu"</string>
<string name="provider_label" msgid="7724593781904508866">"Pokreni pretplate"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2913,8 +2975,8 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokiranje vizualnih ometanja"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dopusti vizualne signale"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Dodaj"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"UKLJUČI SAD"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ISKLJUČI SAD"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Uključi sada"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Odmah isključi"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Način Ne uznemiravaj uključen je do <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Način Ne uznemiravaj ostat će uključen dok ga ne isključite"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Način Ne uznemiravaj automatski je uključilo pravilo (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2953,7 +3015,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Obavijesti aplikacije"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obavijesti"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Grupa kategorija obavijesti"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Važnost"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Ponašanje"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Dopusti zvuk"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Nikad ne prikazuj obavijesti"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Bez zvučnog ili vizualnog ometanja"</string>
@@ -2971,6 +3033,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Srednja važnost"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Velika važnost"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Hitno"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Prikaži obavijesti"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Pomoćnik za obavijesti"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obavijestima"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Blokiran je pristup obavijestima radnog profila"</string>
@@ -3002,9 +3065,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne ometaj"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zatražila pristup opciji Ne ometaj"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokira prikazivanje obavijesti te aplikacije na ovom uređaju"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokira prikazivanje te kategorije obavijesti na ovom uređaju"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokira prikazivanje te grupe obavijesti na ovom uređaju"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Android na vaš zahtjev blokira prikazivanje obavijesti te aplikacije na ovom uređaju"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Android na vaš zahtjev blokira prikazivanje te kategorije obavijesti na ovom uređaju"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Android na vaš zahtjev blokira prikazivanje te grupe obavijesti na ovom uređaju"</string>
<string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Drugo"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3601,31 +3664,10 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice brzih postavki za razvojne programere"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Rado ćemo vam pomoći"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Uvijek smo tu za vas"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Uvijek smo tu za vas"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Obratite se našem timu za podršku u vezi s bilo kojom poteškoćom. Zato su tu."</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Naš tim za podršku uvijek je dostupan."</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Pretražite pomoć ili se vratite tijekom radnog vremena podrške (po lokalnom vremenu):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Radno vrijeme telefonske podrške (lokalno vrijeme)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Potražite pomoć ili istražite savjete i trikove"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Podrška za:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Putujete u inozemstvo?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Mogu se primjenjivati međunarodne naknade"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Istraži savjete i trikove"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Pretraži pomoć i pošalji povratne informacije"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Obratite se podršci"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prijava"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Ne možete se prijaviti?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Slanje informacija o sustavu"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne prikazuj ponovo"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Zahtjev šalje"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Dodaj račun"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Informacije o sustavu"</string>
+ <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+ <skip />
+ <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+ <skip />
<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>
@@ -3644,11 +3686,12 @@
<item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sekunde</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekundi</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> čekanja"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Upravljanje pohranom"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Upravitelj pohrane uklanja fotografije i videozapise s uređaja za koje je napravljena sigurnosna kopija kako bi oslobodio prostor za pohranu."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Ukloni fotografije i videozapise"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Upravitelj pohrane"</string>
+ <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+ <skip />
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatski"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Priručnik"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Oslobodi prostor odmah"</string>
@@ -3821,8 +3864,10 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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>
+ <!-- no translation found for storage_access (8905018810338984531) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for keywords_storage_access (3708874088152933579) -->
<skip />
</resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index 516d688..fb84c13 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"1 ժամ"</item>
<item msgid="5198271470953124739">"Ժամանակի սպառումը բացառել"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (կանխադրված)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Թույլ"</item>
<item msgid="2042505933058940139">"Թույլ"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"60 օրից հին"</item>
<item msgid="5692284879054004388">"90 օրից հին"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Օգտագործել ցանցի կարգավորումները"</item>
+ <item msgid="8745603368609022803">"Սահմանափակ"</item>
+ <item msgid="2266114985518865625">"Անսահմանափակ"</item>
+ </string-array>
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 1f36b25..392dba0 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ձեր սարքերը"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Նոր սարքի զուգակցում"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Թույլատրել միացումը Bluetooth սարքերին"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Անջատել ներխմբային զանգը"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Չհնչեցնել հեռախոսի հատուկ զանգերանգներ Bluetooth ականջակալներով"</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>
@@ -330,6 +332,16 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Կարգավորել ամսաթիվը"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Տեսակավորել ըստ այբուբենի"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Տեսակավորել ըստ ժամային գոտու"</string>
+ <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+ <skip />
+ <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+ <skip />
+ <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+ <skip />
<string name="date_picker_title" msgid="1338210036394128512">"Ամսաթիվ"</string>
<string name="time_picker_title" msgid="483460752287255019">"Ժամանակը"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Ինքնակողպում"</string>
@@ -348,6 +360,8 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Պրոֆիլի տեղեկություններ"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Հաշիվներ"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Տեղադրություն"</string>
+ <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+ <skip />
<string name="account_settings_title" msgid="626177544686329806">"Հաշիվներ"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Անվտանգություն & տեղադրություն"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Գաղտնագրում և մուտքի տվյալներ"</string>
@@ -691,6 +705,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Որպես բարձրախոս հեռախոս"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Երաժշտության և մեդիայի համար"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Հիշել կարգավորումները"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Թույլատրելի առավելագույն թվով միացված Bluetooth աուդիո սարքեր"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Նշեք միացված Bluetooth աուդիո սարքերի թույլատրելի առավելագույն թիվը"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Հեռարձակում"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Միացնել անլար էկրանը"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Մոտակայքում սարքեր չեն գտնվել:"</string>
@@ -705,6 +721,8 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Անուն"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 ԳՀց"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ԳՀց"</string>
+ <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+ <skip />
<string name="link_speed" msgid="8896664974117585555">"%1$d Մբ/վ"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> հավելվածը ցանկանում է միացնել Wi-Fi-ը"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> հավելվածը ցանկանում է անջատել Wi-Fi-ը"</string>
@@ -722,6 +740,8 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Միացնել Wi-Fi-ը"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+ <skip />
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi կարգավորումներ"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Կարգավորել և կառավարել անլար միացման կետերը"</string>
@@ -833,7 +853,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS-ը հասանելի է)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Մուտքագրեք ձեր ցանցի գաղտնաբառը"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Օպերատորի Wi‑Fi ցանց"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Միանալ <xliff:g id="NAME">%1%s</xliff:g>-ի միջոցով"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Միանալ <xliff:g id="NAME">%1$s</xliff:g>-ի միջոցով"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Տեղադրության ճշգրտությունը կատարելագործելու կամ այլ նպատակների համար` <xliff:g id="APP_NAME">%1$s</xliff:g>-ը ցանկանում է միացնել ցանցի սկանավորումը, նույնիսկ եթե Wi-Fi-ը անջատված է:\n\nԹույլատրե՞լ բոլոր սկանավորում ցանկացող ծրագրերին:"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Սա անջատելու համար գերբեռնված ցանկում անցեք Ընդլայնված:"</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Թույլատրել"</string>
@@ -909,10 +929,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Հաճախականությունների դիապազոն"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Թեժ կետի միջոցով ստեղծեք Wi‑Fi ցանց ձեր այլ սարքերի hամար: Թեժ կետը տրամադրում է ինտերնետային կապ բջջային ցանցի միջոցով: Կարող են կիրառվել լրացուցիչ գանձումներ։"</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Հավելվածները կարող են ստեղծել թեժ կետ՝ բովանդակությունը մոտակա սարքերին փոխանցելու համար:"</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Ավտոմատ անջատել թեժ կետը"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Wi‑Fi թեժ կետը կանջատվի, եթե որևէ սարք միացած չլինի դրան"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Թեժ կետի միացում…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Թեժ կետերը անջատվում են..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ցանցն ակտիվ է"</string>
@@ -961,6 +979,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Արտակարգ իրավիճակների հասցե"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Օգտագործվում է որպես ձեր հասցեն, երբ Wi‑Fi-ի միջոցով շտապ կանչ եք կատարում"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Մանրամասն"</annotation>" անհատական DNS սերվերի մասին"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Էկրան"</string>
<string name="sound_settings" msgid="5534671337768745343">"Ձայն"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Հնչողությունը"</string>
@@ -1308,6 +1327,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Նոր <xliff:g id="NAME">^1</xliff:g>-ն աշխատում է: \n\nԼուսանկարներ, ֆայլեր և հավելվածների տվյալներ այս սարք տեղափոխելու համար անցեք Կարգավորումներ > Տարածք:"</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Տեղափոխել <xliff:g id="APP">^1</xliff:g> հավելվածը"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> հավելվածի և նրա տվյալների տեղափոխումը <xliff:g id="NAME_0">^2</xliff:g> ընդամենը մի քանի վայրկյան կտևի: Դուք չեք կարողանա օգտագործել հավելվածը մինչև տեղափոխումը չավարտվի: \n\nՏեղափոխման ընթացքում չհեռացնեք <xliff:g id="NAME_1">^2</xliff:g>-ը:"</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Տվյալները տեղափոխելու համար արգելաբացեք <xliff:g id="APP">^1</xliff:g> օգտատիրոջը:"</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> հավելվածի տեղափոխում…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Տեղափոխման ընթացքում չհեռացնեք <xliff:g id="NAME">^1</xliff:g>-ը: \n\n<xliff:g id="APP">^2</xliff:g> հավելվածը հասանելի չի լինի մինչև տեղափոխումը չավարտվի:"</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Չեղարկել տեղափոխումը"</string>
@@ -1468,6 +1488,8 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Տեղադրության աղբյուրներ"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Պլանշետի մասին"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Հեռախոսի մասին"</string>
+ <!-- no translation found for about_settings (6717640957897546887) -->
+ <skip />
<string name="about_settings" product="emulator" msgid="221313099578564438">"Էմուլացված սարքի մասին"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Դիտել իրավական տեղեկությունները, կարգավիճակը, ծրագրի տարբերակը"</string>
<string name="legal_information" msgid="5769301644270604095">"Իրավական տեղեկատվություն"</string>
@@ -1575,6 +1597,8 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Տեսնել բոլոր <xliff:g id="COUNT">%1$d</xliff:g> հավելվածները"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ձեր պլանշետն ու անձնական տվյալներն առավել խոցելի են անհայտ հավելվածների գրոհների նկատմամբ: Տեղադրելով հավելվածներ այս աղբյուրից՝ դուք ընդունում եք, որ պատասխանատվություն եք կրում ձեր պլանշետին պատճառած ցանկացած վնասի կամ տվյալների կորստի համար, որը կարող է տեղի ունենալ դրանք օգտագործելու արդյունքում:"</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Ձեր սարքն ու անձնական տվյալներն առավել խոցելի են անհայտ հավելվածների գրոհների նկատմամբ: Տեղադրելով հավելվածներ այս աղբյուրից՝ դուք ընդունում եք, որ պատասխանատվություն եք կրում ձեր սարքին պատճառած ցանկացած վնասի կամ տվյալների կորստի համար, որը կարող է տեղի ունենալ դրանք օգտագործելու արդյունքում:"</string>
+ <!-- no translation found for install_all_warning (3648003301476423145) -->
+ <skip />
<string name="advanced_settings" msgid="1777249286757067969">"Ընդլայնված կարգավորումներ"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Միացնել այլ կարգավորման ընտրանքներ"</string>
<string name="application_info_label" msgid="5736524913065714880">"Հավելվածի մասին"</string>
@@ -1874,6 +1898,12 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Կարող է ազդել սարքի աշխատանքի վրա"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Սեղմում նշորդը կանգնելուց հետո"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Հապաղումը սեղմելուց առաջ"</string>
+ <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+ <skip />
+ <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+ <skip />
+ <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+ <skip />
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ՄԻԱՑՎԱԾ"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ԱՆՋԱՏՎԱԾ"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Ցույց տալ Արագ կարգավորումներում"</string>
@@ -2030,14 +2060,37 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Մարտկոցը գտնվում է լավ վիճակում"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Հավելվածների աշխատանքում շեղումներ չեն հայտնաբերվել"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Մարտկոցի լիցքը բավարար չէ"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Մարտկոցի լիցքը շուտով կսպառվի"</string>
+ <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
<skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+ <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+ <skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Հեռախոսը շատ է օգտագործվել"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Պլանշետը շատ է օգտագործվել"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Սարքը շատ է օգտագործվել"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Վերջին լրիվ լիցքավորումից հետո օգտագործվել է մոտավորապես <xliff:g id="HOUR">%1$s</xliff:g>"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Հեռախոսի ակտիվ օգտագործման պատճառով մարտկոցի լիցքը արագ է սպառվել։ Մարտկոցը նորմալ վիճակում է։\n\n Վերջին լրիվ լիցքավորումից հետո հեռախոսն օգտագործվել է մոտ <xliff:g id="HOUR">%1$s</xliff:g>:\n\n Ընդհանուր օգտագործումը՝"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Պլանշետի ակտիվ օգտագործման պատճառով մարտկոցի լիցքը արագ է սպառվել։ Մարտկոցը նորմալ վիճակում է։\n\n Վերջին լրիվ լիցքավորումից հետո պլանշետն օգտագործվել է մոտ <xliff:g id="HOUR">%1$s</xliff:g>:\n\n Ընդհանուր օգտագործումը՝"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Սարքի ակտիվ օգտագործման պատճառով մարտկոցի լիցքը արագ է սպառվել։ Մարտկոցը նորմալ վիճակում է։ \n\n Վերջին լրիվ լիցքավորումից հետո սարքն օգտագործվել է մոտ <xliff:g id="HOUR">%1$s</xliff:g>:\n\n Ընդհանուր օգտագործումը՝"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Մարտկոցի խելացի կառավարիչ"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Մարտկոցի ավտոմատ կառավարում"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Ավտոմատ կարգավորել հավելվածների էներգասպառումը"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Սահմանափակ հասանելիությամբ հավելվածներ"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d հավելված</item>
+ <item quantity="other">%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>
@@ -2146,6 +2199,8 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Մեդիասերվեր"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Հավելվածի օպտիմալացում"</string>
<string name="battery_saver" msgid="8172485772238572153">"Մարտկոցի տնտեսում"</string>
+ <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+ <skip />
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ավտոմատ միացնել"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Երբեք"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"մատկոցի <xliff:g id="PERCENT">%1$s</xliff:g> լիցքի դեպքում"</string>
@@ -2366,6 +2421,8 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Հեռացնե՞լ հաշիվը:"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Այս հաշիվը հեռացնելիս պլանշետից կջնջվեն նաև բոլոր հաղորդագրությունները, կոնտակտները և այլ տվյալները:"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Այս հաշվի հեռացումից հեռախոսից կջնջվեն նաև բոլոր հաղորդագրությունները, կոնտակտները և այլ տվյալները:"</string>
+ <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+ <skip />
<string name="remove_account_failed" msgid="3901397272647112455">"Ձեր ադմինիստրատորը չի թույլատրում այս փոփոխությունը"</string>
<string name="provider_label" msgid="7724593781904508866">"Ներկայացնել բաժանորդագրությունները"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
<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_add" msgid="90014394953272517">"Ավելացնել"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ՄԻԱՑՆԵԼ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ԱՆՋԱՏԵԼ"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Միացնել հիմա"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Անջատել հիմա"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"«Չանհանգստացնել» ռեժիմն ակտիվ է մինչև <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"«Չանհանգստացնել» ռեժիմն ակտիվ կլինի, մինչև այն չանջատեք"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"«Չանհանգստացնել» ռեժիմն ավտոմատ միացվել է <xliff:g id="RULE_NAME">%s</xliff:g> կանոնի կողմից"</string>
@@ -2930,7 +2987,7 @@
<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_importance_title" msgid="848692592679312666">"Կարևորություն"</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="5455049524984686275">"Առանց ձայնի և տեսողական ընդհատումների"</string>
@@ -2948,6 +3005,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Միջին կարևորություն"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"Ծանուցումների օգտագործում"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Աշխատանքային պրոֆիլի ծանուցումների մուտքն արգելափակված է"</string>
@@ -2978,10 +3036,10 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Հասանելիությունը՝ «չանհանգստացնել»"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Տեղադրված հավելվածներից ոչ մեկը Չանհանգստացնել հարցում չի ուղարկել"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Ծրագրերը բեռնվում են..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android-ն արգելափակում է այս հավելվածի ծանուցումները"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android-ն արգելափակում է ծանուցումների տվյալ կատեգորիայի ցուցադրումը"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android-ն արգելափակում է ծանուցումների տվյալ խմբի ցուցադրումը"</string>
- <string name="notification_channels" msgid="5346841743182627500">"Կարգեր"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Դուք անջատել եք այս հավելվածի ծանուցումները"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Դուք անջատել եք ծանուցումների այս կատեգորիան"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Դուք անջատել եք ծանուցումների այս խումբը"</string>
+ <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="one"><xliff:g id="COUNT_1">%d</xliff:g> կատեգորիա</item>
@@ -3559,31 +3617,10 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Կապակցված է բազմակի շարժական սարքերի"</string>
<string name="demo_mode" msgid="2798762752209330277">"Համակարգի միջերեսի ցուցադրական ռեժիմ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Մշակողի արագ կարգավորման սալիկներ"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Մեր նպատակն է օգնել ձեզ"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Մենք աշխատում ենք շուրջօրյա"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Մենք աշխատում ենք շուրջօրյա"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Մեր աջակցման թիմը կօգնի լուծել ձեր ցանկացած խնդիրը"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Մեր աջակցման թիմն աշխատում է ամեն օր, շուրջօրյա"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Դիմեք օգնության կամ նորից այցելեք աջակցման ծառայության աշխատանքային ժամերի ընթացքում (տեղային ժամանակով)՝<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Հեռախոսով աջակցում տրամադրելու ժամերը (տեղային ժամանակով)՝<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Փնտրեք օգնություն կամ ուսումնասիրեք խորհուրդներն ու հնարքները"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Աջակցություն հետևյալ երկրի համար՝"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Ուղևորվում եք երկրից դո՞ւրս:"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Միջազգային կապի համար կարող են վճարներ գանձվել"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Հեռախոս"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Զրուցել"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Ուսումնասիրել խորհուրդներն ու հնարքները"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Այցելել օգնության կենտրոն կամ կարծիք հայտնել"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Կապվել աջակցության կենտրոնի հետ"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Մուտք գործել"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Չե՞ք կարողանում մուտք գործել"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Ուղարկել համակարգի մասին տեղեկատվություն"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Այլևս ցույց չտալ"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Ուղարկող՝"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Ավելացնել հաշիվ"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Համակարգային տեղեկություններ"</string>
+ <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+ <skip />
+ <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+ <skip />
<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>
@@ -3599,11 +3636,12 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> վայրկյան</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> վայրկյան</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> սպասում"</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>
+ <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+ <skip />
<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>
@@ -3769,8 +3807,10 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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>
+ <!-- no translation found for storage_access (8905018810338984531) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for keywords_storage_access (3708874088152933579) -->
<skip />
</resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index d317a9a..564eaa9 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Tekan tombol"</item>
<item msgid="1624323946324499595">"PIN dari perangkat rekan"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 jam"</item>
<item msgid="5198271470953124739">"Tanpa waktu tunggu"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (Default)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Buruk"</item>
<item msgid="2042505933058940139">"Buruk"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Lebih dari 60 hari"</item>
<item msgid="5692284879054004388">"Lebih dari 90 hari"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Gunakan preferensi jaringan"</item>
+ <item msgid="8745603368609022803">"Perlakukan sebagai terukur"</item>
+ <item msgid="2266114985518865625">"Perlakukan sebagai belum terukur"</item>
+ </string-array>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0efa7cf..f18c617 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Perangkat Anda"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sambungkan perangkat baru"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Izinkan perangkat disambungkan dan dihubungkan ke perangkat bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Nonaktifkan dering in-band"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Jangan putar nada dering ponsel kustom pada headset Bluetooth"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Tersambung 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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Setel tanggal"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Urutkan menurut abjad"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Urutkan menurut zona waktu"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> dimulai pada <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Waktu musim panas"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Waktu standar"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Zona waktu berdasarkan wilayah"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Zona waktu dengan offset tetap"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Tanggal"</string>
<string name="time_picker_title" msgid="483460752287255019">"Waktu"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Mengunci secara otomatis"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Pesan kunci layar"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktifkan widget"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Dinonaktifkan oleh admin"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Tampilkan opsi penguncian"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Tampilkan opsi tombol power yang menonaktifkan akses diperluas dan buka kunci dengan sidik jari."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Tidak ada"</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">"Misalnya, Android Joko."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Info profil"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Akun"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Gunakan lokasi"</string>
<string name="account_settings_title" msgid="626177544686329806">"Akun"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Keamanan & lokasi"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripsi & kredensial"</string>
@@ -459,9 +469,11 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah disetel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Jika Anda menyiapkan ponsel setelah setel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Beralih metode masukan"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Setel kunci layar"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Lindungi perangkat"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Gunakan sidik jari"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Setel kunci layar untuk keamanan"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Cegah orang lain menggunakan tablet Anda"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Cegah orang lain menggunakan perangkat Anda"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Cegah orang lain menggunakan ponsel Anda"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Buka kunci dengan sidik jari"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Membuka kunci dengan sidik jari"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci layar"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Pilih kunci profil kerja"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai pengeras suara telepon"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk musik dan media"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat setelan"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Perangkat audio Bluetooth maksimum yang terhubung"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Pilih jumlah maksimum perangkat audio Bluetooth yang terhubung"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmisi"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktifkan layar nirkabel"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tidak ditemukan perangkat terdekat."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nama"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Login"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ingin mengaktifkan Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ingin menonaktifkan Wi-Fi"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Nyalakan Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Gunakan Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Setelan Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Siapkan & kelola titik akses nirkabel"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Sandi"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Tampilkan sandi"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Pilih Pita AP"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Otomatis"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Pita 2,4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Pita 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Setelan IP"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Masukkan sandi jaringan Anda"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Jaringan Wi‑Fi operator"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Sambungkan melalui <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Sambungkan melalui <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk meningkatkan ketepatan lokasi dan untuk tujuan lainnya, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan pemindaian jaringan, bahkan saat Wi-Fi sedang tidak aktif.\n\nIzinkan ini untuk semua aplikasi yang ingin memindai?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Untuk menonaktifkannya, buka Lanjutan di menu luapan."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Izinkan"</string>
@@ -909,10 +926,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pita AP"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Gunakan hotspot untuk membuat jaringan Wi‑Fi bagi perangkat Anda yang lain. Hotspot menyediakan sambungan internet menggunakan koneksi data seluler Anda. Biaya data seluler tambahan mungkin berlaku."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikasi dapat membuat hotspot untuk berbagi konten dengan perangkat di sekitar."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Nonaktifkan hotspot secara otomatis"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Hotspot Wi-Fi akan dinonaktifkan jika tidak ada perangkat yang terhubung"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Menyalakan hotspot..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Mematikan hotspot..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktif"</string>
@@ -923,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Panggilan Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Mengaktifkan Panggilan Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Gunakan Wi-Fi, alih-alih jaringan seluler"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Perluas cakupan dengan menghubungi melalui Wi-Fi"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferensi panggilan telepon"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Mode panggilan Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Preferensi roaming"</string>
@@ -961,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Alamat Darurat"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Digunakan sebagai lokasi Anda ketika Anda melakukan panggilan darurat melalui Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Pelajari lebih lanjut"</annotation>" tentang fitur DNS Pribadi"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
<string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -1175,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Jenis jaringan seluler"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Info operator"</string>
<string name="status_data_state" msgid="5503181397066522950">"Kondisi jaringan seluler"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Status layanan"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Kekuatan sinyal"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -1308,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> baru sedang bekerja. \n\nUntuk memindahkan foto, file, dan data aplikasi ke perangkat ini, buka Setelan > Pemindahan."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Pindahkan <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Pemindahan <xliff:g id="APP">^1</xliff:g> dan datanya ke <xliff:g id="NAME_0">^2</xliff:g> hanya akan berlangsung sebentar. Anda tidak akan dapat menggunakan aplikasi hingga pemindahan selesai. \n\nJangan cabut <xliff:g id="NAME_1">^2</xliff:g> selama pemindahan."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Untuk memindahkan data yang dibutuhkan guna membuka <xliff:g id="APP">^1</xliff:g> pengguna."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Memindahkan <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Jangan cabut <xliff:g id="NAME">^1</xliff:g> selama pemindahan. \n\nAplikasi <xliff:g id="APP">^2</xliff:g> di perangkat ini baru dapat tersedia jika pemindahan selesai."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Batalkan pemindahan"</string>
@@ -1360,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Jaringan, aplikasi, atau perangkat dapat disetel ulang"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Setel ulang Wi-Fi, data seluler & Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Tindakan ini akan menyetel ulang semua setelan jaringan, termasuk:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data seluler"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Setel ulang juga eSIM"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Hapus semua eSIM di ponsel. Anda harus menghubungi operator untuk mendownload ulang eSIM. Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Setel ulang setelan"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Setel ulang semua setelan jaringan? Tindakan ini tidak dapat diurungkan!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Setel ulang setelan"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Setel ulang?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Setel ulang jaringan tidak tersedia untuk pengguna ini"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Setelan jaringan telah disetel ulang"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Tidak dapat menyetel ulang eSIM"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM tidak dapat disetel ulang karena terjadi error."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Hapus semua data (reset ke setelan pabrik)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl download"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl download"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah login ke akun berikut:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Ada pengguna lain yang aktif di perangkat ini.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operator di eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk menghapus gambar, musik, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
@@ -1432,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sambungkan ke internet"</string>
<string name="location_title" msgid="1029961368397484576">"Lokasiku"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokasi untuk profil kerja"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Akurasi tinggi"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Hemat baterai"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Perangkat saja"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Lokasi nonaktif"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Izin tingkat aplikasi"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Permintaan lokasi terbaru"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Tidak ada aplikasi yang meminta lokasi baru-baru ini"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Layanan lokasi"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Penggunaan baterai tinggi"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Penggunaan baterai rendah"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode lokasi"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Menggunakan GPS, Wi-Fi, Bluetooth, atau jaringan seluler untuk menentukan lokasi"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Pakai Wi-Fi, Bluetooth, atau jaringan seluler untuk menentukan lokasi"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Gunakan sensor perangkat dan GPS untuk menentukan lokasi"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Memindai"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Pemindaian Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Meningkatkan akurasi lokasi dengan mengizinkan aplikasi dan layanan sistem untuk mendeteksi jaringan Wi-Fi kapan saja"</string>
@@ -1468,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Sumber lokasi"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Tentang tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Tentang ponsel"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Tentang perangkat"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Tentang perangkat yang diemulasi"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Lihat info legal, status, versi software"</string>
<string name="legal_information" msgid="5769301644270604095">"Informasi hukum"</string>
@@ -1575,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Lihat <xliff:g id="COUNT">%1$d</xliff:g> aplikasi semuanya"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet dan data pribadi lebih rentan terhadap serangan oleh aplikasi yang tidak dikenal. Dengan menginstal aplikasi dari sumber ini, Anda setuju bahwa Anda bertanggung jawab atas kerusakan tablet atau kehilangan data yang mungkin terjadi akibat penggunaannya."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Ponsel dan data pribadi lebih rentan terhadap serangan oleh aplikasi yang tidak dikenal. Dengan menginstal aplikasi dari sumber ini, Anda setuju bahwa Anda bertanggung jawab atas kerusakan ponsel atau kehilangan data yang mungkin terjadi akibat penggunaannya."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Perangkat dan data pribadi lebih rentan terhadap serangan oleh aplikasi yang tidak dikenal. Dengan menginstal aplikasi dari sumber ini, Anda setuju bahwa Anda bertanggung jawab atas kerusakan perangkat atau kehilangan data yang mungkin terjadi akibat penggunaannya."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Setelan lanjutan"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Aktifkan opsi setelan yang lain"</string>
<string name="application_info_label" msgid="5736524913065714880">"Info aplikasi"</string>
@@ -1854,8 +1869,8 @@
<string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Zoom in di layar"</string>
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Ketuk 3 kali untuk memperbesar"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tap tombol untuk zoom"</string>
- <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Untuk melakukan zoom"</b>", tap layar 3 kali dengan cepat.\n"<ul><li>"Seret menggunakan 2 jari atau lebih untuk men-scroll"</li>\n<li>"Cubit menggunakan 2 jari atau lebih untuk menyesuaikan zoom"</li></ul>\n\n<b>"Untuk melakukan zoom sementara"</b>", tap layar 3 kali dengan cepat dan tahan jari pada tap ke-3.\n"<ul><li>"Seret untuk memindahkan zoom ke bagian layar yang lain"</li>\n<li>"Angkat jari untuk memperkecil"</li></ul>\n\n"Anda tidak dapat memperbesar keyboard dan menu navigasi."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Jika pembesaran diaktifkan, gunakan tombol Aksesibilitas di bagian bawah layar untuk memperbesar dengan cepat.\n\n"<b>"Untuk melakukan zoom"</b>", tap tombol Aksesibilitas, kemudian tap layar di bagian mana saja.\n"<ul><li>"Seret menggunakan 2 jari atau lebih untuk men-scroll"</li>\n<li>"Cubit menggunakan 2 jari atau lebih untuk menyesuaikan zoom"</li></ul>\n\n<b>"Untuk melakukan zoom sementara"</b>", tap tombol Aksesibilitas, kemudian sentuh & tahan layar di bagian mana saja.\n"<ul><li>"Seret untuk memindahkan zoom ke bagian layar yang lain"</li>\n<li>"Angkat jari untuk memperkecil"</li></ul>\n\n"Anda tidak dapat memperbesar keyboard atau menu navigasi."</string>
+ <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Untuk melakukan zoom"</b>", tap layar 3 kali dengan cepat.\n"<ul><li>"Tarik menggunakan 2 jari atau lebih untuk men-scroll"</li>\n<li>"Cubit menggunakan 2 jari atau lebih untuk menyesuaikan zoom"</li></ul>\n\n<b>"Untuk melakukan zoom sementara"</b>", tap layar 3 kali dengan cepat dan tahan jari pada tap ke-3.\n"<ul><li>"Tarik untuk memindahkan zoom ke bagian layar yang lain"</li>\n<li>"Angkat jari untuk memperkecil"</li></ul>\n\n"Anda tidak dapat memperbesar keyboard dan menu navigasi."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Jika pembesaran diaktifkan, gunakan tombol Aksesibilitas di bagian bawah layar untuk memperbesar dengan cepat.\n\n"<b>"Untuk melakukan zoom"</b>", tap tombol Aksesibilitas, kemudian tap layar di bagian mana saja.\n"<ul><li>"Tarik menggunakan 2 jari atau lebih untuk men-scroll"</li>\n<li>"Cubit menggunakan 2 jari atau lebih untuk menyesuaikan zoom"</li></ul>\n\n<b>"Untuk melakukan zoom sementara"</b>", tap tombol Aksesibilitas, kemudian sentuh & tahan layar di bagian mana saja.\n"<ul><li>"Tarik untuk memindahkan zoom ke bagian layar yang lain"</li>\n<li>"Angkat jari untuk memperkecil"</li></ul>\n\n"Anda tidak dapat memperbesar keyboard atau menu navigasi."</string>
<string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Tombol Aksesibilitas disetel ke <xliff:g id="SERVICE">%1$s</xliff:g>. Untuk menggunakan fitur pembesaran, sentuh & tahan tombol Aksesibilitas, kemudian pilih pembesaran."</string>
<string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Pintasan tombol volume"</string>
<string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Layanan pintasan"</string>
@@ -1874,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Mungkin memengaruhi performa"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik setelah penunjuk mouse berhenti bergerak"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Keterlambatan sebelum klik"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"AKTIF"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"NONAKTIF"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Tampilkan di Setelan Cepat"</string>
@@ -1987,7 +2005,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="8618384801540759730">"Aktivitas latar belakang"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Dibatasi"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Izinkan aplikasi berjalan di latar belakang"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Aplikasi dapat berjalan di background ketika tidak digunakan"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Aktivitas background aplikasi dibatasi ketika tidak digunakan"</string>
@@ -2030,14 +2048,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Baterai dalam keadaan baik"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikasi berperilaku normal"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Kapasitas baterai rendah"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Masa pakai baterai kurang lama"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Aktifkan pengelola baterai cerdas"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Aktifkan untuk mengoptimalkan penggunaan baterai"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Aktifkan Mode Baterai Rendah"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Perpanjang masa pakai baterai"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Mode Baterai Rendah aktif"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Beberapa fitur terbatas"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Ponsel digunakan terlalu lama"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet digunakan terlalu lama"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Perangkat digunakan terlalu lama"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Sekitar <xliff:g id="HOUR">%1$s</xliff:g> digunakan sejak terakhir kali baterainya diisi penuh"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Ponsel digunakan terlalu lama sehingga menghabiskan banyak baterai. Baterai berperilaku normal.\n\n Ponsel digunakan selama sekitar <xliff:g id="HOUR">%1$s</xliff:g> sejak terahir kali baterainya diisi penuh.\n\n Penggunaan total:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Tablet digunakan terlalu lama sehingga menghabiskan banyak baterai. Baterai berperilaku normal.\n\n Tablet digunakan selama sekitar <xliff:g id="HOUR">%1$s</xliff:g> sejak terahir kali baterainya diisi penuh.\n\n Penggunaan total:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Perangkat digunakan terlalu lama sehingga menghabiskan banyak baterai. Baterai berperilaku normal.\n\n Perangkat digunakan selama sekitar <xliff:g id="HOUR">%1$s</xliff:g> sejak terakhir kali baterainya diisi penuh.\n\n Penggunaan total:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Pengelola baterai smart"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Kelola baterai secara otomatis"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Otomatis menyesuaikan penggunaan daya oleh aplikasi berdasarkan penggunaan"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Aplikasi yang dibatasi"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d aplikasi</item>
+ <item quantity="one">%1$d aplikasi</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Hentikan aplikasi?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Ponsel Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat ponsel selalu aktif.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan aplikasi.\n\nJika masalah tersebut terus berlanjut, aplikasi mungkin perlu di-uninstal untuk meningkatkan performa baterai."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tablet Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat tablet selalu aktif.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan aplikasi.\n\nJika masalah tersebut terus berlanjut, aplikasi mungkin perlu di-uninstal untuk meningkatkan performa baterai."</string>
@@ -2146,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Pengoptimalan aplikasi"</string>
<string name="battery_saver" msgid="8172485772238572153">"Penghemat Baterai"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Gunakan Penghemat Baterai"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Aktifkan secara otomatis"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Tidak pernah"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"jika <xliff:g id="PERCENT">%1$s</xliff:g> baterai"</string>
@@ -2333,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Saat ini sinkronisasi mengalami masalah. Sinkronisasi akan segera berfungsi kembali."</string>
<string name="add_account_label" msgid="7811707265834013767">"Tambahkan akun"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Profil kerja belum tersedia"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Mode kerja"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Izinkan profil kerja berfungsi, termasuk aplikasi, sinkronisasi latar belakang, dan fitur terkait"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Profil kerja"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Dikelola oleh organisasi"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Aplikasi dan notifikasi dinonaktifkan"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Buang profil kerja"</string>
<string name="background_data" msgid="5779592891375473817">"Data latar belakang"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Apl dapat menyinkronkan, mengirimkan, dan menerima data kapan saja"</string>
@@ -2366,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Hapus akun?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Menghapus akun ini akan menghapus semua pesan, kontak, dan data lain akun tersebut dari tablet!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Menghapus akun ini akan menghapus semua pesan, kontak, dan data lainnya akun tersebut dari ponsel!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Menghapus akun ini akan menghapus semua pesan, kontak, dan data lain akun tersebut dari perangkat."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Perubahan ini tidak diizinkan oleh admin"</string>
<string name="provider_label" msgid="7724593781904508866">"Langganan push"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2622,8 @@
<item quantity="other">Periksa sertifikat</item>
<item quantity="one">Periksa sertifikat</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Pengguna & profil"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Tambahkan pengguna atau profil"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Tambahkan pengguna"</string>
@@ -2774,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</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="account_dashboard_title" msgid="4936890821712178853">"Pengguna & akun"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"jangan jangan ganggu, mengganggu, gangguan, putus"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"di sekitar, lokasi, riwaya, pelaporan"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"akurasi"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"akun"</string>
<string name="keywords_users" msgid="3434190133131387942">"pembatasan, membatasi, dibatasi"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"koreksi teks, benar suara, getar otomatis, bahasa, isyarat, sarankan, saran, tema, menyinggung, kata, jenis, emoji, internasional"</string>
@@ -2872,6 +2911,7 @@
<item quantity="one">1 aturan</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Jangan Ganggu"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Aktifkan mode Jangan Ganggu"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Perilaku"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Izinkan suara dan getaran dari"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Tanpa suara"</string>
@@ -2881,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Aktifkan secara otomatis"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Aturan otomatis"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Aturan otomatis"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Setel aturan Jangan Ganggu"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Batasi suara & getaran pada waktu tertentu"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Nonaktifkan notifikasi ponsel pada waktu tertentu"</string>
+ <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"Setel aturan Jangan Ganggu"</string>
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Gunakan aturan"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Hanya untuk prioritas"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Hanya alarm"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Senyap total"</string>
@@ -2890,12 +2931,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokir gangguan visual"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Izinkan sinyal visual"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Tambahkan"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"AKTIFKAN SEKARANG"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"NONAKTIFKAN SEKARANG"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Aktifkan"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Aktifkan sekarang"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Nonaktifkan sekarang"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Mode Jangan Ganggu aktif hingga <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Mode Jangan Ganggu akan tetap aktif hingga Anda menonaktifkannya"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Mode Jangan Ganggu otomatis diaktifkan oleh aturan <xliff:g id="RULE_NAME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Mode Jangan Ganggu otomatis diaktifkan oleh aplikasi <xliff:g id="APP_NAME">%s</xliff:g>"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Hanya untuk prioritas"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Suara profil kerja"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Gunakan suara profil pribadi"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Suara profil kerja dan pribadi sama"</string>
@@ -2911,6 +2955,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Nada dering"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Suara dan getaran lain"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifikasi"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Dikirim baru-baru ini"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Lanjutan"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notifikasi kerja"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Izinkan titik notifikasi"</string>
@@ -2930,7 +2975,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Notifikasi apl"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Kategori notifikasi"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Grup kategori notifikasi"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Tingkat Kepentingan"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Perilaku"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Izinkan suara"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Jangan pernah tampilkan notifikasi"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Tidak ada gangguan suara atau visual"</string>
@@ -2948,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Tingkat kepentingan sedang"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Tingkat kepentingan tinggi"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Tingkat kepentingan darurat"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Tampilkan notifikasi"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Asisten notifikasi"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Akses notifikasi"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Akses ke notifikasi profil kerja diblokir"</string>
@@ -2978,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Akses Jangan Ganggu"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Tidak ada aplikasi terpasang yang meminta akses Jangan Ganggu"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android memblokir notifikasi aplikasi ini agar tidak muncul di perangkat ini"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android memblokir kategori notifikasi ini agar tidak muncul di perangkat ini"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android memblokir grup notifikasi ini agar tidak muncul di perangkat ini"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Sesuai permintaan, Android memblokir notifikasi aplikasi ini agar tidak muncul di perangkat ini"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Sesuai permintaan, Android kategori notifikasi ini agar tidak muncul di perangkat ini"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Sesuai permintaan, Android memblokir grup notifikasi ini agar tidak muncul di perangkat ini"</string>
<string name="notification_channels" msgid="5346841743182627500">"Kategori"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Lainnya"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Selain menggunakan sidik jari untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta sandi sebelum mulai mengaktifkan perangkat. Jika perangkat belum aktif, panggilan telepon, SMS, atau notifikasi, termasuk alarm, tidak dapat diterima.\n\nIni membantu melindungi data di perangkat yang hilang atau dicuri. Minta sandi untuk mulai mengaktifkan perangkat?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ya"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Tidak"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Ya"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Tidak"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Perlu PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Perlu pola?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Perlu sandi?"</string>
@@ -3397,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Pengguna saat ini: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Login sebagai <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> default"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"AKTIF / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"NONAKTIF"</string>
<string name="backup_disabled" msgid="485189128759595412">"Cadangan dinonaktifkan"</string>
<string name="about_summary" msgid="924181828102801010">"Diupdate ke Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3407,6 +3456,7 @@
<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="6346948990624612516">"Tidak dapat menonaktifkan backup"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Tindakan ini dinonaktifkan. Untuk mempelajari lebih lanjut, hubungi admin organisasi."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Detail selengkapnya"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Admin dapat memantau serta mengelola aplikasi dan data yang terkait dengan profil kerja, termasuk setelan, izin, akses perusahaan, aktivitas jaringan, dan informasi lokasi perangkat."</string>
@@ -3430,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Profil kerja nonaktif"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Aplikasi, sinkronisasi latar belakang, dan fitur lainnya yang terkait dengan profil kerja Anda dinonaktifkan."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Setel jadwal Cahaya Malam"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Ronai layar dengan warna coklat keemasan untuk membantu Anda tidur"</string>
+ <string name="night_display_suggestion_summary" msgid="228346372178218442">"Otomatis mewarnai layar setiap malam"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"Mode Cahaya Malam aktif"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Layar berona kuning. Mungkin dapat membantu Anda tidur."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Disarankan untuk Anda"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Saran"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"Lebih dari +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> lagi"</string>
@@ -3537,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"Tak Ada"</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>
@@ -3559,31 +3612,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Ubin developer setelan cepat"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Kami siap membantu"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Kami siap sedia di sini untuk Anda 7 x 24 jam"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Kami siap membantu Anda 7x24 jam"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Tim dukungan kami siap membantu mengatasi masalah"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Tim dukungan kami siap sedia sepanjang hari, setiap hari."</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Telusuri bantuan atau coba lagi saat jam kerja tim dukungan (waktu lokal):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Jam dukungan telepon (waktu lokal)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Telusuri bantuan atau jelajahi kiat & trik"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Dukungan untuk:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Bepergian ke luar negeri?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Mungkin dikenakan biaya internasional"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telepon"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Jelajahi kiat & trik"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Telusuri bantuan & kirim masukan"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Hubungi tim dukungan"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Masuk"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Tidak dapat masuk?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Kirim informasi sistem"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Jangan tampilkan lagi"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Meminta sebagai"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Tambahkan akun"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Informasi sistem"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Jejak Jendela"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Pelacakan Permukaan"</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>
@@ -3599,11 +3629,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> detik</item>
<item quantity="one">1 detik</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tim ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Kelola penyimpanan"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Untuk membantu mengosongkan ruang penyimpanan, pengelola penyimpanan menghapus foto dan video cadangan dari perangkat Anda."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Hapus foto & video"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Pengelola penyimpanan"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Gunakan Pengelola penyimpanan"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatis"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Kosongkan ruang sekarang"</string>
@@ -3614,32 +3644,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Beralih ke kamera"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Untuk membuka kamera dengan cepat, tekan tombol power 2 kali. Berfungsi di layar mana pun."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Buka kamera dengan cepat"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Tekan tombol power dua kali untuk membuka kamera"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Balik kamera"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Mengambil foto selfie dengan lebih cepat"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Putar ponsel dua kali untuk mode selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Putar tablet dua kali untuk mode selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Putar perangkat dua kali untuk mode selfie"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Periksa notifikasi saat layar nonaktif"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Periksa notifikasi saat layar nonaktif"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Geserkan sidik jari untuk melihat notifikasi"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Geser sidik jari"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Untuk memeriksa notifikasi, geserkan jari ke bawah pada sensor sidik jari di bagian belakang ponsel."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Untuk memeriksa notifikasi, geserkan jari ke bawah pada sensor sidik jari di bagian belakang tablet."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Untuk memeriksa notifikasi, geserkan jari ke bawah pada sensor sidik jari di bagian belakang perangkat."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Melihat notifikasi dengan lebih cepat"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Geser ke bawah pada sensor sidik jari"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Aktif"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Nonaktif"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader telah dibuka kuncinya"</string>
@@ -3769,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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">"Melacak 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="directory_access" msgid="4722237210725864244">"Akses direktori"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"akses direktori"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"Ponsel Saya"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"Tablet Saya"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"Perangkat Saya"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Akun"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nama perangkat"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Gunakan Bluetooth saat berkendara"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktifkan Bluetooth secara otomatis saat mengemudi"</string>
</resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 1d912d4..ea9a82d 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Pulsante di comando"</item>
<item msgid="1624323946324499595">"PIN del dispositivo peer"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 ora"</item>
<item msgid="5198271470953124739">"Mai in timeout"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (predefinito)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Scadente"</item>
<item msgid="2042505933058940139">"Scarsa"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Oltre 60 giorni"</item>
<item msgid="5692284879054004388">"Oltre 90 giorni"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Usa preferenza rete"</item>
+ <item msgid="8745603368609022803">"Considera misurata"</item>
+ <item msgid="2266114985518865625">"Considera non misurata"</item>
+ </string-array>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ea0e7fb..bd0b2c3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"I tuoi dispositivi"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Accoppia nuovo dispositivo"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Consenti l\'accoppiamento e la connessione del dispositivo a dispositivi Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Disattiva suoneria in banda"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Non riprodurre le suonerie del telefono personalizzate tramite gli auricolari Bluetooth"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Imposta data"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordina per nome"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordina per fuso orario"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> inizia il giorno <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Ora legale"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Ora solare"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Fuso orario per area geografica"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fusi orari con offset fisso"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
<string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Blocca automaticamente"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Messaggio schermata blocco"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Abilita widget"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disattivati dall\'amministratore"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Mostra opzione di blocco"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Visualizza l\'opzione del tasto di accensione che disattiva l\'accesso esteso e lo sblocco tramite impronta digitale."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Nessuno"</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">"Ad es. Dispositivo Android di Anna"</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informazioni profilo"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Account"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Geolocalizzazione"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Usa posizione"</string>
<string name="account_settings_title" msgid="626177544686329806">"Account"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Sicurezza e posizione"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Crittografia e credenziali"</string>
@@ -459,9 +469,11 @@
<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="8971630898700461034">"Imposta il blocco schermo"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Proteggi il tuo dispositivo"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Usa l\'impronta digitale"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Imposta il blocco schermo per sicurezza"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Impedisci ad altri di utilizzare il tuo tablet"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Impedisci ad altri di utilizzare il tuo dispositivo"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Impedisci ad altri di utilizzare il tuo telefono"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Sblocca con l\'impronta"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Sblocca il dispositivo con l\'impronta digitale"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Blocco schermo"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Scegli blocco lavoro"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Come vivavoce"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e audio media"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ricorda impostazioni"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Numero massimo di dispositivi audio Bluetooth connessi"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Seleziona il numero massimo di dispositivi audio Bluetooth connessi"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Trasmetti"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Attiva display wireless"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nessun dispositivo vicino."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Accedi"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> chiede di attivare il Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> chiede di disattivare il Wi-Fi"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Attiva Wi‑Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Utilizza Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Impostazioni Wi‑Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Configura e gestisci punti di accesso wireless"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostra password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Seleziona banda AP"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatico"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda a 2,4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda a 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Impostazioni IP"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibile)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Inserisci la password di rete"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Rete Wi‑Fi dell\'operatore"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Connettiti tramite <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Connettiti tramite <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per migliorare la precisione della posizione e per altri scopi, <xliff:g id="APP_NAME">%1$s</xliff:g> chiede di attivare la ricerca della rete, anche quando il Wi-Fi è disattivato.\n\nConsetirlo a tutte le app che vogliono eseguire la ricerca?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Per disattivare questa impostazione, vai alla sezione Avanzate nel menu extra."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Consenti"</string>
@@ -921,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"HotspotAndroid"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Chiamate Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Attiva chiamate Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Utilizza il Wi-Fi anziché la rete mobile"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Estendi la copertura telefonando tramite Wi-Fi"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferenza di chiamata"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modalità di chiamata Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Preferenze durante il roaming"</string>
@@ -959,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Indirizzo per le emergenze"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Viene considerato la tua posizione quando fai una chiamata di emergenza tramite Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Ulteriori informazioni"</annotation>" sulle funzioni DNS private"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
<string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumi"</string>
@@ -1173,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Tipo di rete cellulare"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Info operatore"</string>
<string name="status_data_state" msgid="5503181397066522950">"Stato rete cellulare"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Stato servizio"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Intensità segnale"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -1306,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"La tua nuova <xliff:g id="NAME">^1</xliff:g> è attiva. \n\nPer spostare foto, file e dati delle app su questo dispositivo, seleziona Impostazioni > Memoria."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Sposta <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Lo spostamento dell\'app <xliff:g id="APP">^1</xliff:g> e dei relativi dati sulla <xliff:g id="NAME_0">^2</xliff:g> sarà veloce. Potrai utilizzare l\'app soltanto al termine dello spostamento. \n\nNon rimuovere la <xliff:g id="NAME_1">^2</xliff:g> durante lo spostamento."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Per spostare i dati devi sbloccare l\'utente <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Spostamento dell\'app <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Non rimuovere la <xliff:g id="NAME">^1</xliff:g> durante lo spostamento. \n\nL\'app <xliff:g id="APP">^2</xliff:g> su questo dispositivo sarà disponibile soltanto al termine dello spostamento."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annulla spostamento"</string>
@@ -1358,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"È possibile reimpostare la rete, le app o il dispositivo"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Reimposta Wi-Fi, dati mobili e Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Verranno reimpostate tutte le impostazioni di rete, tra cui:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dati mobili"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Reimposta anche le eSIM"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Resetta tutte le eSIM del telefono. Dovrai contattare il tuo operatore per riscaricare le eSIM. Il tuo piano di servizio dati mobile non verrà annullato."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Reimposta"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Reimpostare tutte le impostazioni di rete? Questa azione è irreversibile."</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Reimposta impostazioni"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Reimpostare?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"La reimpostazione della rete non è disponibile per questo utente"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Le impostazioni di rete sono state reimpostate"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Impossibile reimpostare le eSIM"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Impossibile reimpostare le eSIM a causa di un errore."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Cancella tutti i dati (ripristino dati fabbrica)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Questa operazione cancellerà tutti i dati dalla "<b>"memoria interna"</b>" del tablet, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle app"</li>\n<li>"App scaricate"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Questa operazione cancellerà tutti i dati dalla "<b>"memoria interna"</b>" del telefono, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle app"</li>\n<li>"App scaricate"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Sono presenti altri utenti su questo dispositivo.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatori su eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Il tuo piano di servizio dati mobile non verrà annullato."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati della "<b>"scheda SD"</b>"."</string>
@@ -1430,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connettiti a Internet"</string>
<string name="location_title" msgid="1029961368397484576">"La mia posizione"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Posizione per profilo di lavoro"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Modalità"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisione"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Basso consumo"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Solo dispositivo"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Geolocalizzazione non attiva"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Autorizz. a livello di app"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Richieste di posizione recenti"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Nessuna applicazione ha richiesto la posizione di recente"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Servizi di geolocalizzazione"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Elevato utilizzo della batteria"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Basso utilizzo della batteria"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Modalità geolocalizzazione"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utilizza reti mobili, Bluetooth, Wi-Fi o GPS per stabilire la posizione"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utilizza reti mobili, Bluetooth o Wi-Fi per stabilire la posizione"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Utilizza il GPS e i sensori del dispositivo per stabilirne la posizione"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Ricerca"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Ricerca di reti Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Migliora la geolocalizzazione consentendo ad app e servizi di sistema di rilevare reti Wi-Fi in qualsiasi momento."</string>
@@ -1466,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Fonti di geolocalizzazione"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Informazioni sul tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Informazioni sul telefono"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Informazioni sul dispositivo"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Informazioni sul dispositivo emulato"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Visualizza informazioni legali, stato, versione del software"</string>
<string name="legal_information" msgid="5769301644270604095">"Informazioni legali"</string>
@@ -1573,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Mostra tutte le app (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Il tablet e i dati personali sono più vulnerabili agli attacchi provenienti da app sconosciute. Installando le app provenienti da questa origine, accetti di essere responsabile degli eventuali danni al tablet o della perdita di dati che potrebbero derivare dall\'utilizzo di queste app."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Il telefono e i dati personali sono più vulnerabili agli attacchi provenienti da app sconosciute. Installando le app provenienti da questa origine, accetti di essere responsabile degli eventuali danni al telefono o della perdita di dati che potrebbero derivare dall\'utilizzo di queste app."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Il dispositivo e i dati personali sono più vulnerabili agli attacchi provenienti da app sconosciute. Installando le app provenienti da questa origine, accetti di essere responsabile degli eventuali danni al dispositivo o della perdita di dati che potrebbero derivare dall\'utilizzo di queste app."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Impostazioni avanzate"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Attiva altre impostazioni"</string>
<string name="application_info_label" msgid="5736524913065714880">"Informazioni app"</string>
@@ -1872,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Potrebbe influire sulle prestazioni"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic quando puntatore si ferma"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Ritardo prima del clic"</string>
+ <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utilizza servizio"</string>
+ <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utilizza correzione colore"</string>
+ <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilizza sottotitoli"</string>
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ATTIVO"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DISATTIVATO"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Mostra in Impostazioni rapide"</string>
@@ -1985,7 +2005,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> rimanenti"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> alla ricarica"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Attività in background"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Limitata"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Consenti l\'esecuzione in background dell\'app"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Esecuzione in background consentita quando l\'app non è in uso"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Attività in background limitata quando l\'app non è in uso"</string>
@@ -2030,10 +2050,29 @@
<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="7060523369832289878">"La batteria è in buone condizioni"</string>
<string name="battery_tip_summary_summary" msgid="7832491466325707487">"Le app hanno un comportamento normale"</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Capacità della batteria in esaurimento"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La batteria non può fornire una buona durata"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Attiva gestione batteria intelligente"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Attiva per ottimizzare l\'utilizzo della batteria"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Attiva la modalità Batteria in esaurimento"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Fai durare di più la batteria"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Modalità Batteria in esaurimento attiva"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Alcune funzioni sono limitate"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefono usato in modo massiccio"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet usato in modo massiccio"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Dispositivo usato in modo massiccio"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Circa <xliff:g id="HOUR">%1$s</xliff:g> di utilizzo dall\'ultima ricarica completa"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Il telefono è stato usato in modo massiccio ed è stata consumata molta batteria. Il comportamento della batteria è normale.\n\n Il telefono è stato usato per circa <xliff:g id="HOUR">%1$s</xliff:g> dall\'ultima ricarica completa.\n\n Utilizzo totale:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Il tablet è stato usato in modo massiccio ed è stata consumata molta batteria. Il comportamento della batteria è normale.\n\n Il tablet è stato usato per circa <xliff:g id="HOUR">%1$s</xliff:g> dall\'ultima ricarica completa.\n\n Utilizzo totale:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Il dispositivo è stato usato in modo massiccio ed è stata consumata molta batteria. Il comportamento della batteria è normale.\n\n Il dispositivo è stato usato per circa <xliff:g id="HOUR">%1$s</xliff:g> dall\'ultima ricarica completa.\n\n Utilizzo totale:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gestione batteria intelligente"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Gestione automatica della batteria"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Regola automaticamente il consumo di batteria delle app in base all\'utilizzo"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"App con limitazioni"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d app</item>
+ <item quantity="one">%1$d app</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Arrestare l\'app?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Il telefono non può gestire normalmente la batteria perché l\'app <xliff:g id="APP">%1$s</xliff:g> lo mantiene attivo.\n\nProva a risolvere il problema interrompendo l\'app.\n\nSe il problema persiste, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Il tablet non può gestire normalmente la batteria perché l\'app <xliff:g id="APP">%1$s</xliff:g> lo mantiene attivo.\n\nProva a risolvere il problema interrompendo l\'app.\n\nSe il problema persiste, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
@@ -2142,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"MediaServer"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Ottimizzazione delle app"</string>
<string name="battery_saver" msgid="8172485772238572153">"Risparmio energetico"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Utilizza Risparmio energetico"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Attiva automaticamente"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Mai"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"al seguente livello di carica: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2329,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"La sincronizzazione presenta dei problemi. Riprenderà a breve."</string>
<string name="add_account_label" msgid="7811707265834013767">"Aggiungi account"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Profilo di lavoro non ancora disponibile"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Modalità Lavoro"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Attiva il profilo di lavoro, incluse app, sincronizzazione in background e funzioni correlate"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Profilo di lavoro"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Gestito dalla tua organizzazione"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Le app e le notifiche sono disattivate"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Rimuovi profilo di lavoro"</string>
<string name="background_data" msgid="5779592891375473817">"Dati in background"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Sincron., invio e ricezione dati possibili in ogni momento"</string>
@@ -2362,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Rimuovere l\'account?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"La rimozione di questo account comporterà l\'eliminazione di tutti i relativi messaggi, contatti e altri dati dal tablet."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"La rimozione di questo account comporterà l\'eliminazione di tutti i relativi messaggi, contatti e altri dati dal telefono."</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"La rimozione di questo account comporta l\'eliminazione di tutti i relativi messaggi, contatti e altri dati dal dispositivo."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Questa modifica non è consentita dall\'amministratore"</string>
<string name="provider_label" msgid="7724593781904508866">"Sottoscrizioni push"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2580,7 +2622,8 @@
<item quantity="other">Controlla i certificati</item>
<item quantity="one">Controlla il certificato</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Utenti"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Utenti e profili"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Aggiungi utente o profilo"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Aggiungi utente"</string>
@@ -2770,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Trasmetti"</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="account_dashboard_title" msgid="4936890821712178853">"Utenti e account"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2801,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"non disturbare, interrompere, interruzione, pausa"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"nelle vicinanze, posizione, cronologia, segnalazione"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"precisione"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
<string name="keywords_users" msgid="3434190133131387942">"limitazione, limitare, limitato"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"correzione del testo, correggere, suono, vibrazione, auto, lingua, gesto, suggerire, suggerimento, tema, offensivo, parola, digitazione, emoji, internazionale"</string>
@@ -2868,6 +2911,7 @@
<item quantity="one">1 regola</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Non disturbare"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Attiva Non disturbare"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportamento"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Consenti suoni/vibrazioni per"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Nessun suono"</string>
@@ -2877,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Attiva automaticamente"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Regole automatiche"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Regola automatica"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Imposta regole Non disturbare"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limita suoni e vibrazioni in determinate ore"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Disattiva la suoneria del telefono in alcuni momenti specifici"</string>
+ <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"Imposta regole Non disturbare"</string>
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Usa la regola"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Solo con priorità"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo sveglie"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silenzio totale"</string>
@@ -2886,12 +2931,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blocca interruzioni visive"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Consenti segnali visivi"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Aggiungi"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ATTIVA ORA"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DISATTIVA ORA"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Attiva"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Attiva ora"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Disattiva ora"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"La funzione Non disturbare è attiva fino alle ore <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"La funzione Non disturbare rimarrà attiva fino alla disattivazione"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"La funzione Non disturbare è stata attivata automaticamente da una regola (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"La funzione Non disturbare è stata attivata automaticamente da un\'app (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Solo con priorità"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Suoni profilo di lavoro"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Usa suoni profilo personale"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"I suoni dei profili di lavoro e personale sono gli stessi"</string>
@@ -2907,6 +2955,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Suonerie"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Altri suoni e vibrazioni"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifiche"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Inviate di recente"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avanzate"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notifiche di lavoro"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Consenti indicatori notifica"</string>
@@ -2926,7 +2975,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Notifiche app"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Categoria della notifica"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Gruppo di categorie di notifica"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importanza"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Comportamento"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Attiva audio"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Non mostrare mai notifiche"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Senza suoneria o interruzione visiva"</string>
@@ -2944,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Importanza media"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Importanza elevata"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgente"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Mostra notifiche"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Assistente notifica"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Accesso alle notifiche"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Accosso bloccato alle notifiche del profilo di lavoro"</string>
@@ -2974,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Accesso Non disturbare"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Nessuna delle app installate ha richiesto l\'accesso Non disturbare"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android sta bloccando la visualizzazione sul dispositivo delle notifiche dell\'app"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android sta bloccando la visualizzazione sul dispositivo di questa categoria di notifiche"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android sta bloccando la visualizzazione di questo gruppo di notifiche sul dispositivo in uso"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Come richiesto, Android sta bloccando la visualizzazione delle notifiche dell\'app sul dispositivo in uso"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Come richiesto, Android sta bloccando la visualizzazione di questa categoria di notifiche sul dispositivo in uso"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Come richiesto, Android sta bloccando la visualizzazione di questo gruppo di notifiche sul dispositivo in uso"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categorie"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Altro"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3121,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Oltre a usare la tua impronta digitale per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo la password prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o persi. Vuoi richiedere la password per avviare il dispositivo?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sì"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Sì"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"No"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Richiedere il PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Richiedere la sequenza?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Richiedere la password?"</string>
@@ -3251,7 +3303,7 @@
<string name="high_power_system" msgid="7362862974428225301">"Ottimizzazione della batteria non disponibile"</string>
<string name="high_power_desc" msgid="6283926163708585760">"Non applicare l\'ottimizzazione della batteria. La batteria potrebbe scaricarsi più rapidamente."</string>
<string name="high_power_prompt_title" msgid="6358673688590282655">"Consentire sempre di eseguire l\'app in background?"</string>
- <string name="high_power_prompt_body" msgid="1031422980602565049">"Consentire sempre l\'esecuzione di <xliff:g id="APP_NAME">%1$s</xliff:g> in background potrebbe ridurre la durata della batteria. \n\nPuoi cambiare più tardi da Impostazioni > App e notifiche."</string>
+ <string name="high_power_prompt_body" msgid="1031422980602565049">"Consentire sempre l\'esecuzione di <xliff:g id="APP_NAME">%1$s</xliff:g> in background potrebbe ridurre la durata della batteria. \n\nPuoi cambiare la tua scelta più tardi da Impostazioni > App e notifiche."</string>
<string name="battery_summary" msgid="8044042095190688654">"Utilizzo dall\'ultima ricarica completa: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="battery_power_management" msgid="5571519699679107523">"Gestione alimentazione"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"Nessun utilizzo della batteria dall\'ultima ricarica completa"</string>
@@ -3393,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Utente corrente: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Accesso eseguito come <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> è l\'app predefinita"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ON/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"OFF"</string>
<string name="backup_disabled" msgid="485189128759595412">"Backup disattivato"</string>
<string name="about_summary" msgid="924181828102801010">"Aggiornato ad Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3403,6 +3456,7 @@
<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="6346948990624612516">"Impossibile disattivare i backup"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Questa azione è stata disattivata. Per ulteriori informazioni, contatta l\'amministratore della tua organizzazione."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Altri dettagli"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"L\'amministratore può monitorare e gestire le app e i dati associati al profilo di lavoro, inclusi accesso aziendale, impostazioni, autorizzazioni, attività di rete e informazioni sulla posizione del dispositivo."</string>
@@ -3426,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Profilo di lavoro non attivo"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"App, sincronizzazione in background e altre funzioni relative al tuo profilo di lavoro sono disattivate."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Programma Luminosità notturna"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Imposta schermo color ambra per conciliare il sonno"</string>
+ <string name="night_display_suggestion_summary" msgid="228346372178218442">"Imposta automaticamente lo schermo color ambra 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="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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+ altri <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3533,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"Nessuno"</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>
@@ -3555,31 +3612,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Riquadri sviluppatore per impostazioni rapide"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Siamo qui per aiutarti"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Siamo a tua disposizione 24 ore su 24, 7 giorni su 7"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Siamo a tua disposizione 24 ore su 24, 7 giorni su 7"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Il nostro team di assistenza è a disposizione per risolvere qualsiasi problema"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Il nostro team di assistenza è disponibile tutto il giorno, tutti i giorni"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Cerca nella Guida o chiamaci in orario d\'ufficio (ora locale):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Orari d\'ufficio per l\'assistenza telefonica (ora locale)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Cerca nella guida o leggi i suggerimenti"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Supporto per:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Stai viaggiando all\'estero?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Potrebbero essere applicate tariffe internazionali"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefono"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Leggi i suggerimenti"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Cerca nella guida e invia feedback"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contatta l\'assistenza"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Accedi"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Non riesci ad accedere?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Invia informazioni sul sistema"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Non mostrare più"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Richiesta come"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Aggiungi account"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Informazioni di sistema"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Traccia finestra"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Acquisizione dati superficie"</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>
@@ -3595,11 +3629,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondi</item>
<item quantity="one">1 secondo</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo di attesa: <xliff:g id="ESTIMATE">%1$s</xliff:g> circa"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gestisci archiviazione"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Per liberare spazio, la gestione memoria rimuove foto e video dal dispositivo dopo averne eseguito il backup."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Rimuovi foto e video"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestione memoria"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Utilizza Gestione archiviazione"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiche"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuali"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libera spazio ora"</string>
@@ -3610,32 +3644,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Apri la fotocamera"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Per aprire velocemente la fotocamera, premi due volte il tasto di accensione da qualsiasi schermata."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Apri rapidamente la fotocamera"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Premi due volte il tasto accensione per aprire la fotocamera"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Cambia fotocamera"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Scatta selfie più rapidamente"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Ruota due volte il telefono per la modalità selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Ruota due volte il tablet per la modalità selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Ruota due volte il dispositivo per la modalità selfie"</string>
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocca due volte il telefono per controllare le notifiche"</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_suggestion_summary" msgid="5987443721392571847">"Controlla le notifiche con lo schermo spento"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Solleva il telefono per controllare le notifiche"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Controlla le notifiche con lo schermo spento"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte digitali sul retro del tablet."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte digitali sul retro del dispositivo."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Visualizza rapidamente le notifiche"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Scorri verso il basso sul sensore di impronte digitali"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"On"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Il bootloader è già sbloccato"</string>
@@ -3765,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Accesso alla directory"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"accesso alla directory"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"Il mio telefono"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"Il mio tablet"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"Il mio dispositivo"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Account"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nome dispositivo"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utilizza il Bluetooth alla guida"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Attiva il Bluetooth automaticamente durante la guida"</string>
</resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index d3ef68e..300b803 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"שעה אחת"</item>
<item msgid="5198271470953124739">"ללא זמן קצוב לתפוגה"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (ברירת מחדל)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"חלש"</item>
<item msgid="2042505933058940139">"חלשה"</item>
@@ -260,7 +274,7 @@
<item msgid="587124103118495063">"כתוב ICC SMS"</item>
<item msgid="2320577158869025503">"שנה הגדרות"</item>
<item msgid="1545733463471924009">"צייר מעל"</item>
- <item msgid="3609046903962454582">"גש אל ההתראות"</item>
+ <item msgid="3609046903962454582">"גישה אל ההודעות"</item>
<item msgid="4671646036128214513">"מצלמה"</item>
<item msgid="1097324338692486211">"הקלט אודיו"</item>
<item msgid="5031552983987798163">"הפעל את האודיו"</item>
@@ -327,7 +341,7 @@
<item msgid="4370895547001583812">"כתוב SMS/MMS"</item>
<item msgid="4218544235221631789">"שנה הגדרות"</item>
<item msgid="736541391767350377">"צייר מעל"</item>
- <item msgid="5530815681721654194">"גש אל ההתראות"</item>
+ <item msgid="5530815681721654194">"גישה אל ההודעות"</item>
<item msgid="781213371706962767">"מצלמה"</item>
<item msgid="1720492593061838172">"הקלט אודיו"</item>
<item msgid="3493046322001257041">"הפעל את האודיו"</item>
@@ -340,7 +354,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>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"בני למעלה מ-60 ימים"</item>
<item msgid="5692284879054004388">"בני למעלה מ-90 ימים"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"שימוש בהעדפות רשת"</item>
+ <item msgid="8745603368609022803">"יש להתייחס כרשת נמדדת"</item>
+ <item msgid="2266114985518865625">"יש להתייחס כרשת לא נמדדת"</item>
+ </string-array>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 91b98d0..f5c9b1f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -172,6 +172,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"המכשירים שלך"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"התאמה של מכשיר חדש"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"יש לאפשר למכשיר לבצע התאמה ולהתחבר למכשירי Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"השבתת צלצולים בערוץ ה-Bluetooth (in-band ringing)"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"השתקת רינגטונים של טלפון מותאמים אישית באוזניות Bluetooth"</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>
@@ -334,6 +336,16 @@
<string name="date_time_set_date" msgid="7021491668550232105">"הגדרת תאריך"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"מיין לפי סדר אלפביתי"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"מיין לפי אזור זמן"</string>
+ <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+ <skip />
+ <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+ <skip />
+ <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+ <skip />
<string name="date_picker_title" msgid="1338210036394128512">"תאריך"</string>
<string name="time_picker_title" msgid="483460752287255019">"שעה"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"נעילה אוטומטית"</string>
@@ -352,6 +364,8 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"פרטי פרופיל"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"חשבונות"</string>
<string name="location_settings_title" msgid="1369675479310751735">"מיקום"</string>
+ <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+ <skip />
<string name="account_settings_title" msgid="626177544686329806">"חשבונות"</string>
<string name="security_settings_title" msgid="4918904614964215087">"אבטחה ומיקום"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"הצפנה ופרטי כניסה"</string>
@@ -713,6 +727,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"כטלפון דיבורית"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"עבור מוזיקה ומדיה"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"זכור הגדרות"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"מקסימום התקני אודיו המחוברים באמצעות Bluetooth"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"בחירת מספר מקסימלי של התקני אודיו המחוברים באמצעות Bluetooth"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"הפעל תצוגת WiFi"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"לא נמצאו מכשירים בקרבת מקום."</string>
@@ -727,6 +743,8 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"שם"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+ <skip />
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> רוצה להפעיל את ה-Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> רוצה לכבות את ה-Wi-Fi"</string>
@@ -744,6 +762,8 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"הפעל את ה-Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+ <skip />
<string name="wifi_settings_category" msgid="8719175790520448014">"הגדרות Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"הגדר ונהל נקודות גישה אלחוטיות"</string>
@@ -855,7 +875,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS זמין)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"הזן את סיסמת הרשת שלך"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"רשת Wi-Fi של ספק"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"חיבור לרשת של <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"חיבור לרשת של <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי.\n\nהאם להתיר זאת עבור כל האפליקציות שרוצות לסרוק?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"כדי לכבות, עבור אל \'מתקדם\' באפשרויות הנוספות."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"כן, זה בסדר"</string>
@@ -933,10 +953,8 @@
<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_local_only" msgid="857988412470694109">"אפשר להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"כיבוי אוטומטי של נקודה לשיתוף אינטרנט"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"נקודת ה-Wi‑Fi לשיתוף אינטרנט תיכבה כשאין אף מכשיר מחובר"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"מפעיל נקודה לשיתוף אינטרנט…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"מכבה נקודה לשיתוף אינטרנט…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> פעיל"</string>
@@ -985,6 +1003,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"כתובת למקרה חירום"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"משמש כמיקומך בעת ביצוע שיחת חירום באמצעות רשת Wi-Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">""<annotation id="url">"מידע נוסף"</annotation>" על תכונות של DNS פרטי"</string>
<string name="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
<string name="sound_settings" msgid="5534671337768745343">"צלילים"</string>
<string name="all_volume_title" msgid="4296957391257836961">"עוצמות קול"</string>
@@ -994,7 +1013,7 @@
<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>
- <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"השתמש בעוצמת הקול של שיחות נכנסות להתראות"</string>
+ <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"השתמש בעוצמת הקול של שיחות נכנסות להודעות"</string>
<string name="home_work_profile_not_supported" msgid="1357721012342357037">"לא תומך בפרופילים של עבודה"</string>
<string name="notification_sound_dialog_title" msgid="3805140135741385667">"צליל ברירת מחדל להתראה"</string>
<string name="media_volume_title" msgid="3576565767317118106">"מדיה"</string>
@@ -1007,12 +1026,12 @@
<string name="haptic_feedback_enable_title" msgid="7152163068278526530">"רטט בעת הקשה"</string>
<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_ring_description" msgid="5936851631698298989">"רינגטונים והודעות"</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_ring_mute" msgid="3018992671608737202">"השתק רינגטון והודעות"</string>
<string name="volume_media_mute" msgid="3399059928695998166">"השתק מוזיקה וסוגי מדיה אחרים"</string>
- <string name="volume_notification_mute" msgid="7955193480006444159">"השתק התראות"</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>
@@ -1334,6 +1353,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ה-<xliff:g id="NAME">^1</xliff:g> החדש עובד. \n\nכדי להעביר תמונות, קבצים ונתוני אפליקציות למכשיר, עבור אל \'הגדרות\' ו\'אחסון\'."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"העברת <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"העברת <xliff:g id="APP">^1</xliff:g> והנתונים שבה אל <xliff:g id="NAME_0">^2</xliff:g> אורכת מספר דקות בלבד. לא תוכל להשתמש באפליקציה לפני השלמת ההעברה. \n\nאל תסיר את ה-<xliff:g id="NAME_1">^2</xliff:g> במהלך ההעברה."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"כדי להעביר נתונים יש לבטל את נעילת המשתמש <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"העברת <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"אל תסיר את ה-<xliff:g id="NAME">^1</xliff:g> במהלך ההעברה. \n\nהאפליקציה <xliff:g id="APP">^2</xliff:g> לא תהיה זמינה במכשיר לפני השלמת ההעברה."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ביטול העברה"</string>
@@ -1494,6 +1514,8 @@
<string name="location_sources_heading" msgid="1278732419851088319">"מקורות מיקום"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"מידע על הטאבלט"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"מידע על הטלפון"</string>
+ <!-- no translation found for about_settings (6717640957897546887) -->
+ <skip />
<string name="about_settings" product="emulator" msgid="221313099578564438">"מידע על מכשיר במדמה"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"הצג מידע משפטי, סטטוס, גרסת תוכנה"</string>
<string name="legal_information" msgid="5769301644270604095">"מידע משפטי"</string>
@@ -1601,6 +1623,8 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"הצגת כל <xliff:g id="COUNT">%1$d</xliff:g> האפליקציות"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"הטאבלט והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטאבלט או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"הטלפון והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטלפון או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
+ <!-- no translation found for install_all_warning (3648003301476423145) -->
+ <skip />
<string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"אפשר עוד אפשרויות הגדרה."</string>
<string name="application_info_label" msgid="5736524913065714880">"פרטי אפליקציות"</string>
@@ -1716,7 +1740,7 @@
<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_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>
@@ -1902,6 +1926,12 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"עשוי להשפיע על הביצועים"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"לחיצה אחרי שהמצביע מפסיק לזוז"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"השהייה לפני לחיצה"</string>
+ <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+ <skip />
+ <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+ <skip />
+ <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+ <skip />
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"מופעל"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"כבוי"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"הצג בהגדרות מהירות"</string>
@@ -1978,7 +2008,7 @@
<string name="enable_service_pin_reason" msgid="7882035264853248228">"מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את קוד הגישה שלך."</string>
<string name="enable_service_password_reason" msgid="1224075277603097951">"מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את הסיסמה שלך."</string>
<string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"זיהוי הפעולות שלך"</string>
- <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"קבל התראות כשאתה מבצע אינטראקציה עם אפליקציה."</string>
+ <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"קבל הודעות כשאתה מבצע אינטראקציה עם אפליקציה."</string>
<string name="disable_service_title" msgid="3624005212728512896">"האם לעצור את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="disable_service_message" msgid="2247101878627941561">"הקשה על \'אישור\' תפסיק את <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
<string name="accessibility_no_services_installed" msgid="7200948194639038807">"אין שירותים מותקנים"</string>
@@ -2072,14 +2102,39 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"הסוללה במצב טוב"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"האפליקציות מתנהגות באופן רגיל"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"קיבולת הסוללה נמוכה"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"הסוללה לא יכולה לספק חיי סוללה טובים"</string>
+ <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
<skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+ <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+ <skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"שימוש תובעני בטלפון"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"שימוש תובעני בטאבלט"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"שימוש תובעני במכשיר"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"שימוש של בערך <xliff:g id="HOUR">%1$s</xliff:g> מאז הטעינה האחרונה"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"צריכת האנרגיה מהסוללה הייתה גבוהה בגלל שימוש תובעני בטלפון. התנהגות הסוללה היא רגילה.\n\n השתמשת בטלפון בערך <xliff:g id="HOUR">%1$s</xliff:g> מאז הטעינה המלאה האחרונה.\n\n סך הכל שימוש:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"צריכת האנרגיה מהסוללה הייתה גבוהה בגלל שימוש תובעני בטאבלט. התנהגות הסוללה היא רגילה.\n\n השתמשת בטאבלט בערך <xliff:g id="HOUR">%1$s</xliff:g> מאז הטעינה המלאה האחרונה.\n\n סך הכל שימוש:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"צריכת האנרגיה מהסוללה הייתה גבוהה בגלל שימוש תובעני במכשיר. התנהגות הסוללה היא רגילה.\n\n השתמשת במכשיר בערך <xliff:g id="HOUR">%1$s</xliff:g> מאז הטעינה המלאה האחרונה.\n\n סך הכל שימוש:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"מנהל סוללה חכם"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"ניהול סוללה אוטומטי"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"התאמה אוטומטית של צריכת הסוללה על ידי אפליקציות, על בסיס שימוש"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"אפליקציות בשימוש מוגבל"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="two">%1$d אפליקציות</item>
+ <item quantity="many">%1$d אפליקציות</item>
+ <item quantity="other">%1$d אפליקציות</item>
+ <item quantity="one">אפליקציה אחת</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>
@@ -2188,6 +2243,8 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"אופטימיזציית אפליקציה"</string>
<string name="battery_saver" msgid="8172485772238572153">"חיסכון בסוללה"</string>
+ <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+ <skip />
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"הפעלה אוטומטית"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"אף פעם"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"סוללה ברמת טעינה של <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2408,6 +2465,8 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"להסיר את החשבון?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"הסרת חשבון זה תגרום להסרת כל ההודעות, אנשי הקשר ונתונים נוספים מהטאבלט!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"הסרת חשבון זה תגרום למחיקה של כל ההודעות, אנשי הקשר ונתונים נוספים של החשבון מהטלפון!"</string>
+ <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+ <skip />
<string name="remove_account_failed" msgid="3901397272647112455">"מנהל המכשיר אינו מתיר שינוי זה"</string>
<string name="provider_label" msgid="7724593781904508866">"מנויי Push"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2487,7 +2546,7 @@
<string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"שינויים שתבצע בחשבונות שלך באינטרנט יועתקו באופן אוטומטי לטאבלט שלך.\n\nייתכן גם שחשבונות מסוימים יעתיקו לאינטרנט באופן אוטומטי שינויים שתבצע בטלפון. חשבון Google פועל באופן זה."</string>
<string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"כל שינוי שתבצע בחשבונות שלך באינטרנט יועתק לטלפון שלך באופן אוטומטי.\n\nייתכן גם שחשבונות מסוימים יעתיקו לאינטרנט באופן אוטומטי שינויים שתבצע בטלפון. חשבון Google פועל באופן זה."</string>
<string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"האם לכבות סנכרון אוטומטי של נתונים?"</string>
- <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"פעולה זו תחסוך בשימוש בנתונים ובעוצמת סוללה, אך יהיה עליך לסנכרן כל חשבון באופן ידני על מנת לאסוף מידע עדכני. בזמן עדכונים לא יתקבלו התראות."</string>
+ <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"פעולה זו תחסוך בשימוש בנתונים ובעוצמת סוללה, אך יהיה עליך לסנכרן כל חשבון באופן ידני על מנת לאסוף מידע עדכני. בזמן עדכונים לא יתקבלו הודעות."</string>
<string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"תאריך איפוס של מחזור שימוש"</string>
<string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"תאריך בכל חודש:"</string>
<string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"הגדר"</string>
@@ -2723,7 +2782,7 @@
<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>
- <string name="app_notifications_switch_label" msgid="9124072219553687583">"הצג התראות"</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="user_account_title" msgid="1127193807312271167">"חשבון לתוכן"</string>
@@ -2946,8 +3005,8 @@
<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_add" msgid="90014394953272517">"הוספה"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"יש להפעיל עכשיו"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"יש לכבות עכשיו"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"הפעלה עכשיו"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"כיבוי עכשיו"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"המצב \'נא לא להפריע\' מופעל עד <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"המצב \'נא לא להפריע\' ימשיך לפעול עד שתכבו אותו"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"המצב \'נא לא להפריע\' הופעל אוטומטית על ידי הכלל <xliff:g id="RULE_NAME">%s</xliff:g>"</string>
@@ -2986,7 +3045,7 @@
<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_importance_title" msgid="848692592679312666">"חשיבות"</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="5455049524984686275">"ללא צליל וללא הפרעה ויזואלית"</string>
@@ -3004,10 +3063,11 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"חשיבות בינונית"</string>
<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="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>
+ <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"אפליקציות לא יכולות לקרוא הודעות"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
<item quantity="two">%d אפליקציות יכולות לקרוא הודעות</item>
<item quantity="many">%d אפליקציות יכולות לקרוא הודעות</item>
@@ -3036,9 +3096,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"גישה אל \'נא לא להפריע\'"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"אין אפליקציות מותקנות שביקשו גישה אל \'נא לא להפריע\'"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"מערכת Android לא מאפשרת להודעות מהאפליקציה הזאת להופיע במסך"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"מערכת Android לא מאפשרת להודעות מהקטגוריה הזאת להופיע במסך"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"מערכת Android לא מאפשרת להודעות מהקבוצה הזאת להופיע במכשיר הזה"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"לבקשתך, מערכת Android חוסמת במכשיר זה הצגת הודעות מאפליקציה זו"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"לבקשתך, מערכת Android חוסמת במכשיר הצגה של קטגוריית הודעות זו"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"לבקשתך, מערכת Android חוסמת במכשיר הצגה של מקבץ הודעות זה"</string>
<string name="notification_channels" msgid="5346841743182627500">"קטגוריות"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"אחר"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3047,7 +3107,7 @@
<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="no_channels" msgid="3077375508177744586">"האפליקציה הזו לא שלחה הודעות"</string>
<string name="app_settings_link" msgid="8894946007543660906">"הגדרות נוספות באפליקציה"</string>
<string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"מופעל עבור כל האפליקציות"</string>
<plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
@@ -3190,7 +3250,7 @@
<string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ניתן להגביר את ההגנה על המכשיר על ידי דרישה להזנת סיסמה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש סיסמה כדי להפעיל את המכשיר?"</string>
<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>
+ <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"כדי לשפר את רמת האבטחה של המכשיר בנוסף לביטול הנעילה באמצעות טביעת אצבע, תוכל להגדיר את המכשיר כך שתידרש להזין סיסמה לפני הפעלתו. עד להפעלה של המכשיר, לא ניתן לקבל שיחות, הודעות או הודעות.\n\nכך, תוכל להגן על הנתונים אם המכשיר ייגנב או יאבד. לדרוש סיסמה להפעלת המכשיר?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"כן"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"לא"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"לדרוש קוד גישה?"</string>
@@ -3653,31 +3713,10 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"מחובר לכמה התקנים"</string>
<string name="demo_mode" msgid="2798762752209330277">"מצב הדגמה בממשק המשתמש של המערכת"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"משבצות מפתח להגדרות מהירות"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"אנחנו כאן לשירותך"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"אנחנו כאן בשבילך, 24 שעות ביממה"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"אנחנו כאן בשבילך, 24 שעות ביממה"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"צוות התמיכה שלנו נמצא כאן כדי לעזור בטיפול בכל בעיה"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"צוות התמיכה שלנו זמין כל היום, בכל יום"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"חפש עזרה או חזור במהלך שעות התמיכה (זמן מקומי):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"שעות הפעילות של התמיכה הטלפונית (זמן מקומי)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"יש לנו טיפים מעולים בשבילך"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"תמיכה עבור:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"נוסע לחו\"ל?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"ייתכנו חיובים בינלאומיים"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"טלפון"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"צ\'אט"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"טיפים וטריקים מעולים"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"חפש בנושאי העזרה ושלח משוב"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"יצירת קשר עם התמיכה"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"כניסה"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"לא מצליח להיכנס?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"שליחת פרטי מערכת"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"אל תציג שוב"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"מבקש בשם"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"הוספת חשבון"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"נתוני מערכת"</string>
+ <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+ <skip />
+ <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+ <skip />
<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>
@@ -3699,11 +3738,12 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> שניות</item>
<item quantity="one">שנייה אחת</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"המתנה של ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</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>
+ <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+ <skip />
<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>
@@ -3725,20 +3765,20 @@
<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_suggestion_summary" msgid="5987443721392571847">"בדיקת התראות כשהמסך כבוי"</string>
+ <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"בדיקת הודעות כשהמסך כבוי"</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_pickup_suggestion_summary" msgid="7014700589991761035">"בדיקת התראות כשהמסך כבוי"</string>
+ <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"בדיקת הודעות כשהמסך כבוי"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"כדי לבדוק הודעות יש להחליק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של המכשיר."</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"הצגת התראות במהירות"</string>
+ <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"הצגת הודעות במהירות"</string>
<string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"החלקה למטה על חיישן טביעות האצבע"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"פועל"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"כבוי"</string>
@@ -3883,8 +3923,10 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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>
+ <!-- no translation found for storage_access (8905018810338984531) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for keywords_storage_access (3708874088152933579) -->
<skip />
</resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index b5707f2..069e988 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Итеру түймесі"</item>
<item msgid="1624323946324499595">"Басқа құрылғының PIN коды"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 сағат"</item>
<item msgid="5198271470953124739">"Ешқашан"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (әдепкі)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Нашар"</item>
<item msgid="2042505933058940139">"Нашар"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 күн бұрын"</item>
<item msgid="5692284879054004388">"90 күн бұрын"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Желі параметрін пайдалану"</item>
+ <item msgid="8745603368609022803">"Шектеулі"</item>
+ <item msgid="2266114985518865625">"Шектеусіз"</item>
+ </string-array>
</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 1e1ac01..f992502 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Құрылғыларыңыз"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңа құрылғымен жұптастыру"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Құрылғыға жұптауға және Bluetooth құрылғыларына қосылуға рұқсат беру"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Жолақ ішілік қоңырау әуенін өшіру"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Bluetooth гарнитураларында арнаулы телефон рингтондарын ойнатпау"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Күнді реттеу"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Әліппе бойынша сұрыптау"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Уақыт белдеуі бойынша сұрыптау"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> күні өзгереді."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Жазғы уақыт"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Қысқы уақыт"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Аймақ бойынша уақыт белдеуі"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Уақыт белдеуінің тұрақты ығысуы"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Күн-айы"</string>
<string name="time_picker_title" msgid="483460752287255019">"Уақыт"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Aвтоматты құлыптау"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Құлып экраны хабары"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Виджеттерді қосу"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Әкімші өшірген"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Құлыптау опциясын көрсету"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Кеңейтілген кіру мүмкіндігі мен саусақ ізімен құлыпты ашу функциясын өшіретін қуат түймесі опциясын көрсету."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ешқандай"</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">"Мысалы, Джоның Android құрылғысы."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Профильдік ақпарат"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Есептік жазбалар"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлау және тіркелу деректері"</string>
@@ -459,9 +469,11 @@
<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="8971630898700461034">"Экран құлпын орнату"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Құрылғыны қорғау"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Саусақ ізін пайдалану"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Қауіпсіздік үшін құлып орнатыңыз"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Планшетті сіздің рұқсатыңызсыз басқалардың пайдалануына жол бермеңіз"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Құрылғыны сіздің рұқсатыңызсыз басқалардың пайдалануына жол бермеңіз"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Телефонды сіздің рұқсатыңызсыз басқалардың пайдалануына жол бермеңіз"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Саусақ ізімен құлыпты ашу"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Саусақ ізімен құлыпты ашу"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Экран құлпын таңдау"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Жұмыс құлпын таңдау"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Үндеткіш телефоны ретінде"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Музыка және медиа үшін"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Параметрлерді есте сақтау"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Байланыстырылған Bluetooth аудиоқұрылғылардың максималды саны"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Байланыстырылған Bluetooth аудиоқұрылғылардың максималды санын таңдау"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Трансляция"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Сымсыз дисплейді қосу"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Маңайдан құрылғылар табылмады"</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Атауы"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 ГГц"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ГГц"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Кіру"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Мб/с"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi желісінің қосылуын сұрайды"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi желісінің өшірілуін сұрайды"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi қосу"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fi пайдалану"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi параметрлері"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Сымсыз қол жетімділік нүктесін орнату және басқару"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Құпия сөз"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Кілтсөзді көрсету"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi жиілік ауқымын таңдау"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Авто"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 ГГц диапазоны"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 ГГц диапазоны"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP параметрлері"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS қол жетімді)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Желі құпия сөзін енгізіңіз"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Оператордың Wi‑Fi желісі"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> арқылы қосу"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> арқылы қосу"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Аймақ нақтылығын жақсарту және басқа мақсаттар үшін, <xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы желі тексеруді қосуды қалайды, Wi-Fi өшіріліп тұрса да.\n\nЖелі тексергісі келетеін барлық қолданбаларға рұқсат берілсін бе?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Мұны өшіру үшін артылған мазмұндар мәзірінде «Кеңейтілген» тармағына өтіңіз."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Рұқсат беру"</string>
@@ -909,10 +926,8 @@
<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_local_only" msgid="857988412470694109">"Қолданбалар мазмұнды маңайдағы құрылғылармен бөлісу үшін хоспот жасай алады."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Хотспотты автоматты өшіру"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Wi‑Fi хотспотына ешқандай құрылғы қосылмаса, ол өшеді"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Хотспот қосылуда…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Хотспот өшірілуде…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> қосулы"</string>
@@ -923,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android хот-споты"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi қоңыраулары"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi қоңырауларын қосу"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Мобильді желі орнына Wi-Fi желісін пайдалану"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"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_roaming_mode_title" msgid="1565039047187685115">"Роуминг параметрі"</string>
@@ -961,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Төтенше жағдайда пайдаланылатын мекенжай"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi арқылы жедел қызметке қоңырау шалғанда орналасқан орныңыз ретінде пайдаланылады"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"Жеке DNS функциялары туралы "<annotation id="url">"толығырақ"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
<string name="sound_settings" msgid="5534671337768745343">"Дыбыс"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Дыбыс қаттылығы"</string>
@@ -1175,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Ұялы желі түрі"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Oператор туралы ақпарат"</string>
<string name="status_data_state" msgid="5503181397066522950">"Ұялы желі күйі"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Қызмет күйі"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Сигнал қуаты"</string>
<string name="status_roaming" msgid="2638800467430913403">"Роуминг"</string>
@@ -1308,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Жаңа <xliff:g id="NAME">^1</xliff:g> жұмыс істеп тұр. \n\nФотосуреттерді, файлдарды және қолданба деректерін осы құрылғыға аудару үшін Параметрлер > Жад тармағына өтіңіз."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> қолданбасын аудару"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> және оның деректерін <xliff:g id="NAME_0">^2</xliff:g> құрылғысына аударуға көп уақыт кетпейді. Деректер аударылып болмайынша, қолданба пайдаланылмайды. \n\nАудару барысында <xliff:g id="NAME_1">^2</xliff:g> ұясынан шығарылмауы керек."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Деректерді тасымалдау үшін <xliff:g id="APP">^1</xliff:g> пайдаланушысының құлпын ашу керек."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> аударылуда…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Аудару барысында <xliff:g id="NAME">^1</xliff:g> ұясынан шығарылмауы керек. \n\nОсы құрылғыдағы <xliff:g id="APP">^2</xliff:g> аударылып біткенше істемей тұрады."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Аударудан бас тарту"</string>
@@ -1360,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Желіні, қолданбаны не құрылғыны бастапқы күйіне қайтаруға болады"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, мобильдік деректер және Bluetooth параметрлерін бастапқы күйіне қайтару"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Мұның нәтижесінде барлық желі параметрлері бастапқы күйіне қайтарылады, соның ішінде:\n\n"<li>"Wi‑Fi"</li>\n<li>"мобильдік деректер"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Сонымен қатар eSIM карталарының деректерін қайтару"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Телефондағы барлық eSIM картасындағы деректер өшіріледі. eSIM карталарындағы деректерді қайта жүктеп алу үшін оператормен хабарласуыңыз қажет. Мобильдік қызмет жоспары бұрынғы қалпында қалады."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Параметрлерді қалпына келтіру"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Барлық желі параметрлері қалпына келтірілсін бе? Бұл әрекетті кері қайтару мүмкін емес!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Параметрлерді қалпына келтіру"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Қалпына келтіру қажет пе?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Бұл пайдаланушы желіні қалпына келтіре алмайды"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Желі параметрлері қалпына келтірілген"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM карталарының деректері қайтарылмайды"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Қате пайда болғандықтан, eSIM карталарының деректері қайтарылмайды."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</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>"Mузыка"</li>\n<li>"Фотосуреттер"</li>\n<li>"Басқа пайдаланушы деректері"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM картасының операторлары"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM карталары"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Мұның нәтижесінде мобильдік қызмет жоспарыңыздан бас тартылмайды."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Музыка, фотосуреттер және басқа деректерді өшіру үшін, "<b>"USB жадын"</b>" өшіру қажет."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Музыка, фотосуреттер және басқа пайдаланушы деректерін тазалау үшін "<b>"SD картасы"</b>" өшірілуі тиіс."</string>
@@ -1432,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Интернетке қосылыңыз"</string>
<string name="location_title" msgid="1029961368397484576">"Mенің аймағым"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Жұмыс профилінің орны"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Жоғары дәлдік"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Батарея үнемдеу"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Құрылғы ғана"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Орын өшірулі"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Қолданба деңгейіндегі рұқсаттар"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Соңғы аймақ өтініштері"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Жуықта ешқандай қолданба аймақ туралы өтініш жасамаған"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Орын қызметтері"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Жоғары деңгейде батарея қолдану"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Батарея шығыны аз"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Орын режимі"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Орынды анықтау үшін GPS, Wi‑Fi, Bluetooth немесе мобильдік желілерді пайдалану"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Орынды анықтау үшін Wi‑Fi, Bluetooth немесе мобильдік желілерді пайдалану"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Орынды анықтау үшін GPS және құрылғы датчиктерін пайдалану"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Тексеруде"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi іздеу"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Орын дәлірек анықталуы үшін жүйелік қолданбаларға және қызметтерге Wi‑Fi желілерін толассыз іздеп отыруға рұқсат етіңіз."</string>
@@ -1468,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Орын дереккөздері"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"Заңнамалық ақпарат, күйін, бағдарлама нұсқасын қарау"</string>
<string name="legal_information" msgid="5769301644270604095">"Заңнамалық ақпараттар"</string>
@@ -1575,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Барлық <xliff:g id="COUNT">%1$d</xliff:g> қолданбаны көру"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Планшет және жеке деректер белгісіз қолданбалар шабуылына ұшырауы мүмкін. Бұл қолданбаларды пайдалану нәтижесінде телефонға келетін залалға немесе деректердің жоғалуына өзіңіз ғана жауапты боласыз."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефон және жеке деректер белгісіз қолданбалар шабуылына ұшырауы мүмкін. Бұл қолданбаларды пайдалану нәтижесінде телефонға келетін залалға немесе деректердің жоғалуына өзіңіз ғана жауапты боласыз."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Құрылғыңыз және жеке деректеріңіз белгісіз қолданбалар шабуылына ұшырауы мүмкін. Осы көзден орнатып алған қолданбаларды пайдалану салдарынан құрылғыға келген залал не дерек жоғалту жағдайларына өзіңіз ғана жауапты боласыз."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Қосымша параметрлер"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Басқа параметр опцияларын қосу"</string>
<string name="application_info_label" msgid="5736524913065714880">"Қолданба ақпараты"</string>
@@ -1874,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Жұмыс өнімділігіне әсерін тигізуі мүмкін"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Меңзер тоқтағаннан кейін басу"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Басу алдындағы кешігу"</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_summary_state_enabled" msgid="8359913912320966304">"ҚОСУЛЫ"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ӨШІРУЛІ"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Жылдам параметрлер арқылы көрсету"</string>
@@ -1987,7 +2005,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> қалды"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"Зарядталғанша <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Фондық режимдегі әрекет"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Шектелген"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Қолданбаға фондық режимде іске қосылуға рұқсат беру"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Қолданба пайдаланылмайтын кезде фондық режимде жұмыс істей алады"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Қолданба пайдаланылмайтын кезде, ол фондық режимде шектеулі жұмыс істейді"</string>
@@ -2030,14 +2048,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батарея жақсы күйде"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Қолданбалар қалыпты жұмыс істеп тұр"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Батарея заряды аз қалды"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Батарея заряды ұзаққа жетпейді"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Ақылды батарея менеджерін қосыңыз"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Батарея қолданысын оңтайландыру үшін қосыңыз"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Батареяны аз пайдалану режимін қосыңыз"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Батареяның қызмет көрсету мерзімін ұзартыңыз"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Батареяны аз пайдалану режимі қосулы"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Кейбір функциялар шектеулі"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Телефон ұзақ пайдаланылды"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Планшет ұзақ пайдаланылды"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Құрылғы ұзақ пайдаланылды"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Соңғы толық зарядталғаннан бері шамамен <xliff:g id="HOUR">%1$s</xliff:g> сағат пайдаланылды"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Телефоныңыз ұзақ пайдаланылды және оған көп батарея заряды кетті. Батерея қалыпты күйде.\n\n Соңғы толық зарядталғаннан бері телефоныңыз шамамен <xliff:g id="HOUR">%1$s</xliff:g> сағат пайдаланылды.\n\n Жалпы пайдалануы:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Планшетіңіз ұзақ пайдаланылды және оған көп батарея заряды кетті. Батерея қалыпты күйде.\n\n Соңғы толық зарядталғаннан бері планшетіңіз шамамен <xliff:g id="HOUR">%1$s</xliff:g> сағат пайдаланылды.\n\n Жалпы пайдалануы:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Құрылғыңыз ұзақ пайдаланылды және оған көп батарея заряды кетті. Батерея қалыпты күйде.\n\n Соңғы толық зарядталғаннан бері құрылғыңыз шамамен <xliff:g id="HOUR">%1$s</xliff:g> сағат пайдаланылды. \n\n Жалпы пайдаланылуы:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Ақылды батарея басқарушысы"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Батареяны автоматты басқару"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Қолданбалардың пайдалануы негізінде қуат тұтынуды автоматты реттеу"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Тыйым салынған қолданбалар"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d қолданба</item>
+ <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>
@@ -2146,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Meдиасервері"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Қолданбаны оңтайландыру"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"\"Battery Saver\" функциясын пайдалану"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Автоматты түрде қосу"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Ешқашан"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"батарея заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда"</string>
@@ -2333,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Синх мәселесі орын алуда. Біраз уақыттан кейін оралады."</string>
<string name="add_account_label" msgid="7811707265834013767">"Есептік жазба қосу"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Жұмыс профилі әлі қол жетімді емес"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Жұмыс режимі"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Жұмыс профиліне, соның ішінде, қолданбаларға, фондық синхрондауға және қатысты мүмкіндіктерге жұмыс істеуге рұқсат ету"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Жұмыс профилі"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Ұйым арқылы басқарылады"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Қолданбалар мен хабарландырулар өшірулі"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Жұмыс профилін жою"</string>
<string name="background_data" msgid="5779592891375473817">"Жалпы мағлұматтар дерекқоры"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Қолданбалар деректерді синхрондау, жіберу жұмыстарын орындайды және кез келген уақытта қабылдай алады."</string>
@@ -2366,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Есептік жазба алынсын ба?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Бұл есептік жазбаны алып тастау нәтижесінде оның хабарлары, контактілері және басқа планшет деректері жойылады!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Бұл есептік жазбаны алып тастаса, телефоннан барлық хабарлар, контактілер мен басқа деректер жойылады!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Бұл есептік жазба жойылса, құрылғыдағы барлық хабарлар, контактілер және басқа деректер қоса жойылады!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Әкімші бұл өзгертуге рұқсат бермеген"</string>
<string name="provider_label" msgid="7724593781904508866">"Итеру жазылымдары"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2622,8 @@
<item quantity="other">Сертификаттарға құсбелгі қою</item>
<item quantity="one">Сертификатқа құлбелгі қою</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Пайдаланушылар"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Пайдаланушылар мен профайлдар"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Пайдаланушы немесе профиль қосу"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Пайдаланушы қосу"</string>
@@ -2774,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Қолданбалар мен хабарландырулар"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Рұқсаттар, әдепкі қолданбалар"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"Пайдаланушылар мен есептік жазбалар"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"мазаламау үзу, үзу, үзіліс"</string>
<string name="keywords_app" msgid="6334757056536837791">"ЖЖҚ"</string>
<string name="keywords_location" msgid="6615286961552714686">"маңайдағы, орын, тарих, есептер"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"дәлдік"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"есептік жазба"</string>
<string name="keywords_users" msgid="3434190133131387942">"шектеу, шектелген"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"мәтінді түзету, түзету, дыбыс, дірілдету, авто, тіл, қимыл, ұсыну, ұсыныс, тақырып, тіл тигізетін, сөз, түрі, эмодзи, халықаралық"</string>
@@ -2872,6 +2911,7 @@
<item quantity="one">1 ереже</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Мазаламау"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"\"Мазаламау\" режимін қосу"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Мінез-құлық"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Келесіден шыққан дыбыстар мен дірілдерге рұқсат беру"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Дыбыссыз"</string>
@@ -2881,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Автоматты түрде қосу"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Автоматты ережелер"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Автоматты ереже"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\"Мазаламау\" ережесін орнату"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Белгілі бір уақытта дыбысты және дірілді шектеу"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Телефонды дыбыссыз режимге қою"</string>
+ <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_no_interruptions" msgid="8107126344850276878">"Толық тыныштық"</string>
@@ -2890,12 +2931,15 @@
<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_add" msgid="90014394953272517">"Қосу"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ҚАЗІР ҚОСУ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ҚАЗІР ӨШІРУ"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Қосу"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Қазір қосу"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Қазір өшіру"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"\"Мазаламау\" режимі <xliff:g id="FORMATTED_TIME">%s</xliff:g> дейін қосулы болады"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"\"Мазаламау\" режимі өшірілгенше қосулы болады"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"\"Мазаламау\" режимі \"<xliff:g id="RULE_NAME">%s</xliff:g>\" ережесі арқылы автоматты түрде қосылды"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"\"Мазаламау\" режимі <xliff:g id="APP_NAME">%s</xliff:g> қолданбасы арқылы автоматты түрде қосылды"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Маңыздылары ғана"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2955,7 @@
<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="recent_notifications" msgid="5660639387705060156">"Жақында жіберілді"</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>
@@ -2930,7 +2975,7 @@
<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_importance_title" msgid="848692592679312666">"Маңыздылық"</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="5455049524984686275">"Дыбыссыз және визуалдық кедергісіз"</string>
@@ -2948,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Орташа маңыздылық"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"Хабарландыруға кіру мүмкіндігі"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Жұмыс профилінің хабарландыруларына кіру бөгелген"</string>
@@ -2978,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Мазаламау режиміне кіру"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Орнатылған қолданбалардың ешбірі Мазаламау режиміне кіруге рұқсат сұрамады"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Қолданбаларды жүктеу…"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android қолданба хабарландыруларының құрылғыда шығуын бөгейді."</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android хабарландырулардың осы санатының құрылғыда шығуын бөгейді"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android хабарландырулардың осы тобының құрылғыда шығуын бөгейді"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Сұрауыңыз бойынша Android бұл құрылғыда мұндай қолданба хабарландыруларының шығуын бөгеуде"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Сұрауыңыз бойынша Android бұл құрылғыда мұндай санаттағы хабарландыруларды бөгейді"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Сұрауыңыз бойынша Android бұл құрылғыда мұндай хабарландырулар тобын бөгейді"</string>
<string name="notification_channels" msgid="5346841743182627500">"Санаттар"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Басқа"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Құрылғы құлпын ашу үшін саусақ ізін пайдаланумен бірге, іске қосардың алдында құпия сөз талап ету арқылы оны қорғай аласыз. Құрылғы іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды.\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="1793719723017395175">"Иә"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Жоқ"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN коды қажет пе?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Өрнек қажет пе?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Құпия сөз қажет пе?"</string>
@@ -3254,7 +3302,7 @@
<string name="high_power_off" msgid="3393904131961263278">"Батареяны пайдалануды оңтайландыру"</string>
<string name="high_power_system" msgid="7362862974428225301">"Батареяны оңтайландыру мүмкіндігі жоқ"</string>
<string name="high_power_desc" msgid="6283926163708585760">"Батареяны оңтайландыруды қолданбаңыз. Батарея заряды тезірек таусылуы мүмкін."</string>
- <string name="high_power_prompt_title" msgid="6358673688590282655">"Қолданбаның үнемі фондық режимде жұмыс істеуіне рұқсат ету керек пе?"</string>
+ <string name="high_power_prompt_title" msgid="6358673688590282655">"Қолданба үнемі фондық режимде істей берсін бе?"</string>
<string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасына үнемі фондық режимде жұмыс істеуіне рұқсат ету батареяны пайдалану уақытын қысқартуы мүмкін. \n\nОны кейін \"Параметрлер\" > \"Қолданбалар және хабарландырулар\" ішінен өзгерте аласыз."</string>
<string name="battery_summary" msgid="8044042095190688654">"Соңғы толық зарядталғаннан бері <xliff:g id="PERCENTAGE">%1$s</xliff:g> пайдаланылды"</string>
<string name="battery_power_management" msgid="5571519699679107523">"Қуат басқару"</string>
@@ -3397,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Ағымдағы пайдаланушы: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> болып кірдіңіз"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> әдепкі болып табылады"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ҚОСУЛЫ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ӨШІРУЛІ"</string>
<string name="backup_disabled" msgid="485189128759595412">"Сақтық көшірме жасау өшірілген"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> нұсқасына жаңартылған"</string>
@@ -3407,6 +3456,7 @@
<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="6346948990624612516">"Сақтық көшірме өшірілмейді"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Бұл әрекет өшірулі. Толығырақ ақпарат алу үшін, ұйым әкімшісіне хабарласыңыз."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Қосымша мәліметтер"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Әкімші қолданбаларды және жұмыс профиліңізбен байланысты деректерді, соның ішінде, параметрлерді, рұқсаттарды, корпоративтік кіру рұқсаттарын, желілік белсенділікті және құрылғының орны туралы ақпаратты бақылай және басқара алады."</string>
@@ -3430,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Жұмыс профилі өшірулі"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Қолданбалар, фондық синхрондау және жұмыс профиліңізге қатысты басқа мүмкіндіктер өшіріледі."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"\"Түнгі жарық\" кестесін орнату"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Жылдам ұйықтап кету үшін экранға ашық сары реңк беріңіз"</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="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>
<string name="suggestions_more_title" msgid="8223690393059519879">"тағы +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3537,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"Ешқайсысы"</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>
@@ -3559,31 +3612,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Түрлі құрылғыларға қосылған"</string>
<string name="demo_mode" msgid="2798762752209330277">"Жүйе интерфейсінің демо режимі"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Әзірлеуші блоктарының жылдам параметрлері"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Көмектесуге әрқашан дайынбыз"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Біз сізге аптасына 7 күн 24 сағат бойы көмек көрсетуге дайынбыз"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Біз тәулік бойы демалыссыз жұмыс істейміз"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Қолдау қызметі кез келген мәселе бойынша көмектесуге дайын"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Біздің қолдау көрсету ұжымы кез келген күні тәулік бойы қызмет көрсетуге дайын"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Анықтамадан іздеп көріңіз немесе жұмыс уақыты (жергілікті уақыт) кезінде хабарласыңыз:<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Телефон қоңыраулары қабылданатын кез (жергілікті уақыт)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Іздеу анықтамасы немесе зерттеу кеңестері және тәсілдері"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Қолдау:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Шетелде саяхаттап жүрсіз бе?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Халықаралық төлем алынуы мүмкін"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Чат"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Зерттеу кеңестері және тәсілдері"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Анықтама іздеу және пікір жіберу"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Қолдау қызметіне хабарласыңыз"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Кіру"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Кіре алмадыңыз ба?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Жүйе туралы ақпаратты жіберу"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Енді көрсетпеу"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Келесі болып сұралуда:"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Есептік жазбаны енгізу"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Жүйе ақпараты"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Терезе трассасы"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Бетті трассирлеу"</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>
@@ -3599,11 +3629,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
<item quantity="one">1 секунд</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Шамамен <xliff:g id="ESTIMATE">%1$s</xliff:g> күту керек"</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="deletion_helper_automatic_title" msgid="6605660435498272520">"Aвтоматты"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Қолмен"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Орынды қазір босату"</string>
@@ -3614,32 +3644,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Камераны ашу үшін қуат түймесін екі рет басыңыз"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Селфи режимі үшін телефонды екі рет айналдырыңыз"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Селфи режимі үшін планшетті екі рет айналдырыңыз"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Селфи режимі үшін құрылғыны екі рет айналдырыңыз"</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_suggestion_summary" msgid="5987443721392571847">"Экран өшірулі кезде хабарландыруларды тексеру"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Экран өшірулі кезде хабарландыруларды тексеру"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Хабарландыруларды көру үшін құрылғының артындағы саусақ ізін оқу сканерін саусақпен төмен қарай сипап өтіңіз."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Хабарландыруларды жылдам көру"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Саусақ ізін оқу сканерінде саусақты төмен сырғыту"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Қосулы"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Өшірулі"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Операциялық жүйені жүктеу құралының құлпы ашылған"</string>
@@ -3769,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Каталогке кіру"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"каталогке кіру"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"Телефоным"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"Планшетім"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"Құрылғым"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Есептік жазба"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Құрылғы атауы"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Көлік жүргізуде Bluetooth пайдалану"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Көлік жүргізгенде Bluetooth функциясын автоматты түрде қосу"</string>
</resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 5b0a171..65a50a4 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"ប៊ូតុងចុច"</item>
<item msgid="1624323946324499595">"កូដ PIN ពីឧបករណ៍"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"១ ម៉ោង"</item>
<item msgid="5198271470953124739">"កុំអស់ពេល"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (លំនាំដើម)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"ខ្សោយ"</item>
<item msgid="2042505933058940139">"ខ្សោយ"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"លើសពី 60 ថ្ងៃ"</item>
<item msgid="5692284879054004388">"លើសពី 90 ថ្ងៃ"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"ប្រើចំណូលចិត្តបណ្តាញ"</item>
+ <item msgid="8745603368609022803">"ចាត់ទុកថាមានការកំណត់"</item>
+ <item msgid="2266114985518865625">"ចាត់ទុកថាមិនមានការកំណត់ទេ"</item>
+ </string-array>
</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 6d55ce9..3c0a876 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ឧបករណ៍របស់អ្នក"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ផ្គូផ្គងឧបករណ៍ថ្មី"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"អនុញ្ញាតឱ្យឧបករណ៍ផ្គូផ្គង និងភ្ជាប់ទៅឧបករណ៍ប៊្លូធូស"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"បិទការរោទ៍ក្នុងបណ្តាញ"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"កុំចាក់សំឡេងរោទ៍ទូរសព្ទផ្ទាល់ខ្លួនតាមកាសប៊្លូធូស"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"កំណត់កាលបរិច្ឆេទ"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"តម្រៀបតាមអក្សរក្រម"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"តម្រៀបតាមតំបន់ពេលវេលា"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> ចាប់ផ្តើមនៅថ្ងៃទី <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>។"</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"អំឡុងពេលសន្សំពេលថ្ងៃ"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"ម៉ោងស្តង់ដារ"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"តំបន់ម៉ោងតាមតំបន់"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"តំបន់ម៉ោងដែលមានគម្លាតថេរ"</string>
<string name="date_picker_title" msgid="1338210036394128512">"កាលបរិច្ឆេទ"</string>
<string name="time_picker_title" msgid="483460752287255019">"ពេលវេលា"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"ចាក់សោស្វ័យប្រវត្តិ"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"សារអេក្រង់ចាក់សោ"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"បើកធាតុក្រាហ្វិក"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"បិទដោយអ្នកគ្រប់គ្រង"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"បង្ហាញជម្រើសចាក់សោ"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"បង្ហាញជម្រើសប៊ូតុងថាមពលដែលបិទការចូលប្រើបន្ថែម និងការដោះសោស្នាមម្រាមដៃ។"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"គ្មាន"</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">"ឧ. ទូរសព្ទ Android របស់ Joe ។"</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"ព័ត៌មានប្រវត្តិរូប"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"គណនី"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"ការអ៊ិនគ្រីប និងព័ត៌មានសម្គាល់ខ្លួន"</string>
@@ -459,9 +469,11 @@
<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="8971630898700461034">"កំណត់ការចាក់សោអេក្រង់"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ការពារឧបករណ៍របស់អ្នក"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"ប្រើស្នាមម្រាមដៃ"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"កំណត់ការចាក់សោអេក្រង់ដើម្បីការពារសុវត្ថិភាព"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"ទប់ស្កាត់អ្នកផ្សេងទៀតមិនឱ្យប្រើថេប្លេតរបស់អ្នក"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"ទប់ស្កាត់អ្នកផ្សេងទៀតមិនឱ្យប្រើឧបករណ៍របស់អ្នក"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"ទប់ស្កាត់អ្នកផ្សេងទៀតមិនឱ្យប្រើទូរសព្ទរបស់អ្នក"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"ដោះសោដោយប្រើស្នាមម្រាមដៃ"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ដោះសោដោយប្រើស្នាមម្រាមដៃរបស់អ្នក"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"ជ្រើសរើសការចាក់សោអេក្រង់"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ជ្រើសការចាក់សោការងារ"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ជាអូប៉ាល័រទូរស័ព្ទ"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"សម្រាប់តន្ត្រី និងមេឌៀ"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ចងចាំការកំណត់"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ចំនួនអតិបរមានៃឧបករណ៍សំឡេងដែលភ្ជាប់ប៊្លូធូស"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ជ្រើសរើសចំនួនអតិបរមានៃឧបករណ៍សំឡេងដែលភ្ជាប់ប៊្លូធូស"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"ភ្ជាប់"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"បើកការបង្ហាញឥតខ្សែ"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"រកមិនឃើញឧបករណ៍ដែលនៅជិត។"</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"ឈ្មោះ"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"ចូល"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ចង់បើក Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ចង់បិទ Wi-Fi"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"បើកវ៉ាយហ្វាយ"</string>
<string name="wifi_settings" msgid="29722149822540994">"វ៉ាយហ្វាយ"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"ប្រើ Wi‑Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"ការកំណត់វ៉ាយហ្វាយ"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"រៀបចំ & គ្រប់គ្រងចំណុចចូលដំណើរការឥតខ្សែ"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"ពាក្យសម្ងាត់"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"បង្ហាញពាក្យសម្ងាត់"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"ជ្រើសរើសប៉ុស្តិ៍ AP"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ស្វ័យប្រវត្តិ"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"ក្រុម 2.4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"ក្រុម 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"ការកំណត់ IP"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (មាន WPS)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"បញ្ចូលពាក្យសម្ងាត់បណ្ដាញរបស់អ្នក"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"បណ្ដាញ Wi‑Fi នៃក្រុមហ៊ុនបម្រើសេវាទូរសព្ទ"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"ភ្ជាប់តាមរយៈ <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"ភ្ជាប់តាមរយៈ <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ដើម្បីបង្កើនភាពត្រឹមត្រូវទីតាំង និងសម្រាប់គោលបំណងផ្សេងៗ <xliff:g id="APP_NAME">%1$s</xliff:g> ចង់បើកការវិភាគ រកបណ្ដាញ ទោះបីជាបិទ វ៉ាយហ្វាយ ក៏ដោយ។\n\nអនុញ្ញាតសម្រាប់កម្មវិធីទាំងអស់ដែលអ្នកចង់វិភាគរក?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ដើម្បីបិទ, ចូលទៅកាន់កម្រិតខ្ពស់នៅក្នុងម៉ឺនុយលើសចំណុះ។"</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"អនុញ្ញាត"</string>
@@ -909,10 +926,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ប្រើហតស្ប៉តដើម្បីបង្កើតបណ្តាញ Wi‑Fi សម្រាប់ឧបករណ៍ផ្សេងទៀតរបស់អ្នក។ ហតស្ប៉តផ្តល់អ៊ីនធឺណិតដោយប្រើការភ្ជាប់ទិន្នន័យចល័តរបស់អ្នក។ អាចនឹងគិតប្រាក់លើទិន្នន័យទូរសព្ទចល័តបន្ថែមទៀត។"</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"កម្មវិធីអាចបង្កើតហតស្ប៉ត ដើម្បីចែករំលែកមាតិកាជាមួយឧបករណ៍ដែលនៅជិត។"</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"បិទហតស្ប៉តដោយស្វ័យប្រវត្តិ"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"ហតស៉្បត Wi-Fi នឹងបិទប្រសិនបើគ្មានឧបករណ៍ណាបានភ្ជាប់ទេ"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"កំពុងបើកហតស្ពត..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"កំពុងបិទហតស្ពត..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ដំណើរការ"</string>
@@ -923,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"ការហៅតាម Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"បើកការហៅតាម Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"ប្រើ Wi-Fi ជំនួសឲ្យបណ្តាញទូរស័ព្ទចល័ត"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"ពង្រីកដែនសេវាដោយធ្វើការហៅតាម 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_roaming_mode_title" msgid="1565039047187685115">"ចំណូលចិត្តរ៉ូមីង"</string>
@@ -961,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"អាសយដ្ឋានគ្រាអាសន្ន"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ត្រូវបានប្រើជាទីតាំងរបស់អ្នក នៅពេលដែលអ្នកហៅទូរសព្ទសង្គ្រោះបន្ទាន់តាមរយៈ Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"ស្វែងយល់បន្ថែម"</annotation>"អំពីមុខងារ DNS ឯកជន"</string>
<string name="display_settings_title" msgid="1708697328627382561">"បង្ហាញ"</string>
<string name="sound_settings" msgid="5534671337768745343">"សំឡេង"</string>
<string name="all_volume_title" msgid="4296957391257836961">"កម្រិតសំឡេង"</string>
@@ -1175,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"ប្រភេទបណ្ដាញចល័ត"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"ព័ត៌មានប្រតិបត្តិការ"</string>
<string name="status_data_state" msgid="5503181397066522950">"ស្ថានភាពបណ្ដាញចល័ត"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"ស្ថានភាពសេវាកម្ម"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"កម្លាំងសញ្ញា"</string>
<string name="status_roaming" msgid="2638800467430913403">"រ៉ូមីង"</string>
@@ -1308,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> ថ្មីរបស់អ្នកកំពុងដំណើរការ។ \n\nដើម្បីផ្លាស់ទីទិន្នន័យកម្មវិធី រូបភាព ឯកសារទៅឧបករណ៍នេះ សូមចូលទៅកាន់ ការកំណត់ > ឧបករណ៍ផ្ទុក។"</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"ផ្លាស់ទី <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"ការផ្លាស់ទី <xliff:g id="APP">^1</xliff:g> និងទិន្នន័យរបស់វាទៅ <xliff:g id="NAME_0">^2</xliff:g> នឹងចំណាយតែបន្តិចប៉ុណ្ណោះ។ អ្នកនឹងមិនអាចប្រើកម្មវិធីនេះទេ រហូតដល់ការផ្លាស់ទីនេះបញ្ចប់។ \n\nកុំដក <xliff:g id="NAME_1">^2</xliff:g> ចេញអំឡុងពេលធ្វើការផ្លាស់ទី។"</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ដើម្បីផ្លាស់ទីទិន្នន័យ អ្នកត្រូវដោះសោអ្នកប្រើប្រាស់ <xliff:g id="APP">^1</xliff:g> ។"</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"កំពុងផ្លាស់ទី <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"កុំដក <xliff:g id="NAME">^1</xliff:g> ចេញអំឡុងពេលធ្វើការផ្លាស់ទី។ \n\nកម្មវិធី <xliff:g id="APP">^2</xliff:g> នៅលើឧបករណ៍នេះនឹងមិនមានទេ រហូតដល់ការផ្លាស់ទីបញ្ចប់។"</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"បោះបង់ការផ្លាស់ទី"</string>
@@ -1360,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"បណ្ដាញ កម្មវិធី ឬឧបករណ៍ដែលអាចកំណត់ឡើងវិញបាន"</string>
<string name="reset_network_title" msgid="6166025966016873843">"កំណត់ Wi-Fi ឧបករណ៍ចល័ត និងប៊្លូធូសឡើងវិញ"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"វានឹងកំណត់ការកំណត់បណ្តាញទាំងអស់ឡើងវិញ រួមមាន៖\n\n"<li>"Wi‑Fi"</li>\n<li>"ទិន្នន័យចល័ត"</li>\n<li>"ប៊្លូធូស"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"កំណត់ eSIM ឡើងវិញផងដែរ"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"លុប eSIM ទាំងអស់នៅលើទូរសព្ទ។ អ្នកនឹងត្រូវទាក់ទងទៅក្រុមហ៊ុនសេវាទូរសព្ទរបស់អ្នក ដើម្បីទាញយក eSIM របស់អ្នកឡើងវិញ។ សកម្មភាពនេះនឹងមិនបោះបង់គម្រោងសេវាកម្មទិន្នន័យចល័តរបស់អ្នកទេ។"</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"កំណត់ការកំណត់ឡើងវិញ"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"កំណត់ការកំណត់បណ្តាញទាំងអស់ឡើងវិញ? អ្នកមិនអាចធ្វើសកម្មភាពនេះវិញបានទេ!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"កំណត់ការកំណត់ឡើងវិញ"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"កំណត់ឡើងវិញ?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"ការកំណត់បណ្តាញឡើងវិញមិនមានសម្រាប់អ្នកប្រើនេះទេ"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"បានកំណត់ការកំណត់បណ្តាញឡើងវិញ"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"មិនអាចកំណត់ eSIM ឡើងវិញបានទេ"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"មិនអាចកំណត់ eSIM ឡើងវិញបានទេ ដោយសារមានបញ្ហា។"</string>
<string name="master_clear_title" msgid="3531267871084279512">"លុបទិន្នន័យទាំងអស់ (កំណត់ឡើងវិញដូចថ្មី)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ក្រុមហ៊ុនបម្រើសេវាទូរសព្ទដែលប្រើ eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"វានឹងមិនបោះបង់គម្រោងសេវាកម្មទូរសព្ទរបស់អ្នកទេ។"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ដើម្បីសម្អាតតន្ត្រី រូបថត និងទិន្នន័យអ្នកប្រើផ្សេងៗ តម្រូវឲ្យលុប"<b>"ឧបករណ៍ផ្ទុកយូអេសប៊ី"</b>" ។"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ដើម្បីសម្អាតតន្ត្រី, រូបភាព និងទិន្នន័យអ្នកប្រើផ្សេងទៀត "<b>"ចាំបាច់ត្រូវ"</b>" លុបកាតអេសឌី។"</string>
@@ -1432,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"សូមភ្ជាប់អ៊ីនធឺណិត"</string>
<string name="location_title" msgid="1029961368397484576">"ទីតាំងខ្ញុំ"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ទីតាំងសម្រាប់ប្រវត្តិរូបការងាររបស់អ្នក"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"របៀបកំណត់"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ភាពត្រឹមត្រូវខ្ពស់"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ការសន្សំថ្ម"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"តែឧបករណ៍ប៉ុណ្ណោះ"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"បិទទីតាំង"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"ការអនុញ្ញាតកម្រិតកម្មវិធី"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"សំណើទីតាំងថ្មី"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"បច្ចុប្បន្នគ្មានកម្មវិធីបានស្នើទីតាំង"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"សេវាកម្មទីតាំង"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"ប្រើថ្មច្រើន"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"ប្រើថ្មតិច"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"របៀបកំណត់ទីតាំង"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ប្រើ GPS, Wi‑Fi, ប៊្លូធូស ឬបណ្តាញទូរសព្ទចល័តដើម្បីកំណត់ទីតាំង"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ប្រើ Wi‑Fi, ប៊្លូធូស ឬបណ្តាញទូរសព្ទចល័តដើម្បីកំណត់ទីតាំង"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ប្រើ GPS និងឧបករណ៍ចាប់សញ្ញារបស់ឧបករណ៍ ដើម្បីកំណត់ទីតាំង"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"ការស្កេន"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ការស្កេន Wi‑Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ធ្វើឲ្យការចាប់ទីតាំងប្រសើរឡើងដោយអនុញ្ញាតឲ្យកម្មវិធី និងសេវាកម្មប្រព័ន្ធចាប់យកបណ្តាញ Wi-Fi បានគ្រប់ពេល។"</string>
@@ -1468,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"ប្រភពទីតាំង"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"មើលព័ត៌មានផ្លូវច្បាប់, ស្ថានភាព, កំណែកម្មវិធី"</string>
<string name="legal_information" msgid="5769301644270604095">"ព័ត៌មានផ្លូវច្បាប់"</string>
@@ -1575,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"មើលកម្មវិធីទាំង <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ថេប្លេត និងទិន្នន័យផ្ទាល់ខ្លួនរបស់អ្នកងាយនឹងរងគ្រោះពីការវាយប្រហារពីកម្មវិធីដែលមិនស្គាល់។ ប្រសិនបើដំឡើងកម្មវិធីពីប្រភពនេះ មានន័យថាអ្នកទទួលខុសត្រូវលើការខូចខាតណាមួយចំពោះទូរសព្ទ ឬការបាត់បង់ទិន្នន័យ ដែលអាចបណ្តាលមកពីការប្រើប្រាស់កម្មវិធីទាំងនោះ។"</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"ទូរសព្ទ និងទិន្នន័យផ្ទាល់ខ្លួនរបស់អ្នកងាយនឹងរងគ្រោះពីការវាយប្រហារពីកម្មវិធីដែលមិនស្គាល់។ ប្រសិនបើដំឡើងកម្មវិធីពីប្រភពនេះ មានន័យថាអ្នកនឹងទទួលខុសត្រូវលើការខូចខាតណាមួយចំពោះទូរសព្ទ ឬការបាត់បង់ទិន្នន័យរបស់អ្នក ដែលអាចបណ្តាលមកពីការប្រើប្រាស់កម្មវិធីទាំងនោះ។"</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"ឧបករណ៍ និងទិន្នន័យផ្ទាល់ខ្លួនរបស់អ្នកងាយនឹងរងគ្រោះពីការវាយប្រហារពីកម្មវិធីដែលមិនស្គាល់។ ប្រសិនបើដំឡើងកម្មវិធីពីប្រភពនេះ មានន័យថាអ្នកទទួលខុសត្រូវលើការខូចខាតទាំងឡាយចំពោះឧបករណ៍ ឬការបាត់បង់ទិន្នន័យ ដែលអាចបណ្តាលមកពីការប្រើប្រាស់កម្មវិធីទាំងនោះ។"</string>
<string name="advanced_settings" msgid="1777249286757067969">"ការកំណត់កម្រិតខ្ពស់"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"បើកជម្រើសកំណត់ច្រើនទៀត"</string>
<string name="application_info_label" msgid="5736524913065714880">"ព័ត៌មានកម្មវិធី"</string>
@@ -1874,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"អាចប៉ះពាល់ដល់ប្រតិបត្តិការ"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ចុចបន្ទាប់ពីទ្រនិចឈប់ផ្លាស់ទី"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ពន្យារពេលមុនពេលចុច"</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_summary_state_enabled" msgid="8359913912320966304">"បើក"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"បិទ"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"បង្ហាញនៅក្នុងការកំណត់រហ័ស"</string>
@@ -1987,7 +2005,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>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ដើម្បីបញ្ចូលថ្ម"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"សកម្មភាពផ្ទៃខាងក្រោយ"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"បានដាក់កំហិត"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"អនុញ្ញាតឲ្យកម្មវិធីនេះដំណើរការនៅផ្ទៃខាងក្រោយ"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"កម្មវិធីអាចដំណើរការនៅផ្ទៃខាងក្រោយនៅពេលមិនមានការប្រើប្រាស់"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"សកម្មភាពផ្ទៃខាងក្រោយរបស់កម្មវិធីត្រូវបានកម្រិតនៅពេលមិនមានការប្រើប្រាស់"</string>
@@ -2030,14 +2048,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"ថ្មនៅដំណើរការល្អ"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"កម្មវិធីកំពុងដំណើរការជាធម្មតា"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"កម្លាំងថ្មខ្សោយ"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ថ្មមិនអាចផ្តល់កម្រិតថាមពលថ្មខ្លាំងទេ"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"បើកកម្មវិធីគ្រប់គ្រងថ្មឆ្លាតវៃ"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"បើកដើម្បីបង្កើនប្រសិទ្ធភាពការប្រើប្រាស់ថ្ម"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"បើកមុខងារកម្រិតថ្មទាប"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"ធ្វើឱ្យថាមពលថ្មរបស់អ្នកប្រើបានយូរជាងមុន"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"មុខងារកម្រិតថ្មទាបបានបើក"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"មុខងារមួយចំនួនត្រូវបានកម្រិត"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ទូរសព្ទត្រូវបានប្រើច្រើន"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ថេប្លេតត្រូវបានប្រើច្រើន"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ឧបករណ៍ត្រូវបានប្រើច្រើន"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"ប្រហែល <xliff:g id="HOUR">%1$s</xliff:g> ចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"ទូរសព្ទរបស់អ្នកត្រូវបានប្រើច្រើន ដូច្នេះវាប្រើប្រាស់ថ្មច្រើន។ ថ្មរបស់អ្នកកំពុងដំណើរការធម្មតា។\n\nទូរសព្ទរបស់អ្នកត្រូវបានប្រើអស់រយៈពេលប្រហែល <xliff:g id="HOUR">%1$s</xliff:g> ចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ។\n\n ការប្រើប្រាស់ថ្មសរុប៖"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"ថេប្លេតរបស់អ្នកត្រូវបានប្រើច្រើន ដូច្នេះវាបានប្រើប្រាស់ថ្មច្រើន។ ថ្មរបស់អ្នកកំពុងដំណើរការធម្មតា។\n\nថេប្លេតរបស់អ្នកត្រូវបានប្រើអស់រយៈពេលប្រហែល <xliff:g id="HOUR">%1$s</xliff:g> ចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ។\n\n ការប្រើប្រាស់ថ្មសរុប៖"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"ឧបករណ៍របស់អ្នកត្រូវបានប្រើច្រើន ដូច្នេះវាប្រើប្រាស់ថ្មច្រើន។ ថ្មរបស់អ្នកកំពុងដំណើរការធម្មតា។\n\n ឧបករណ៍របស់អ្នកត្រូវបានប្រើអស់រយៈពេលប្រហែល <xliff:g id="HOUR">%1$s</xliff:g> ចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ។\n\n ការប្រើប្រាស់ថ្មសរុប៖"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"កម្មវិធីគ្រប់គ្រងថ្មឆ្លាតវៃ"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"គ្រប់គ្រងថ្មដោយស្វ័យប្រវត្តិ"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"កែសម្រួលការប្រើប្រាស់ថាមពលដោយកម្មវិធីដោយស្វ័យប្រវត្តិ ផ្អែកលើការប្រើប្រាស់"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"កម្មវិធីដែលបានរឹតបន្តឹង"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">កម្មវិធី %1$d</item>
+ <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>
@@ -2146,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"បង្កើនប្រសិទ្ធិភាពកម្មវិធី"</string>
<string name="battery_saver" msgid="8172485772238572153">"កម្មវិធីសន្សំថ្ម"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"ប្រើកម្មវិធីសន្សំថ្ម"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"បើកដោយស្វ័យប្រវត្តិ"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"កុំ"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"នៅពេលដែលថ្មសល់ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2333,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"បច្ចុប្បន្នការធ្វើសមកាលកម្មមានបញ្ហា។ វានឹងដំណើរការក្នុងពេលឆាប់ៗនេះ។"</string>
<string name="add_account_label" msgid="7811707265834013767">"បញ្ចូលគណនី"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"មិនទាន់មានប្រវត្តិរូបការងារនៅឡើយទេ"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"របៀបការងារ"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"អនុញ្ញាតឲ្យប្រវត្តិរូបការងារដំណើរការ ដោយរាប់បញ្ចូលទាំងកម្មវិធី ការធ្វើសមកាលកម្មផ្ទៃខាងក្រោយ និងលក្ខណៈពិសេសដែលពាក់ព័ន្ធ"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"កម្រងព័ត៌មានការងារ"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"គ្រប់គ្រងដោយស្ថាប័នរបស់អ្នក"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"កម្មវិធី និងការជូនដំណឹងបានបិទ"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"លុបប្រវត្តិរូបការងារ"</string>
<string name="background_data" msgid="5779592891375473817">"ទិន្នន័យផ្ទៃខាងក្រោយ"</string>
<string name="background_data_summary" msgid="8328521479872763452">"កម្មវិធីអាចធ្វើសមកាលកម្ម ផ្ញើ និងទទួលទិន្នន័យនៅពេលណាមួយ"</string>
@@ -2366,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"លុបគណនី?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"លុបគណនីនេះ នឹងលុបសារ, ទំនាក់ទំនង និងទិន្នន័យផ្សេងៗទៀតទាំងអស់ពីកុំព្យូទ័របន្ទះរបស់អ្នក!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ការលុបគណនីនេះនឹងលុបសារ ទំនាក់ទំនង និងទិន្នន័យផ្សេងៗរបស់គណនីនេះទាំងអស់ពីទូរស័ព្ទ!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"ការលុបគណនីនេះនឹងលុបសារ ទំនាក់ទំនង និងទិន្នន័យផ្សេងៗរបស់គណនីនេះទាំងអស់ចេញពីឧបករណ៍!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"ការផ្លាស់ប្តូរនេះមិនត្រូវបានអនុញ្ញាតដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string>
<string name="provider_label" msgid="7724593781904508866">"ការជាវជាក្រុម"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2622,8 @@
<item quantity="other">ពិនិត្យវិញ្ញាបនបត្រ</item>
<item quantity="one">ពិនិត្យវិញ្ញាបនបត្រ</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"អ្នកប្រើប្រាស់"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"អ្នកប្រើ & ប្រវត្តិរូប"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"បន្ថែមអ្នកប្រើ ឬប្រវត្តិរូប"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"បន្ថែមអ្នកប្រើ"</string>
@@ -2774,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ប៊្លូធូស ការបញ្ជូន"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"កម្មវិធី និងការជូនដំណឹង"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ការអនុញ្ញាត កម្មវិធីលំនាំដើម"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"អ្នកប្រើប្រាស់ និងគណនី"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"កុំ កុំ រំខាន, ផ្អាក, ការផ្អាក, បំបែក"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"នៅក្បែ, ទីតាំង, ប្រវត្តិ, ការរាយការណ៍"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"ភាពត្រឹមត្រូវ"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"គណនី"</string>
<string name="keywords_users" msgid="3434190133131387942">"ការដាក់កម្រិត, ដាក់កម្រិត, បានដាក់កម្រិត"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ការកែអត្ថបទ, កែ, សំឡេង, ញ័រ, ស្វ័យប្រវត្តិ, ភាសា, កាយវិការ, ផ្តល់យោបល់, ការផ្តល់យោបល់, ធីម, បំពាន, ពាក្យ, វាយបញ្ចូល, សញ្ញាអារម្មណ៍, អន្តរជាតិ"</string>
@@ -2872,6 +2911,7 @@
<item quantity="one">ច្បាប់ 1</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"កុំរំខាន"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"បើកមុខងារកុំរំខាន"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"សកម្មភាព"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"អនុញ្ញាតឱ្យឮសំឡេង និងញ័រពី"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"គ្មានសំឡេង"</string>
@@ -2881,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"បើកដោយស្វ័យប្រវត្តិ"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"ច្បាប់ស្វ័យប្រវត្តិ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"ច្បាប់ស្វ័យប្រវត្តិ"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"កំណត់ច្បាប់សម្រាប់មុខងារកុំរំខាន"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ដាក់កម្រិតលើសំឡេង និងការញ័រក្នុងពេលណាមួយ"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"បិទសំឡេងទូរសព្ទក្នុងពេលជាក់លាក់"</string>
+ <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_no_interruptions" msgid="8107126344850276878">"ស្ងៀមស្ងាត់ទាំងស្រុង"</string>
@@ -2890,12 +2931,15 @@
<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_add" msgid="90014394953272517">"បញ្ចូល"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"បើកឥឡូវនេះ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"បិទឥឡូវនេះ"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"បើក"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"បើកឥឡូវនេះ"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"បិទឥឡូវនេះ"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"មុខងារកុំរំខានបើករហូតដល់ម៉ោង <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"មុខងារកុំរំខាននឹងនៅបន្តបើករហូតទាល់តែអ្នកបិទវា"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"មុខងារកុំរំខានត្រូវបានបើកតាមរយៈច្បាប់ (<xliff:g id="RULE_NAME">%s</xliff:g>) ដោយស្វ័យប្រវត្តិ"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"មុខងារកុំរំខានត្រូវបានបើកតាមរយៈកម្មវិធី <xliff:g id="APP_NAME">%s</xliff:g> ដោយស្វ័យប្រវត្តិ"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"អាទិភាពប៉ុណ្ណោះ"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2955,7 @@
<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="recent_notifications" msgid="5660639387705060156">"បានផ្ញើថ្មីៗ"</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>
@@ -2930,7 +2975,7 @@
<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_importance_title" msgid="848692592679312666">"សារៈសំខាន់"</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="5455049524984686275">"គ្មានសំឡេង ឬការរំខានដល់ការមើលឡើយ"</string>
@@ -2948,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"សំខាន់កម្រិតមធ្យម"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"ចូលដំណើរការការជូនដំណឹង"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ការចូលប្រើប្រាស់កម្រងព័ត៌មានការងារត្រូវបានទប់ស្កាត់"</string>
@@ -2978,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"ចូលដំណើរការមុខងារកុំរំខាន"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"គ្មានកម្មវិធីបានដំឡើងណាមួយបានស្នើការចូលដំណើរការមុខងារកុំរំខានទេ"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"កំពុងផ្ទុកកម្មវិធី..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"ប្រព័ន្ធប្រតិបត្តិការ Android កំពុងទប់ស្កាត់ការជូនដំណឹងរបស់កម្មវិធីនេះមិនឲ្យបង្ហាញនៅលើឧបករណ៍នេះទេ"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"ប្រព័ន្ធប្រតិបត្តិការ Android កំពុងទប់ស្កាត់ប្រភេទនៃការជូនដំណឹងនេះមិនឲ្យបង្ហាញនៅលើឧបករណ៍នេះទេ"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android កំពុងទប់ស្កាត់ក្រុមការជូនដំណឹងនេះមិនឱ្យបង្ហាញនៅលើឧបករណ៍នេះទេ"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"តាមសំណើរបស់អ្នក ប្រព័ន្ធប្រតិបត្តិការ Android កំពុងទប់ស្កាត់ការជូនដំណឹងរបស់កម្មវិធីនេះមិនឱ្យបង្ហាញនៅលើឧបករណ៍នេះទេ"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"តាមសំណើរបស់អ្នក ប្រព័ន្ធប្រតិបត្តិការ Android កំពុងទប់ស្កាត់ប្រភេទនៃការជូនដំណឹងនេះមិនឱ្យបង្ហាញនៅលើឧបករណ៍នេះទេ"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"តាមសំណើរបស់អ្នក ប្រព័ន្ធប្រតិបត្តិការ Android កំពុងទប់ស្កាត់ក្រុមនៃការជូនដំណឹងនេះមិនឱ្យបង្ហាញនៅលើឧបករណ៍នេះទេ"</string>
<string name="notification_channels" msgid="5346841743182627500">"ប្រភេទ"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"ផ្សេងៗ"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ក្រៅពីប្រើម្រាមដៃរបស់អ្នកដើម្បីដោះសោឧបករណ៍របស់អ្នក អ្នកអាចបន្ថែមការការពារលើឧបករណ៍នេះ ដោយកំណត់ឲ្យប្រើពាក្យសម្ងាត់មុនពេលដែលវាចាប់ផ្តើម។ ប្រសិនបើឧបករណ៍មិនទាន់ចាប់ផ្ដើមទេ វាមិនអាចទទួលការហៅទូរសព្ទ សារ ឬការជូនដំណឹងក៏ដូចជាម៉ោងរោទ៍បានទេ។\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="1793719723017395175">"បាទ/ចាស"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"ទេ"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ទាមទារកូដ PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ទាមទារលំនាំ?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"ទាមទារពាក្យសម្ងាត់?"</string>
@@ -3255,7 +3303,7 @@
<string name="high_power_system" msgid="7362862974428225301">"មិនមានការបង្កើនប្រសិទ្ធភាពថ្ម"</string>
<string name="high_power_desc" msgid="6283926163708585760">"កុំប្រើការបង្កើនប្រសិទ្ធភាពថ្ម។ អាចនឹងស៊ីថ្មរបស់អ្នកលឿនជាងមុន។"</string>
<string name="high_power_prompt_title" msgid="6358673688590282655">"អនុញ្ញាតឲ្យកម្មវិធីដំណើរការនៅផ្ទៃខាងក្រោយជានិច្ច?"</string>
- <string name="high_power_prompt_body" msgid="1031422980602565049">"ការអនុញ្ញាតឲ្យ <xliff:g id="APP_NAME">%1$s</xliff:g> ដំណើរការនៅផ្ទៃខាងក្រោយជានិច្ចអាចនឹងធ្វើឲ្យកម្រិតថាមពលថ្មថយចុះ។ \n\nអ្នកអាចប្តូរវាបាននៅពេលក្រោយពី ការកំណត់ > កម្មវិធី > ការជូនដំណឹង។"</string>
+ <string name="high_power_prompt_body" msgid="1031422980602565049">"ការអនុញ្ញាតឲ្យ <xliff:g id="APP_NAME">%1$s</xliff:g> ដំណើរការនៅផ្ទៃខាងក្រោយជានិច្ចអាចនឹងធ្វើឲ្យកម្រិតថាមពលថ្មថយចុះ។ \n\nអ្នកអាចប្តូរវាបាននៅពេលក្រោយពីការកំណត់ > កម្មវិធី > ការជូនដំណឹង។"</string>
<string name="battery_summary" msgid="8044042095190688654">"ប្រើអស់ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ"</string>
<string name="battery_power_management" msgid="5571519699679107523">"ការគ្រប់គ្រងថាមពល"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"គ្មានការប្រើប្រាស់ថ្មចាប់តាំងពីសាកពេញលើកចុងក្រោយ"</string>
@@ -3397,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"អ្នកប្រើប្រាស់បច្ចុប្បន្ន៖ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"ចូលជា <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ជាកម្មវិធីលំនាំដើម"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"បើក / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"បិទ"</string>
<string name="backup_disabled" msgid="485189128759595412">"បានបិទដំណើរការការបម្រុងទុក"</string>
<string name="about_summary" msgid="924181828102801010">"បានធ្វើបច្ចុប្បន្នភាពទៅ Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3407,6 +3456,7 @@
<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="6346948990624612516">"មិនអាចបិទការបម្រុងទុកបានទេ"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"សកម្មភាពនេះត្រូវបានបិទ។ ដើម្បីស្វែងយល់បន្ថែម សូមទាក់ទងទៅអ្នកគ្រប់គ្រងរបស់ស្ថាប័នអ្នក។"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"ព័ត៌មានលម្អិតបន្ថែម"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"អ្នកគ្រប់គ្រងរបស់អ្នកអាចតាមដាន និងគ្រប់គ្រងកម្មវិធី និងទិន្នន័យដែលពាក់ព័ន្ធជាមួយកម្រងព័ត៌មានការងាររបស់អ្នក ដោយរាប់បញ្ចូលទាំងការកំណត់ ការអនុញ្ញាត ការចូលលក្ខណៈក្រុមហ៊ុន សកម្មភាពបណ្តាញ និងព័ត៌មានអំពីទីតាំងរបស់ឧបករណ៍នេះផងដែរ។"</string>
@@ -3430,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"ប្រវត្តិរូបការងារត្រូវបានបិទ"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"កម្មវិធី ការធ្វើសមកាលកម្មផ្ទៃខាងក្រោយ និងលក្ខណៈពិសេសផ្សេងទៀតដែលពាក់ព័ន្ធនឹងប្រវត្តិរូបការងាររបស់អ្នកត្រូវបានបិទ។"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"កំណត់កាលវិភាគពន្លឺពេលរាត្រី"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"អេក្រង់ពណ៌លឿងព្រឿងៗជួយឲ្យអ្នកឆាប់គេងលក់"</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="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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ទៀត"</string>
@@ -3537,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"គ្មាន"</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>
@@ -3559,31 +3612,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"បានភ្ជាប់ទៅឧបករណ៍ច្រើន"</string>
<string name="demo_mode" msgid="2798762752209330277">"មុខងារសាកល្បង UI ប្រព័ន្ធ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ប្រអប់ការកំណត់រហ័សសម្រាប់អ្នកអភិវឌ្ឍន៍"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"យើងនៅទីនេះដើម្បីផ្តល់ជំនួយ"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"យើងនៅទីនេះ 24/7"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"យើងផ្តល់ជូនសេវាកម្មសម្រាប់អ្នក 24 ម៉ោង"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"ក្រុមការងារផ្នែកគាំទ្ររបស់យើងនៅទីនេះដើម្បីជួយដោះស្រាយបញ្ហាណាមួយ"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ក្រុមការងារផ្នែកគាំទ្ររបស់យើងនៅទីនេះគ្រប់ពេល ជារៀងរាល់ថ្ងៃ។"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"សូមស្វែងរកជំនួយ ឬត្រឡប់មកវិញក្នុងម៉ោងផ្តល់ជូនការគាំទ្រ (ម៉ោងក្នុងស្រុក):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ម៉ោងផ្តល់ជូនការគាំទ្រតាមទូរស័ព្ទ (ម៉ោងក្នុងស្រុក)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ស្វែងរកជំនួយ ឬរុករកគន្លឹះ និងល្បិចប្រើ"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"គាំទ្រ៖"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"គ្រោងធ្វើដំណើរក្រៅប្រទេសមែនទេ?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"ការគិតប្រាក់កម្រិតអន្តរជាតិអាចនឹងត្រូវអនុវត្ត"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"ទូរសព្ទ"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"ជជែក"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"រុករកគន្លឹះ និងល្បិច"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"ស្វែងរកជំនួយ និងផ្ញើមតិ"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"ទាក់ទងផ្នែកគាំទ្រ"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"ចូល"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"មិនអាចចូលគណនីបានឬ?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"ផ្ញើព័ត៌មានប្រព័ន្ធ"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"កុំបង្ហាញម្តងទៀត"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"ស្នើសុំជា"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"បញ្ចូលគណនី"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"ព័ត៌មានអំពីប្រព័ន្ធ"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"ដានវិនដូ"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ដានផ្ទៃ"</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>
@@ -3599,11 +3629,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> វិនាទី</item>
<item quantity="one">1 វិនាទី</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> រង់ចាំ"</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="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>
@@ -3614,32 +3644,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ចុចប៊ូតុងថាមពលពីរដងដើម្បីបើកកាមេរ៉ា"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"បង្វិលទូរសព្ទពីរដងសម្រាប់មុខងារថតពីមុខ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"បង្វិលថេប្លេតពីរដងសម្រាប់មុខងារថតពីមុខ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"បង្វិលឧបករណ៍ពីរដងសម្រាប់មុខងារថតពីមុខ"</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_suggestion_summary" msgid="5987443721392571847">"ពិនិត្យមើលការជូនដំណឹងនៅពេលដែលអេក្រង់បិទ"</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_pickup_suggestion_summary" msgid="7014700589991761035">"ពិនិត្យមើលការជូនដំណឹងនៅពេលដែលអេក្រង់បិទ"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នក សូមអូសចុះក្រោមនៅលើឧបករណ៍ចាប់ស្នាមម្រាមដៃ ដែលស្ថិតនៅផ្នែកខាងក្រោយឧបករណ៍របស់អ្នក។"</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"មើលការជូនដំណឹងយ៉ាងឆាប់រហ័ស"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"អូសចុះក្រោមលើឧបករណ៍ចាប់ស្នាមម្រាមដៃ"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"បើក"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"បិទ"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader ត្រូវបានដោះសោរួចហើយ"</string>
@@ -3769,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"ការចូលប្រើបញ្ជី"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"ការចូលប្រើបញ្ជី"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"ទូរសព្ទរបស់ខ្ញុំ"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"ថេប្លេតរបស់ខ្ញុំ"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"ឧបករណ៍របស់ខ្ញុំ"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"គណនី"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"ឈ្មោះឧបករណ៍"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ប្រើប៊្លូធូសនៅពេលបើកបរ"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"បើកប៊្លូធូសដោយស្វ័យប្រវត្តិ នៅពេលបើកបរ"</string>
</resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index bc7967f..ede6bee 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"ಒತ್ತುವ ಬಟನ್"</item>
<item msgid="1624323946324499595">"ಪೀರ್ ಸಾಧನದಿಂದ ಪಿನ್"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 ಗಂಟೆ"</item>
<item msgid="5198271470953124739">"ಎಂದಿಗೂ ಅವಧಿ ಮೀರದಿರಲಿ"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (ಡಿಫಾಲ್ಟ್)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"ಕಳಪೆ"</item>
<item msgid="2042505933058940139">"ಕಳಪೆ"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
<item msgid="5692284879054004388">"90 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"ನೆಟ್ವರ್ಕ್ ಆದ್ಯತೆಯನ್ನು ಬಳಸಿ"</item>
+ <item msgid="8745603368609022803">"ಮೀಟರ್ ಮಾಡಿದೆ ಎಂದು ಪರಿಗಣಿಸಿ"</item>
+ <item msgid="2266114985518865625">"ಮೀಟರ್ ಮಾಡಲಾಗಿಲ್ಲ ಎಂದು ಪರಿಗಣಿಸಿ"</item>
+ </string-array>
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 231aa8b..dbc8bc1 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ನಿಮ್ಮ ಸಾಧನಗಳು"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ಹೊಸ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"ಸಾಧನವನ್ನು ಜೋಡಿಸಲು ಮತ್ತು ಬ್ಲ್ಯೂಟೂತ್ ಸಾಧನಗಳಿಗೆ ಸಂಪರ್ಕಿಸಲು ಅನುಮತಿಸಿ"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ಇನ್ ಬ್ಯಾಂಡ್ ರಿಂಗಿಂಗ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"ಬ್ಲೂಟೂತ್ ಹೆಡ್ಸೆಟ್ಗಳಲ್ಲಿ ಕಸ್ಟಮ್ ಫೋನ್ ರಿಂಗ್ ಟೋನ್ಗಳನ್ನು ಪ್ಲೇ ಮಾಡಬೇಡಿ"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"ದಿನಾಂಕವನ್ನು ಹೊಂದಿಸಿ"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ವರ್ಣಮಾಲೆಯಾನುಸಾರ ವಿಂಗಡಿಸು"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ಸಮಯ ವಲಯದ ಅನುಸಾರ ವಿಂಗಡಿಸು"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> ಸಮಯದಲ್ಲಿ <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> ಗೆ ಪ್ರಾರಂಭವಾಗುತ್ತದೆ."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"ಹಗಲು ಉಳಿತಾಯ ಸಮಯ"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"ಪ್ರಮಾಣಿತ ಸಮಯ"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"ಪ್ರದೇಶದ ಮೂಲಕ ಸಮಯ ವಲಯ"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"ನಿಶ್ಚಿತ ಆಫ್ಸೆಟ್ ಸಮಯ ವಲಯಗಳು"</string>
<string name="date_picker_title" msgid="1338210036394128512">"ದಿನಾಂಕ"</string>
<string name="time_picker_title" msgid="483460752287255019">"ಸಮಯ"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಲಾಕ್ ಮಾಡು"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಸಂದೇಶ"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"ವಿಜೆಟ್ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ನಿರ್ವಾಹಕರು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ಯಾವುದೂ ಇಲ್ಲ"</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">"ಉದಾ. ಜೋ ಅವರ Android."</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"ಪ್ರೊಫೈಲ್ ಮಾಹಿತಿ"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"ಖಾತೆಗಳು"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"ಎನ್ಕ್ರಿಪ್ಶನ್ ಮತ್ತು ರುಜುವಾತುಗಳು"</string>
@@ -459,9 +471,16 @@
<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="8971630898700461034">"ಪರದೆ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ರಕ್ಷಿಸಿ"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸಿ"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ನಿಮ್ಮ ಫಿಂಗರ್ಫ್ರಿಂಟ್ನೊಂದಿಗೆ ಅನ್ಲಾಕ್ ಮಾಡಿ"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ಕೆಲಸದ ಲಾಕ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ಸ್ಪೀಕರ್ ಫೋನ್ನಂತೆ"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ಸಂಗೀತ ಮತ್ತು ಮಾಧ್ಯಮಕ್ಕಾಗಿ"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ನೆನಪಿನಲ್ಲಿಡು"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ಗರಿಷ್ಠ ಸಂಪರ್ಕಿತ ಬ್ಲೂಟೂತ್ ಆಡಿಯೋ ಸಾಧನಗಳು"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ಸಂಪರ್ಕಿತ ಬ್ಲೂಟೂತ್ ಆಡಿಯೋ ಸಾಧನಗಳ ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"ಬಿತ್ತರಿಸುವಿಕೆ"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ವೈರ್ಲೆಸ್ ಪ್ರದರ್ಶನ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ಯಾವುದೇ ಹತ್ತಿರದ ಸಾಧನಗಳು ಕಂಡುಬಂದಿಲ್ಲ."</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"ಹೆಸರು"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"ಸೈನ್ ಇನ್"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"ವೈ-ಫೈ ಆನ್ ಮಾಡಲು <xliff:g id="REQUESTER">%s</xliff:g> ಬಯಸುತ್ತದೆ"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"ವೈ-ಫೈ ಆಫ್ ಮಾಡಲು <xliff:g id="REQUESTER">%s</xliff:g> ಬಯಸುತ್ತದೆ"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi ಆನ್ ಮಾಡಿ"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"ವೈ-ಫೈ ಬಳಸಿ"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"ವಯರ್ಲೆಸ್ ಪ್ರವೇಶಿಸುವಿಕೆ ಅಂಶಗಳನ್ನು ಹೊಂದಿಸಿ & ನಿರ್ವಹಿಸಿ"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"ಪಾಸ್ವರ್ಡ್"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"ಪಾಸ್ವರ್ಡ್ ತೋರಿಸು"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ಬ್ಯಾಂಡ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ಸ್ವಯಂ"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz ಬ್ಯಾಂಡ್"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz ಬ್ಯಾಂಡ್"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ಲಭ್ಯವಿದೆ)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ನಿಮ್ಮ ನೆಟ್ವರ್ಕ್ ಪಾಸ್ವರ್ಡ್ ನಮೂದಿಸಿ"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ ವಾಹಕ"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ಸ್ಥಳ ನಿಖರತೆಯನ್ನು ಸುಧಾರಿಸಲು ಮತ್ತು ಇತರ ಉದ್ದೇಶಗಳಿಗಾಗಿ, ವೈ-ಫೈ ಆಫ್ ಇದ್ದಾಗಲೂ ಸಹ <xliff:g id="APP_NAME">%1$s</xliff:g> ನೆಟ್ವರ್ಕ್ ಸ್ಕ್ಯಾನಿಂಗ್ ಆನ್ ಮಾಡಲು ಬಯಸುತ್ತದೆ.\n\nಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಬಯಸುವ ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಇದಕ್ಕೆ ಅನುಮತಿಸುವುದೇ?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ಇದನ್ನು ಆಫ್ ಮಾಡಲು, ಓವರ್ಫ್ಲೋ ಮೆನುವಿನಲ್ಲಿನ ಸುಧಾರಿತ ಗೆ ಹೋಗಿ."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ಅನುಮತಿಸಿ"</string>
@@ -909,10 +933,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ಬ್ಯಾಂಡ್"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ನಿಮ್ಮ ಇತರ ಸಾಧನಗಳಿಗೆ ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ ರಚಿಸಲು ಹಾಟ್ಸ್ಪಾಟ್ ಬಳಸಿ. ನಿಮ್ಮ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಬಳಸಿಕೊಂಡು ಹಾಟ್ಸ್ಪಾಟ್ ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಒದಗಿಸುತ್ತದೆ. ಹೆಚ್ಚುವರಿ ಮೊಬೈಲ್ ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ಹತ್ತಿರದ ಸಾಧನಗಳೊಂದಿಗೆ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಹಾಟ್ಸ್ಪಾಟ್ ಅನ್ನು ಸಹ ರಚಿಸಬಹುದು."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹಾಟ್ಸ್ಪಾಟ್ ಆಫ್ ಮಾಡಿ"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"ಯಾವುದೇ ಸಾಧನಗಳು ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲದಿದ್ದಾಗ ವೈ-ಫೈ ಹಾಟ್ಸ್ಪಾಟ್ ಆಫ್ ಆಗುತ್ತದೆ"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"ಹಾಟ್ಸ್ಪಾಟ್ ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"ಹಾಟ್ಸ್ಪಾಟ್ ಆಫ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ಸಕ್ರಿಯವಾಗಿದೆ"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಆನ್ ಮಾಡಿ"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ಬದಲಿಗೆ ವೈ-ಫೈ ಬಳಸಿ"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"ತುರ್ತು ವಿಳಾಸ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ವೈ-ಫೈ ಮೂಲಕ ತುರ್ತು ಕರೆಯನ್ನು ನೀವು ಮಾಡಿದಾಗ ನಿಮ್ಮ ಸ್ಥಳದಂತೆ ಬಳಸಲಾಗುತ್ತದೆ"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"ಖಾಸಗಿ DNS ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಕುರಿತು "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"ಪ್ರದರ್ಶನ"</string>
<string name="sound_settings" msgid="5534671337768745343">"ಧ್ವನಿ"</string>
<string name="all_volume_title" msgid="4296957391257836961">"ವಾಲ್ಯುಮ್ಗಳು"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ಪ್ರಕಾರ"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"ಆಪರೇಟರ್ ಮಾಹಿತಿ"</string>
<string name="status_data_state" msgid="5503181397066522950">"ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ಸ್ಥಿತಿ"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"ಸೇವೆ ಸ್ಥಿತಿ"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"ಸಿಗ್ನಲ್ ಸಾಮರ್ಥ್ಯ"</string>
<string name="status_roaming" msgid="2638800467430913403">"ರೋಮಿಂಗ್"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ನಿಮ್ಮ ಹೊಸ <xliff:g id="NAME">^1</xliff:g> ಕೆಲಸ ಮಾಡುತ್ತಿದೆ. \n\nಈ ಸಾಧನಕ್ಕೆ ಫೋಟೋಗಳು, ಫೈಲ್ಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ಸರಿಸಲು, ಸೆಟ್ಟಿಂಗ್ಗಳು > ಸಂಗ್ರಹಣೆಗೆ ಹೋಗಿ."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ಅನ್ನು ಸರಿಸಿ"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ಮತ್ತು ಅದರ ಡೇಟಾವನ್ನು <xliff:g id="NAME_0">^2</xliff:g> ಗೆ ಸರಿಸಲು ಕೆಲವು ಕ್ಷಣಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು. ಸರಿಸುವುದು ಪೂರ್ಣಗೊಳ್ಳುವವರೆಗೆ ನಿಮಗೆ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಸರಿಸುವಾಗ <xliff:g id="NAME_1">^2</xliff:g> ಅನ್ನು ತೆಗೆದುಹಾಕಬೇಡಿ."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ಡೇಟಾವನ್ನು ಸರಿಸಲು ನೀವು ಬಳಕೆದಾರರ <xliff:g id="APP">^1</xliff:g> ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಬೇಕಾಗಿದೆ."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ಅನ್ನು ಸರಿಸಲಾಗುತ್ತಿದೆ…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ಸರಿಸುವಾಗ <xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ತೆಗೆದುಹಾಕಬೇಡಿ. \n\nಈ ಸಾಧನದಲ್ಲಿರುವ <xliff:g id="APP">^2</xliff:g> ಅಪ್ಲಿಕೇಶನ್ ಸರಿಸುವುದು ಪೂರ್ಣಗೊಳ್ಳುವವರೆಗೆ ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ಸರಿಸುವುದನ್ನು ರದ್ದುಮಾಡಿ"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"ನೆಟ್ವರ್ಕ್, ಅಪ್ಲಿಕೇಶನ್ಗಳು ಅಥವಾ ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸಬಹುದಾಗಿದೆ"</string>
<string name="reset_network_title" msgid="6166025966016873843">"ವೈ-ಫೈ, ಮೊಬೈಲ್ ಮತ್ತು ಬ್ಲೂಟೂತ್ ಮರುಹೊಂದಿಸಿ"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"ಕೆಳಗಿನವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಇದು ಎಲ್ಲಾ ನೆಟ್ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ:\n\n"<li>"ವೈ-ಫೈ"</li>\n<li>"ಮೊಬೈಲ್ ಡೇಟಾ"</li>\n<li>"ಬ್ಲೂಟೂತ್"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"eSIM ಗಳನ್ನು ಸಹ ಮರುಹೊಂದಿಸಿ"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮರುಹೊಂದಿಸು"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"ಎಲ್ಲಾ ನೆಟ್ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ? ನಿಮಗೆ ಈ ಕ್ರಮವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮರುಹೊಂದಿಸು"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"ಮರುಹೊಂದಿಸುವುದೇ?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"ಈ ಬಳಕೆದಾರರಿಗೆ ನೆಟ್ವರ್ಕ್ ಮರುಹೊಂದಿಕೆ ಲಭ್ಯವಿಲ್ಲ"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"ನೆಟ್ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್ ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM ಗಳನ್ನು ಮರುಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"ದೋಷದ ಕಾರಣದಿಂದಾಗಿ eSIM ಅನ್ನು ಮರುಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
<string name="master_clear_title" msgid="3531267871084279512">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM ನಲ್ಲಿನ ವಾಹಕಗಳು"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM ಗಳು"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ಇದು ನಿಮ್ಮ ಮೊಬೈಲ್ ಸೇವಾ ಯೋಜನೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"USB ಸಂಗ್ರಹಣೆಯನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಬಳಕೆದಾರರ ಇತರೆ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"SD ಕಾರ್ಡ್ ಅನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"ದಯವಿಟ್ಟು ಇಂಟರ್ನೆಟ್ಗೆ ಸಂಪರ್ಕಿಸಿ"</string>
<string name="location_title" msgid="1029961368397484576">"ನನ್ನ ಸ್ಥಳ"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ನ ಸ್ಥಳ"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"ಮೋಡ್"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ಅಧಿಕ ನಿಖರತೆ"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ಬ್ಯಾಟರಿ ಉಳಿತಾಯ"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"ಸಾಧನ ಮಾತ್ರ"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"ಸ್ಥಳ ಆಫ್"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"ಅಪ್ಲಿಕೇಶನ್ ಹಂತದ ಅನುಮತಿಗಳು"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"ಇತ್ತೀಚಿನ ಸ್ಥಳ ವಿನಂತಿಗಳು"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"ಇತ್ತೀಚೆಗೆ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಸ್ಥಳವನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"ಸ್ಥಳ ಸೇವೆಗಳು"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"ಹೆಚ್ಚು ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"ಕಡಿಮೆ ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"ಸ್ಥಳ ಮೋಡ್"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS, ವೈ-ಫೈ, ಬ್ಲೂಟೂತ್ ಅಥವಾ ಮತ್ತು ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ಬಳಸಿ"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು ವೈ-ಫೈ, ಬ್ಲೂಟೂತ್ ಅಥವಾ ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ಬಳಸಿ"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು, GPS ಹಾಗೂ ಸಾಧನದ ಸೆನ್ಸರ್ಗಳನ್ನು ಬಳಸಿ"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"ಸ್ಕ್ಯಾನ್ ಮಾಡುವಿಕೆ"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಿಸ್ಟಂ ಸೇವೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ."</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"ಸ್ಥಳ ಮೂಲಗಳು"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"ಕಾನೂನು ಮಾಹಿತಿ, ಸ್ಥಿತಿ, ಸಾಫ್ಟ್ವೇರ್ ಆವೃತ್ತಿಯನ್ನು ವೀಕ್ಷಿಸಿ"</string>
<string name="legal_information" msgid="5769301644270604095">"ಕಾನೂನು ಮಾಹಿತಿ"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"ಎಲ್ಲಾ <xliff:g id="COUNT">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಹಾಗೂ ವೈಯಕ್ತಿಕ ಡೇಟಾ, ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್ಗಳ ದಾಳಿಗೆ ತುತ್ತಾಗುವ ಸಾಧ್ಯತೆ ಹೆಚ್ಚಾಗಿದೆ. ಈ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಸ್ಥಾಪಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಫೋನ್ಗೆ ಯಾವುದೇ ಹಾನಿ ಉಂಟಾದರೆ ಅಥವಾ ಅವುಗಳ ಬಳಕೆಯಿಂದ ಡೇಟಾ ನಷ್ಟವಾದರೆ, ಅದಕ್ಕೆ ನೀವೇ ಜವಾಬ್ದಾರರು ಎನ್ನುವುದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"ನಿಮ್ಮ ಫೋನ್ ಹಾಗೂ ವೈಯಕ್ತಿಕ ಡೇಟಾ, ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್ಗಳ ದಾಳಿಗೆ ತುತ್ತಾಗುವ ಸಾಧ್ಯತೆ ಹೆಚ್ಚಾಗಿದೆ. ಈ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಸ್ಥಾಪಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಫೋನ್ಗೆ ಯಾವುದೇ ಹಾನಿ ಉಂಟಾದರೆ ಅಥವಾ ಅವುಗಳ ಬಳಕೆಯಿಂದ ಡೇಟಾ ನಷ್ಟವಾದರೆ, ಅದಕ್ಕೆ ನೀವೇ ಜವಾಬ್ದಾರರು ಎನ್ನುವುದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"ನಿಮ್ಮ ಸಾಧನ ಹಾಗೂ ವೈಯಕ್ತಿಕ ಡೇಟಾ, ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್ಗಳ ದಾಳಿಗೆ ತುತ್ತಾಗುವ ಸಾಧ್ಯತೆ ಹೆಚ್ಚಾಗಿದೆ. ಈ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡುವ ಮೂಲಕ, ನಿಮ್ಮ ಫೋನ್ಗೆ ಯಾವುದೇ ಹಾನಿ ಉಂಟಾದರೆ ಅಥವಾ ಅವುಗಳ ಬಳಕೆಯಿಂದ ಡೇಟಾ ನಷ್ಟವಾದರೆ, ಅದಕ್ಕೆ ನೀವೇ ಜವಾಬ್ದಾರರು ಎನ್ನುವುದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ."</string>
<string name="advanced_settings" msgid="1777249286757067969">"ಸುಧಾರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"ಇನ್ನಷ್ಟು ಸೆಟ್ಟಿಂಗ್ಗಳ ಆಯ್ಕೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"</string>
<string name="application_info_label" msgid="5736524913065714880">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ಕಾರ್ಯಕ್ಷಮತೆಯ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರಬಹುದು"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ಪಾಯಿಂಟರ್ ನಿಂತ ಬಳಿಕ ಕ್ಲಿಕ್"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ಕ್ಲಿಕ್ ಮಾಡುವ ಮೊದಲು ವಿಳಂಬ"</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_summary_state_enabled" msgid="8359913912320966304">"ಆನ್"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ಆಫ್"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ತೋರಿಸು"</string>
@@ -1987,7 +2015,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> ಉಳಿದಿದೆ"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"ಚಾರ್ಜ್ ಮಾಡಲು <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿ ನೀಡಿ"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"ಬಳಕೆಯಲ್ಲಿಲ್ಲದಿದ್ದಾಗ, ಅಪ್ಲಿಕೇಶನ್ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗಬಹುದು"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"ಬಳಕೆಯಲ್ಲಿಲ್ಲದಿದ್ದಾಗ, ಅಪ್ಲಿಕೇಶನ್ನ ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ ಸೀಮಿತವಾಗಿರುತ್ತದೆ"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"ಬ್ಯಾಟರಿ ಉತ್ತಮ ಆಕಾರದಲ್ಲಿದೆ"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ಅಪ್ಲಿಕೇಶನ್ಗಳು ಸಾಮಾನ್ಯವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತವೆ"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ಕಡಿಮೆ ಬ್ಯಾಟರಿ ಸಾಮರ್ಥ್ಯ"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ಬ್ಯಾಟರಿ ಉತ್ತಮ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆ ಒದಗಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"ಸ್ಮಾರ್ಟ್ ಬ್ಯಾಟರಿ ನಿರ್ವಾಹಕವನ್ನು ಆನ್ ಮಾಡಿ"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಅಪ್ಟಿಮೈಸ್ ಮಾಡಲು ಆನ್ ಮಾಡಿ"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"ಕಡಿಮೆ ಬ್ಯಾಟರಿ ಮೋಡ್ ಅನ್ನು ಆನ್ ಮಾಡಿ"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ವಿಸ್ತರಿಸಿ"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"ಕಡಿಮೆ ಬ್ಯಾಟರಿ ಮೋಡ್ ಆನ್ ಆಗಿದೆ"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"ಕೆಲವು ವೈಶಿಷ್ಟ್ಯಗಳು ಸೀಮಿತವಾಗಿವೆ"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ಫೋನ್ ಅನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ಸಾಧನವನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್ನಿಂದ <xliff:g id="HOUR">%1$s</xliff:g> ಗಳಷ್ಟು ಬಳಕೆ"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ ಮತ್ತು ಇದು ತುಂಬ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಿಕೊಂಡಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಸಾಮಾನ್ಯವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿದೆ.\n\n ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್ನಿಂದ <xliff:g id="HOUR">%1$s</xliff:g> ಗಳಷ್ಟು ನಿಮ್ಮ ಫೋನ್ ಬಳಕೆಮಾಡಿಕೊಂಡಿದೆ. \n\n ಒಟ್ಟು ಬಳಕೆ:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ ಮತ್ತು ಇದು ತುಂಬ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಿಕೊಂಡಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಸಾಮಾನ್ಯವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿದೆ. \n\n ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್ನಿಂದ <xliff:g id="HOUR">%1$s</xliff:g> ಗಳಷ್ಟು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬಳಕೆಮಾಡಿಕೊಂಡಿದೆ. \n\n ಒಟ್ಟು ಬಳಕೆ:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ ಮತ್ತು ಇದು ತುಂಬ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಿಕೊಂಡಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಸಾಮಾನ್ಯವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿದೆ. \n\n ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್ನಿಂದ <xliff:g id="HOUR">%1$s</xliff:g> ಗಳಷ್ಟು ನಿಮ್ಮ ಸಾಧನ ಬಳಕೆಮಾಡಿಕೊಂಡಿದೆ.\n\n ಒಟ್ಟು ಬಳಕೆ:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"ಸ್ಮಾರ್ಟ್ ಬ್ಯಾಟರಿ ನಿರ್ವಾಹಕರು"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"ಸ್ವಯಂ-ನಿರ್ವಾಹಕ ಬ್ಯಾಟರಿ"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"ಬಳಕೆಯನ್ನು ಆಧರಿಸಿಕೊಂಡು ಅಪ್ಲಿಕೇಶನ್ಗಳ ಮೂಲಕ ಪವರ್ ಬಳಕೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸರಿಹೊಂದಿಸಿ"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"ನಿರ್ಬಂಧಿತ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d ಅಪ್ಲಿಕೇಶನ್ಗಳು</item>
+ <item quantity="other">%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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"ಮಾಧ್ಯಮಸರ್ವರ್"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ಅಪ್ಲಿಕೇಶನ್ ಆಪ್ಟಿಮೈಸೇಷನ್"</string>
<string name="battery_saver" msgid="8172485772238572153">"ಬ್ಯಾಟರಿ ಸೇವರ್"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"ಬ್ಯಾಟರಿ ಸೇವರ್ ಬಳಸಿ"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುವಿಕೆ"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ಎಂದಿಗೂ ಬೇಡ"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"ಬ್ಯಾಟರಿಯಲ್ಲಿ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"ಸಿಂಕ್ ಈಗ ಕೊಂಚ ಸಮಸ್ಯೆ ಎದುರಿಸುತ್ತಿದೆ. ಶೀಘ್ರದಲ್ಲಿಯೇ ಅದು ಯಥಾಸ್ಥಿತಿಗೆ ಬರಲಿದೆ."</string>
<string name="add_account_label" msgid="7811707265834013767">"ಖಾತೆ ಸೇರಿಸಿ"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಇನ್ನೂ ಲಭ್ಯವಿಲ್ಲ"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"ಕೆಲಸದ ಮೋಡ್"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"ಅಪ್ಲಿಕೇಶನ್ಗಳು, ಹಿನ್ನೆಲೆ ಸಿಂಕ್ ಮತ್ತು ಇತರ ಸಂಬಂಧಿತ ವೈಶಿಷ್ಟ್ಯಗಳು ಸೇರಿದಂತೆ ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಕಾರ್ಯನಿರ್ವಹಿಸಲು ಅನುಮತಿಸಿ"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ತೆಗೆದುಹಾಕಿ"</string>
<string name="background_data" msgid="5779592891375473817">"ಹಿನ್ನೆಲೆ ಡೇಟಾ"</string>
<string name="background_data_summary" msgid="8328521479872763452">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಡೇಟಾವನ್ನು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಸಿಂಕ್ ಮಾಡಬಹುದು, ಕಳುಹಿಸಬಹುದು ಮತ್ತು ಸ್ವೀಕರಿಸಬಹುದು."</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"ಖಾತೆಯನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ಈ ಖಾತೆಯನ್ನು ತೆಗೆದುಹಾಕುವುದರಿಂದ ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿರುವ ಅದರ ಎಲ್ಲ ಸಂದೇಶಗಳು, ಸಂಪರ್ಕಗಳು ಮತ್ತು ಇತರೆ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ಈ ಖಾತೆಯನ್ನು ತೆಗೆದುಹಾಕುವುದರಿಂದ ಫೋನ್ನಲ್ಲಿರುವ ಅದರ ಸಂದೇಶಗಳು, ಸಂಪರ್ಕಗಳು, ಮತ್ತು ಇತರ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"ಈ ಖಾತೆಯನ್ನು ತೆಗೆದುಹಾಕುವುದರಿಂದ ಸಾಧನದಲ್ಲಿರುವ ಅದರ ಎಲ್ಲ ಸಂದೇಶಗಳು, ಸಂಪರ್ಕಗಳು ಮತ್ತು ಇತರೆ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"ಈ ಬದಲಾವಣೆಗೆ ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
<string name="provider_label" msgid="7724593781904508866">"ಚಂದಾದಾರಿಕೆಗಳನ್ನು ಒತ್ತಿ"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="one">ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಪರಿಶೀಲಿಸಿ</item>
<item quantity="other">ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಪರಿಶೀಲಿಸಿ</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"ಬಳಕೆದಾರರು"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"ಬಳಕೆದಾರರು & ಪ್ರೊಫೈಲ್ಗಳು"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ಬಳಕೆದಾರ ಅಥವಾ ಪ್ರೊಫೈಲ್ ಸೇರಿಸಿ"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ಬ್ಲೂಟೂತ್, ಬಿತ್ತರಿಸುವಿಕೆ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ಆಪ್ಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ಅನುಮತಿಗಳು, ಡಿಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"ಬಳಕೆದಾರರು ಮತ್ತು ಖಾತೆಗಳು"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ತೊಂದರೆ ಮಾಡಬೇಡ, ತಡೆ, ತೊಂದರೆ, ವಿರಾಮ"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"ಸಮೀಪದ ಸಾಧನ, ಸ್ಥಳ, ಇತಿಹಾಸ, ವರದಿ ಮಾಡುವಿಕೆ"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"ನಿಖರತೆ"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"ಖಾತೆ"</string>
<string name="keywords_users" msgid="3434190133131387942">"ನಿರ್ಬಂಧ, ನಿರ್ಬಂಧಿಸು, ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ಪಠ್ಯ ತಿದ್ದುಪಡಿ, ಸರಿಪಡಿಸು, ಶಬ್ದ, ವೈಬ್ರೇಟ್, ಸ್ವಯಂ, ಭಾಷೆ, ಗೆಸ್ಚರ್, ಸಲಹೆ ನೀಡಿ, ಸಲಹೆ, ಥೀಮ್, ಆಕ್ಷೇಪಾರ್ಹ, ಪದ, ಪ್ರಕಾರ, ಎಮೊಜಿ, ಅಂತರರಾಷ್ಟ್ರೀಯ"</string>
@@ -2872,6 +2924,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ನಿಯಮಗಳು</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಆನ್ ಮಾಡಿ"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ವರ್ತನೆ"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ಧ್ವನಿ, ವೈಬ್ರೇಷನ್ಗೆ ಅನುಮತಿಸಿ"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ಧ್ವನಿ ಇಲ್ಲ"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಿ"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"ಸ್ವಯಂಚಾಲಿತ ನಿಯಮಗಳು"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"ಸ್ವಯಂಚಾಲಿತ ನಿಯಮ"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ನಿಯಮ ಹೊಂದಿಸಿ"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ಕೆಲವು ಸಲ ಧ್ವನಿ-ವೈಬ್ರೇಶನ್ ಸೀಮಿತ"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"ಸಂಪೂರ್ಣ ನಿಶ್ಯಬ್ಧ"</string>
@@ -2890,12 +2946,15 @@
<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_add" msgid="90014394953272517">"ಸೇರಿಸಿ"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ಈಗ ಆನ್ ಮಾಡಿ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ಈಗ ಆಫ್ ಮಾಡಿ"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"ಆನ್ ಮಾಡಿ"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ಇದೀಗ ಆನ್ ಮಾಡಿ"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ಈಗ ಆಫ್ ಮಾಡಿ"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ <xliff:g id="FORMATTED_TIME">%s</xliff:g> ವರೆಗೆ ಆನ್ ಆಗಿದೆ"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"ನೀವು ಅದನ್ನು ಆಫ್ ಮಾಡುವವರೆಗೆ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಹಾಗೆಯೇ ಇರುತ್ತದೆ"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ (<xliff:g id="RULE_NAME">%s</xliff:g>) ನಿಯಮದ ಮೂಲಕ ಆನ್ ಮಾಡಲಾಗಿದೆ"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಪ್ಲಿಕೇಶನ್ (<xliff:g id="APP_NAME">%s</xliff:g>) ಮೂಲಕ ಆನ್ ಮಾಡಲಾಗಿದೆ"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"ಆದ್ಯತೆ ಮಾತ್ರ"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2970,7 @@
<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="recent_notifications" msgid="5660639387705060156">"ಇತ್ತೀಚೆಗೆ ಕಳುಹಿಸಿರುವುದು"</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>
@@ -2930,7 +2990,7 @@
<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_importance_title" msgid="848692592679312666">"ಪ್ರಾಮುಖ್ಯತೆ"</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="5455049524984686275">"ಯಾವುದೇ ಧ್ವನಿ ಅಥವಾ ದೃಶ್ಯ ಅಡಚಣೆಗಳಿಲ್ಲ"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"ಮಧ್ಯಮ ಪ್ರಾಮುಖ್ಯತೆ"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"ಅಧಿಸೂಚನೆ ಪ್ರವೇಶ"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ಅಧಿಸೂಚನೆಗಳಿಗೆ ಪ್ರವೇಶವನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆ"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಪ್ರಕಾರದ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಅಧಿಸೂಚನೆಗಳ ಗುಂಪನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಪ್ರಕಾರದ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಅಧಿಸೂಚನೆಗಳ ಗುಂಪನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
<string name="notification_channels" msgid="5346841743182627500">"ವಿಭಾಗಗಳು"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"ಇತರೆ"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್ಗಳೂ ಸೇರಿದಂತೆ ಯಾವುದೇ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \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="1793719723017395175">"ಹೌದು"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"ಇಲ್ಲ"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN ಅಗತ್ಯವಿದೆಯೇ?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆಯೇ?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿದೆಯೇ?"</string>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"ಪ್ರಸ್ತುತ ಬಳಕೆದಾರರು: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> ಎಂಬುದಾಗಿ ಸೈನ್ ಇನ್ ಮಾಡಲಾಗಿದೆ"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಡಿಫಾಲ್ಟ್ ಆಗಿದೆ"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ಆನ್ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ಆಫ್"</string>
<string name="backup_disabled" msgid="485189128759595412">"ಬ್ಯಾಕ್ಅಪ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> ಗೆ ಅಪ್ಡೇಟ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"ಬ್ಯಾಕ್ಅಪ್ಗಳನ್ನು ಆಫ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"ಈ ಕ್ರಿಯೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಇನ್ನಷ್ಟು ತಿಳಿಯಲು, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"ಇನ್ನಷ್ಟು ವಿವರಗಳು"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್ ಪ್ರವೇಶ, ನೆಟ್ವರ್ಕ್ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ಗೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಆಫ್ ಆಗಿದೆ"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ಗೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್ಗಳು, ಹಿನ್ನೆಲೆ ಸಿಂಕ್ ಮತ್ತು ಇತರ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆಫ್ ಮಾಡಲಾಗಿದೆ."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"ನೈಟ್ ಲೈಟ್ ವೇಳಾಪಟ್ಟಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ನಿದ್ರೆಗಾಗಿ, ಪರದೆಗೆ ಆಂಬರ್ ಟಿಂಟ್"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"ನೈಟ್ ಲೈಟ್ ಆನ್ ಆಗಿದೆ"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ಹೆಚ್ಚು"</string>
@@ -3537,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"ಯಾವುದೂ ಅಲ್ಲ"</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>
@@ -3559,31 +3628,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ಹಲವು ಸಾಧನಗಳಿಗೆ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
<string name="demo_mode" msgid="2798762752209330277">"ಸಿಸ್ಟಂ UI ಡೆಮೋ ಮೋಡ್"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ಡೆವಲಪರ್ ಟೈಲ್ಸ್ನ ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"ಸಹಾಯಕ್ಕೆ ನಾವು ಇಲ್ಲಿದ್ದೇವೆ"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ನಿಮಗಾಗಿ ನಾವು 24/7 ಇಲ್ಲಿರುತ್ತೇವೆ"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"ನಿಮಗಾಗಿ ನಾವು 24 7 ಇಲ್ಲಿರುತ್ತೇವೆ"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"ಯಾವುದೇ ಸಮಸ್ಯೆಯನ್ನು ಇತ್ಯರ್ಥಗೊಳಿಸಲು ನಮ್ಮ ಸಹಾಯ ತಂಡವು ಇಲ್ಲಿದೆ"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ನಮ್ಮ ಬೆಂಬಲ ತಂಡವು ದಿನದಾದ್ಯಂತ ಪ್ರತಿ ದಿನ ಲಭ್ಯವಿರುತ್ತದೆ"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"ಸಹಾಯವನ್ನು ಹುಡುಕಿ ಅಥವಾ ಬೆಂಬಲದ ಸಮಯದ ಅವಧಿಯಲ್ಲಿ (ಸ್ಥಳೀಯ ಸಮಯ) ಹಿಂತಿರುಗಿ:<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ಫೋನ್ ಬೆಂಬಲ ಸಮಯ (ಸ್ಥಳೀಯ ಸಮಯ)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ಸಹಾಯಕ್ಕಾಗಿ ಹುಡುಕಿ ಅಥವಾ ಸುಳಿವುಗಳು & ಕೈಚಳಕಗಳನ್ನು ಎಕ್ಸ್ಪ್ಲೋರ್ ಮಾಡಿ"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"ಬೆಂಬಲ:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"ವಿದೇಶಕ್ಕೆ ಪ್ರಯಾಣಿಸುತ್ತಿರುವಿರಾ?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"ಅಂತಾರಾಷ್ಟ್ರೀಯ ದರಗಳು ಅನ್ವಯವಾಗಬಹುದು"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"ಫೋನ್"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"ಚಾಟ್"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ಸಲಹೆಗಳು ಮತ್ತು ತಂತ್ರಗಳನ್ನು ಎಕ್ಸ್ಪ್ಲೋರ್ ಮಾಡಿ"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"ಸಹಾಯ ಹುಡುಕಾಟ ಮತ್ತು ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಿ"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"ಸಂಪರ್ಕ ಬೆಂಬಲ"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"ಸೈನ್ ಇನ್"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"ಸೈನ್ ಇನ್ ಆಗಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲವೇ?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"ಸಿಸ್ಟಂ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಿ"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ಮತ್ತೆ ತೋರಿಸಬೇಡ"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"ಇದರಂತೆ ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"ಖಾತೆ ಸೇರಿಸಿ"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"ಸಿಸ್ಟಂ ಮಾಹಿತಿ"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"ವಿಂಡೋ ಟ್ರೇಸ್"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ಮೇಲ್ಮೈ ಟ್ರೇಸ್ ಮಾಡಿ"</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>
@@ -3599,11 +3645,11 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ಸೆಕೆಂಡುಗಳು</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ಸೆಕೆಂಡುಗಳು</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> ಕಾಯಿರಿ"</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="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>
@@ -3614,32 +3660,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ಕ್ಯಾಮರಾ ತೆರೆಯಲು ಪವರ್ ಬಟನ್ ಅನ್ನು ಎರಡು ಬಾರಿ ಒತ್ತಿ"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"ಸೆಲ್ಫೀ ಮೋಡ್ಗಾಗಿ ಫೋನ್ ಅನ್ನು ಎರಡು ಬಾರಿ ತಿರುಗಿಸಿ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"ಸೆಲ್ಫೀ ಮೋಡ್ಗಾಗಿ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಎರಡು ಬಾರಿ ತಿರುಗಿಸಿ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"ಸೆಲ್ಫೀ ಮೋಡ್ಗಾಗಿ ಸಾಧನವನ್ನು ಎರಡು ಬಾರಿ ತಿರುಗಿಸಿ"</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_suggestion_summary" msgid="5987443721392571847">"ಪರದೆ ಆಫ್ ಆಗಿರುವಾಗ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ"</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_pickup_suggestion_summary" msgid="7014700589991761035">"ಪರದೆ ಆಫ್ ಆಗಿರುವಾಗ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಸಾಧನದ ಹಿಂಭಾಗದಲ್ಲಿನ ಬೆರಳಚ್ಚು ಸೆನ್ಸರ್ನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"ತ್ವರಿತವಾಗಿ ಅಧಿಸೂಚನೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ನ ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"ಆನ್"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"ಆಫ್"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ಬೂಟ್ಲೋಡರ್ ಅನ್ನು ಈಗಾಗಲೇ ಅನ್ಲಾಕ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -3769,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"ಡೈರೆಕ್ಟರಿ ಪ್ರವೇಶ"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"ಡೈರೆಕ್ಟರಿ ಪ್ರವೇಶ"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index cd61471..9f26b73 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Баскычты басыңыз"</item>
<item msgid="1624323946324499595">"Туташуучу түзмөктүн PIN\'и"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 саат"</item>
<item msgid="5198271470953124739">"Токтотпоо"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (Демейки)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Начар"</item>
<item msgid="2042505933058940139">"Начар"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 күндөн мурунку"</item>
<item msgid="5692284879054004388">"90 күндөн мурунку"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Тармакты колдонуу"</item>
+ <item msgid="8745603368609022803">"Ченелет"</item>
+ <item msgid="2266114985518865625">"Ченелбейт"</item>
+ </string-array>
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 4bce592..6e7a441 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -169,6 +169,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Түзмөктөрүңүз"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңы түзмөктү жупташтыруу"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Түзмөккө башка bluetooth түзмөктөрү менен жупташтырылып, туташууга уруксат берүү"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Канал аралык чалууну өчүрүү"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Bluetooth гарнитураларында жеке рингтондор ойнотулбасын"</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>
@@ -329,6 +331,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Күндү коюу"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Алфавит боюнча иргөө"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Убакыт алкагы боюнча иргөө"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> күнү башталат."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Жайкы убакыт"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Стандарттык убакыт"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Аймак боюнча убакыт алкагы"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Туруктуу убакыт алкактары"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Күн"</string>
<string name="time_picker_title" msgid="483460752287255019">"Убакыт"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Автокулпу"</string>
@@ -339,6 +346,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Кулпу экрндгы текст"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Виджеттерди жандыруу"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Администратор өчүрүп койгон"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Кулпулоо опциясын көрсөтүү"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Толук кирүү мүмкүнчүлүгүн берген жана манжа изи менен кулпусун ачуу жөндөөсүн күйгүзүү/өчүрүү баскычы көрсөтүлсүн."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Эч бири"</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">"Мисалы, Асандын Android түзмөгү."</string>
@@ -347,6 +356,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Профилдин чоо-жайы"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Каттоо эсептери"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлөө жана эсептик дайындар"</string>
@@ -458,9 +468,11 @@
<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="8971630898700461034">"Экран кулпусун коюу"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Түзмөгүңүздү коргоңуз"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Манжа изин колдонуу"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Коопсздк үчүн экрандн кулпсун коюу"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Планшетиңизди колдонуудан башкаларды бөгөттөңүз"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Түзмөгүңүздү колдонуудан башкаларды бөгөттөңүз"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Телефонуңузду колдонуудан башкаларды бөгөттөңүз"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Кулпуну манжа изи менен ачуу"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Манжа изиңиз менен кулпусун ачыңыз"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Экранды кулпулоо"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Жумш прф кулпсн тандоо"</string>
@@ -690,6 +702,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Катуу сүйлөткүч телефон катары"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Музыка жана медиа үчүн"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Жөндөөлөрдү эстеп калуу"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Туташып турган Bluetooth аудио түзмөктөрүнүн эң жогорку саны"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Туташып турган Bluetooth аудио түзмөктөрүнүн эң жогорку санын тандоо"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Тышкы экранга чыгаруу"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Зымсыз дисплейди иштетүү"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Жакын жерден бир дагы түзмөк табылган жок."</string>
@@ -704,6 +718,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Аты"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 ГГц"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ГГц"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Кирүү"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Мгб"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> бул түзмөктө WiFi\'ды күйгүзгөнү жатат"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> бул түзмөктө WiFi\'ды өчүргөнү жатат"</string>
@@ -721,6 +736,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi\'ды жандыруу"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fi\'ды колдонуу"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi тууралоолору"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Зымсыз кошулуу түйүндөрүн орнотуу жана башкаруу"</string>
@@ -815,6 +831,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Сырсөз"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Сырсөздү көрсөтүү"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi жыштыгынын диапазону"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Авто"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 ГГц жыштыгы"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 ГГц жыштыгы"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP жөндөөлөрү"</string>
@@ -832,7 +849,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS жеткиликтүү)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Тармактагы сырсөзүңүздү киргизиңиз"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Оператордун Wi‑Fi тармагы"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> аркылуу туташуу"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> аркылуу туташуу"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Жайгаштыруунун тактыгын жогорулатуу жана башка максаттарда, Wi-Fi өчүк болсо да, <xliff:g id="APP_NAME">%1$s</xliff:g> желелерди скандагысы келет.\n\nБардык скандоону кааалаган колдонмолорго уруксат берелсинби?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Муну өчүрүү үчүн, жөндөөлөр менюсунан Өркүндөтүлгөндөргө өтүңүз."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Уруксат"</string>
@@ -908,10 +925,8 @@
<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_local_only" msgid="857988412470694109">"Жакын жердеги түзмөктөр менен мазмунду бөлүшүү үчүн колдонмолор хотспот болуп бере алышат."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Туташуу түйүнү автоматтык түрдө өчүрүлсүн"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Туташкан түзмөктөр жок болсо, Wi‑Fi туташуу түйүнү өчүп калат"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Хотспот жандырылууда…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Хоспот өчүрүлүүдө…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> иштеп жатат"</string>
@@ -922,7 +937,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi чалуу"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi чалууну күйгүзүү"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Мобилдик тармак ордуна Wi-Fi колдонуңуз"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Байланыш аймагын кеңейтүү үчүн 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_roaming_mode_title" msgid="1565039047187685115">"Роуминг жөндөөлөрү"</string>
@@ -960,6 +975,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Өзгөчө кырдаалда кайрыла турган дарек"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"WiFi аркылуу өзгөчө кырдаалдар кызматынын номерине чалганыңызда куткаруучуларга жайгашкан жериңиз катары көрсөтүлөт"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"Жеке DNS функциялары жөнүндө "<annotation id="url">"кененирээк маалымат"</annotation>" алыңыз"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
<string name="sound_settings" msgid="5534671337768745343">"Үн"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Үн бийиктиги"</string>
@@ -1008,8 +1024,8 @@
<string name="account_settings" msgid="6403589284618783461">"Эсептер"</string>
<string name="accessibility_category_work" msgid="4339262969083355720">"Жумуш профилинин каттоо эсептери - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="accessibility_category_personal" msgid="1263518850905945594">"Жеке профилдин каттоо эсептери"</string>
- <string name="accessibility_work_account_title" msgid="1231830766637939527">"Жумуштагы каттоо эсеби - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
- <string name="accessibility_personal_account_title" msgid="2169071663029067826">"Жеке каттоо эсеби - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+ <string name="accessibility_work_account_title" msgid="1231830766637939527">"Жумуш аккаунту - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+ <string name="accessibility_personal_account_title" msgid="2169071663029067826">"Жеке аккаунт - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="search_settings" msgid="1910951467596035063">"Издөө"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Издөөнүн жөндөөлөрүн жана таржымалын башкаруу"</string>
<string name="search_settings_no_results" msgid="8799027492641230999">"Бир да натыйжа жок"</string>
@@ -1174,6 +1190,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Мобилдик тармак түрү"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Оператор тууралуу"</string>
<string name="status_data_state" msgid="5503181397066522950">"Мобилдик тармак абалы"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Кызматтын абалы"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Сигналдын күчү"</string>
<string name="status_roaming" msgid="2638800467430913403">"Роуминг"</string>
@@ -1307,6 +1324,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Сиздин жаңы <xliff:g id="NAME">^1</xliff:g> иштеп жатат. \n\nСүрөттөр, файлдар жана колдонмо дайындарын бул түзмөккө жылдыруу үчүн, Жөндөөлөр > Сактагычка өтүңүз."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> колдонмосун жылдыруу"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> жана анын дайындарын <xliff:g id="NAME_0">^2</xliff:g> ичине жылдыруу бир нече көз ирмемге гана созулат. Жылдыруу аяктамайынча колдонмону пайдалана албай каласыз. \n\nЖылдыруу учурунда <xliff:g id="NAME_1">^2</xliff:g> түзмөгүн чыгарбаңыз."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Дайындарды жылдыруу үчүн <xliff:g id="APP">^1</xliff:g> бөгөттөн чыгарылышы керек."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> жылдырылууда…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Жылдыруу учурунда <xliff:g id="NAME">^1</xliff:g> түзмөгүн чыгарбаңыз. \n\nУшул түзмөктөгү <xliff:g id="APP">^2</xliff:g> колдонмосу жылдыруу аяктагыча жеткиликтүү болбойт."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Жылдырууну жокко чыгаруу"</string>
@@ -1359,19 +1377,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Тармактын, колдонмолордун же түзмөктүн жөндөөлөрүн баштапкы абалга келтирсеңиз болот"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi\'ды, мобилдик түзмөктү жана Bluetooth\'ду баштапкы абалга келтирүү"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Ушуну менен тармактын бардык жөндөөлөрү баштапкы абалга келет. Тактап айтканда: \n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилдик Интернет"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Ошондой эле, eSIM-карталар кайра коюлсун"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Телефондогу бардык eSIM-карталар тазалансын. eSIM-карталарыңызды кайра жүктөп алуу үчүн байланыш операторуңузга кайрылышыңыз керек. Муну менен мобилдик кызматыңыз өчүрүлбөйт."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Жөндөөлөрдү баштапкы абалга келтирүү"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Тармак жөндөөлөрүнүн баары баштапкы абалга келтирилсинби? Бул аракетти кайра кайтара албайсыз!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Жөндөөлөрдү баштапкы абалга келтирүү"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Баштапкы абалга келтирилсинби?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Бул колдонуучу тармакты баштапкы абалына келтире албайт"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Тармак жөндөөлөрү баштапкы абалга келди"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM-карталар кайра коюлган жок"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Катадан улам eSIM-карталар кайра коюлган жок."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Бардык дайындарды тазалоо (заводдук абалына келтирүү)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-карта менен иштеген операторлор"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM-карталар"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Ушуну менен байланыш операторуңуздун тарифтик планы жокко чыгарылбайт."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Музыканы, сүрөттөрдү, жана башка колдонуучу берилиштерин өчүрүш үчүн, "<b>"USB сактагычты"</b>" тазалаш керек."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Музыканы, сүрөттөрдү, жана башка колдонуучу берилиштерин өчүрүш үчүн, "<b>"SD-картаны"</b>" тазалаш керек."</string>
@@ -1431,21 +1453,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Интернетке кошулуңуз"</string>
<string name="location_title" msgid="1029961368397484576">"Жайгашкан жерим"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Жумуш профилинин жайгашкн жери"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Жогорку тактык"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Тармактын координаттары боюнча"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Түзмөк гана"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Жайгашкан жерди аныктоо өчүк"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Колдонмонун уруксаттары"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Жакында изделген жерлер"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Акыркы мезгилде жайгашууну сураган колдонмолор болгон жок"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Жайгашкан жерди аныктоо кызматы"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Батарейди көп колдонуу"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Батареянын кубаты үнөмдөлүүдө"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Жайгашкан жерди аныктоо"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Жайгашкан жерди аныктоо үчүн GPS, Wi‑Fi, Bluetooth же мобилдик Интернет колдонулат"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Жайгашкан жерди аныктоо үчүн GPS, Wi‑Fi, Bluetooth же мобилдик Интернет колдонулат"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"GPS жана түзмөктүн сенсорлору аркылуу жайгашкан жери аныкталат"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Издөө"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi тармактарын издөө"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Тутум колдонмолору менен кызматтарына Wi-Fi тармактарын такай издөөгө уруксат берүү менен жайгашкан жерди тагыраак аныктоого болот."</string>
@@ -1467,6 +1480,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Жайгаштыруу булактары"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"Юридикалык маалыматты, абалын, программа версиясын көрүү"</string>
<string name="legal_information" msgid="5769301644270604095">"Юридикалык маалыматтар"</string>
@@ -1574,6 +1588,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g> колдонмонун баарын көрүү"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Планшетиңиз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам планшетиңизге кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефонуңуз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам телефонуңузга кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Түзмөгүңүз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам түзмөгүңүзгө кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Өркүндөтүлгөн жөндөөлөр"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Көбүрөөк тууралоо опцияларын көрсөтүү"</string>
<string name="application_info_label" msgid="5736524913065714880">"Колдонмо тууралуу"</string>
@@ -1873,6 +1888,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Түзмөктүн иштешине кедергисин тийгизиши мүмкүн"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Көрсөткүч токтогондо басуу"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Баскыч басылганга чейин кармалган убакыт"</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_summary_state_enabled" msgid="8359913912320966304">"КҮЙҮК"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ӨЧҮК"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Ылдам тууралоолор абалында көргөзүү"</string>
@@ -1986,7 +2004,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> калды"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> кубаттоо"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Фондогу активдүүлүк"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Чектелген"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Колдонмо фондо аткарылсын"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Колдонмо пайдаланылбаган учурда фондо иштей берет"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Колдонмо пайдаланылбаган учурда фондогу иши чектелет"</string>
@@ -2029,14 +2047,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батарейкасы толук"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Колдонмолор туура иштеп жатышат"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Батарея азыр отуруп калат"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Батарея бир аздан кийин отуруп калат"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Акылдуу батареяны үнөмдөгүчтү күйгүзүү"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Батареянын колдонулушун оптималдаштыруу үчүн күйгүзүү"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Батареяны үнөмдөгүч режимин күйгүзүү"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Батареяңыздын кубатынын мөөнөтүн узартыңыз"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Батареяны үнөмдөгүч режими күйүк"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Айрым функциялар чектелген"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Телефон өтө көп колдонулду"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Планшет өтө көп колдонулду"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Түзмөк өтө көп колдонулду"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Акыркы жолу толук кубатталгандан бери <xliff:g id="HOUR">%1$s</xliff:g> саат колдонулду"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Телефонуңуз өтө көп колдонулду, андыктан батареясы да көп сарпталды. Болбосо, батарея туура иштеп жатат.\n\n Батареяны акыркы жолу толук кубаттагандан бери телефонуңуз <xliff:g id="HOUR">%1$s</xliff:g> саат колдонулду.\n\n Жалпы колдонулушу:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Планшетиңиз өтө көп колдонулду, андыктан батареясы да көп сарпталды. Болбосо, батарея туура иштеп жатат.\n\n Батареяны акыркы жолу толук кубаттагандан бери планшетиңиз <xliff:g id="HOUR">%1$s</xliff:g> саат колдонулду.\n\n Жалпы колдонулушу:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Түзмөгүңүз өтө көп колдонулду, андыктан батареясы да көп сарпталды. Болбосо, батарея туура иштеп жатат.\n\n Батареяны акыркы жолу толук кубаттагандан бери түзмөгүңүз <xliff:g id="HOUR">%1$s</xliff:g> саат колдонулду.\n\n Жалпы колдонулушу:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Акылдуу батареяны үнөмдөгүч"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Батареяны автоматтык түрдө башкаруу"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Колдонулганына жараша батареяны колдонмолордун ортосунда автоматтык түрдө бөлүштүрүү"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Чектелген колдонмолор"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d колдонмо</item>
+ <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>
@@ -2145,6 +2180,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Медиа сервер"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Колдонмону оптималдаштыруу"</string>
<string name="battery_saver" msgid="8172485772238572153">"Батареяны үнөмдөгүч"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Батареяны үнөмдөгүчтү колдонуу"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Автоматтык түрдө күйгүзүү"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Эч качан"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> батарея менен"</string>
@@ -2264,7 +2300,7 @@
<string name="personal_data_section_title" msgid="7815209034443782061">"Жеке дайындар"</string>
<string name="backup_data_title" msgid="1239105919852668016">"Дайындарымдын камдык көчүрмөсү сакталсын"</string>
<string name="backup_data_summary" msgid="708773323451655666">"Колдонмолордун берилиштерин, Wi-Fi сырсөздөрүн жана башка тууралоолорду Google\'дун серверине сактап коюу."</string>
- <string name="backup_configure_account_title" msgid="3790872965773196615">"Көмөкчү каттоо эсеби"</string>
+ <string name="backup_configure_account_title" msgid="3790872965773196615">"Көмөкчү аккаунт"</string>
<string name="include_app_data_title" msgid="2829970132260278394">"Колдонмо дайындарын кошуу"</string>
<string name="auto_restore_title" msgid="5397528966329126506">"Автоматтык түрдө калыбына келтирүү"</string>
<string name="auto_restore_summary" msgid="4235615056371993807">"Колдонмону кайрадан орнотууда, бэкапталган тууралоолорду жана берилиштерди калыбына келтириңиз"</string>
@@ -2336,8 +2372,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Учурда шайкештирүү көйгөйгө дуушар болууда. Ал бир аздан кийин калыбына келет."</string>
<string name="add_account_label" msgid="7811707265834013767">"Каттоо эсебин кошуу"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Жумуш профили азырынча жеткиликтүү эмес"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Иштөө режими"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Жумуш профилин, ошондой эле колдонмолорду, фондо шайкештирүү жана ага байланыштуу функцияларды иштетүү"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Жумуш профили"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Уюмуңуз тарабынан башкарылат"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Колдонмолор менен эскертмелер өчүк"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Жумуш профилин алып салуу"</string>
<string name="background_data" msgid="5779592891375473817">"Фондук дайындар"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Колдонмолордо каалаган убакта синхрондошуу, берилиштерди жөнөтүп, кабыл алуу мүмкүнчүлүгү бар"</string>
@@ -2369,6 +2406,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Эсеп жок кылынсынбы?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Бул эсепти жок кылуу, анын бардык билдирүүлөрүн, байланыштарын жана башка берилиштерин планшеттен өчүрүлүшүнө алып келет!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Бул эсепти жок кылуу, анын бардык билдирүүлөрүн, байланыштарын жана башка берилиштерин телефондон өчүрүлүшүнө алып келет!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Бул аккаунт өчүрүлсө, түзмөктөн ага байланыштуу бардык билдирүүлөр, байланыштар жана башка дайындар жок болот!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Мындай өзгөртүүгө администраторуңуз тыюу салган"</string>
<string name="provider_label" msgid="7724593781904508866">"Жазылууларды көрсөтүү"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2587,7 +2625,8 @@
<item quantity="other">Тастыктамаларды текшерүү</item>
<item quantity="one">Тастыктаманы текшерүү</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Колдонуучулар"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Колдонуучулар жана профайлдар"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Колдонуучу же профиль кошуу"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Колдонуучу кошуу"</string>
@@ -2777,7 +2816,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Колдонмолор/эскертмелер"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Уруксаттар, демейки колдонмолор"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"Колдонуучулар/каттоо эсептер"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2808,8 +2848,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"тынчымды алба, үзүү, үзгүлтүккө учуроо, тыныгуу"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"жакын, жайгашкан жер, таржымал, кабар берүү"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"тактык"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"каттоо эсеби"</string>
+ <string name="keywords_accounts" msgid="1957925565953357627">"аккаунт"</string>
<string name="keywords_users" msgid="3434190133131387942">"чектөө, чектөө, чектелген"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"текст тууралоо, туура, добуш, дирилдөө, авто, тил, жаңсоо, сунуштоо, сунуш, тема, адепсиз, сөз, түрү, быйтыкча, эларалык"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"баштапкы абалга келтирүү, жеке жөндөөлөр, демейки"</string>
@@ -2875,6 +2914,7 @@
<item quantity="one">1 эреже</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Тынчымды албаңыз"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"\"Тынчымды алба\" режимин күйгүзүү"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Аракеттери"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Үндөр жана дирилдөөгө уруксат"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Добушу жок"</string>
@@ -2884,8 +2924,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Автоматтык түрдө күйөт"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Автоматтык эрежелер"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Автоматтык эреже"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\"Тынчымды алба\" режиминин эрежелери"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Белгилүү бир убакыттарда эскертмелерди өчүрүү"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Телефондун үнүн өчүрүүнү жөндөө"</string>
+ <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_no_interruptions" msgid="8107126344850276878">"Тымтырс"</string>
@@ -2893,12 +2934,15 @@
<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_add" msgid="90014394953272517">"Кошуу"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"АЗЫР КҮЙГҮЗҮЛСҮН"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"АЗЫР ӨЧҮРҮЛСҮН"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Күйгүзүү"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Азыр күйгүзүлсүн"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Азыр өчүрүлсүн"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> чейин \"Тынчымды алба\" режими күйгүзүлгөн"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Сиз өчүрмөйүнчө, \"Тынчымды алба\" режими күйүп турат"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"\"Тынчымды алба\" режими автоматтык түрдө <xliff:g id="RULE_NAME">%s</xliff:g> эрежесине ылайык күйгүзүлдү"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"\"Тынчымды алба\" режимин автоматтык түрдө <xliff:g id="APP_NAME">%s</xliff:g> колдонмосу күйгүздү"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Шашылыш эскертмелер гана"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2914,6 +2958,7 @@
<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="recent_notifications" msgid="5660639387705060156">"Акыркы жолу эскертмелерди жөнөткөн колдонмолор"</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>
@@ -2933,7 +2978,7 @@
<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_importance_title" msgid="848692592679312666">"Маанилүүлүгү"</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="5455049524984686275">"Добуш да чыгарбасын, экранда да көрсөтүлбөсүн"</string>
@@ -2951,6 +2996,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Орточо"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"Эскертмелерди иштетүү"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Жумуш профилинин эскертмелерине кирүү бөгөттөлгөн"</string>
@@ -2981,9 +3027,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"\"Тынчымды алба\" функциясы"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Орнотулган колдонмолор үчүн \"Тынчымды алба\" функциясы талап кылынбайт"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Колдонмолор жүктөлүүдө…"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android тутуму бул колдонмонун эскертмелерин бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android тутуму ушул категориядагы эскертмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android тутуму ушул топтогу эскертмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Суранычыңыз боюнча Android бул колдонмонун эскертмелерин бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Суранычыңыз боюнча Android тутуму ушул категориядагы эскертмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Суранычыңыз боюнча Android тутуму ушул топтогу эскертмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
<string name="notification_channels" msgid="5346841743182627500">"Категориялар"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Башка"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3128,6 +3174,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Түзмөгүңүздү коргоо үчүн аны манжа изи же сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\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="1793719723017395175">"Ооба"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Жок"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN талап кылынсынбы?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Үлгү талап кылынсынбы?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Сырсөз талап кылынсынбы?"</string>
@@ -3398,9 +3446,10 @@
<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_and_accounts_summary" msgid="245282689646897882">"Учурдагы колдонуучу: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
- <string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> каттоо эсеби аркылуу кирдиңиз"</string>
+ <string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> аккаунту менен кирдиңиз"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> демейки колдонмо"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"КҮЙҮК / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ӨЧҮК"</string>
<string name="backup_disabled" msgid="485189128759595412">"Камдык көчүрмө өчүрүлгөн"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> версиясына жаңыртылды"</string>
@@ -3410,6 +3459,7 @@
<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="6346948990624612516">"Камдык көчүрмөнү сактоо функциясы өчүрүлбөй жатат"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Бул функция өчүрүлгөн. Көбүрөөк маалымат үчүн ишканаңыздын администраторуна кайрылыңыз."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Көбүрөөк маалымат"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Администратор жумуш профилиңизге байланыштуу колдонмолор менен дайындарды, анын ичинде жөндөөлөр, уруксаттар, корпоративдик кирүү мүмкүнчүлүгү, Интернеттеги аракеттери жана түзмөктүн жайгашкан жери тууралуу маалыматты көзөмөлдөй алат."</string>
@@ -3433,9 +3483,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Жумуш профили өчүрүлгөн"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Жумуш профилиңизге байланыштуу колдонмолор, фондо шайкештирүү сыяктуу функциялар өчүрүлгөн."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Түнкү режимдин графигин түзүү"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Экран саргыч түскө боёлуп, тезирээк уктап каласыз"</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="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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+ Дагы <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3540,6 +3591,8 @@
<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_none" msgid="5144174674654097316">"Жок"</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>
@@ -3562,31 +3615,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Бир нече түзмөккө туташты"</string>
<string name="demo_mode" msgid="2798762752209330277">"Тутум интерфейсинин демо режими"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Иштеп чыгуучунун ыкчам жөндөөлөр такталары"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Жардам берүүгө даярбыз"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Кардарларды колдоо кызматы күнү-түнү иштейт"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Колдоо кызматы күнү-түнү иштейт"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Колдоо кызматыбыздын жамааты бардык маселелерди чечүүгө жардам берет"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Колдоо бөлүмүбүздүн жамааты күн сайын тынымсыз иштейт"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Интернеттен жардам издеп көрүңүз же колдоо көрсөтүү сааттарында (жергиликтүү убакыт боюнча) кайрылып көрүңүз:<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Телефон аркылуу колдоо көрсөтүү сааттары (жергиликтүү убакыт боюнча)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Издөө боюнча жардам берилип, издөө кеңештери менен ыкмалары көрсөтүлөт"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Колдоого алынган өлкө:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Чет өлкөгө саякатка чыгып жатасызбы?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Эл аралык байланыш акысын төлөп калышыңыз мүмкүн"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Маек"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Сунуштар жана пайдалуу кеңештер"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Издөө боюнча жардам алуу/Пикир билдирүү"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Колдоо кызматына кайрылуу"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Кирүү"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Кире албай жатасызбы?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Тутум маалыматын жөнөтүү"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Экинчи көрсөтүлбөсүн"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Ким кайрылып жатат:"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Каттоо эсебин кошуу"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Тутумдун маалыматы"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Терезеге көз салуу"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Калыпка көз салуу"</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>
@@ -3602,11 +3632,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
<item quantity="one">1 секунд</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> күтө туруңуз"</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="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>
@@ -3617,32 +3647,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Камераны ачуу үчүн күйгүзүү/өчүрүү баскычын эки жолу басыңыз"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Селфи режимине өтүү үчүн телефонду эки жолу айландырыңыз"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Селфи режимине өтүү үчүн планшетти эки жолу айландырыңыз"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Селфи режимине өтүү үчүн түзмөктү эки жолу айландырып коюңуз"</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_suggestion_summary" msgid="5987443721392571847">"Эскертмелерди экран өчүп турганда көрүү"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Эскертмелерди экран өчүп турганда көрүү"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Эскертмелериңизди текшерүү үчүн түзмөктүн аркасындагы манжа изинин сенсорун ылдый сүртүп коюңуз."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Эскертмелерди тез көрүү"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Манжа изинин сенсорун ылдый серпиңиз"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Күйүк"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Өчүк"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Иш тутумун жүктөгүчтүн кулпусу мурунтан эле ачылган"</string>
@@ -3772,8 +3795,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Каталогго мүмкүнчүлүк алуу"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"катталууга мүмкүнчүлүк алуу"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"Телефонум"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"Планшетим"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"Түзмөгүм"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Аккаунт"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Түзмөктүн аталышы"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Унаа айдаганда, Bluetooth колднлсун"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Унаа айдап баратканда, Bluetooth автоматтык түрдө күйгүзүлсүн"</string>
</resources>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 546db87..72c6778 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"ປຸ່ມ Push"</item>
<item msgid="1624323946324499595">"PIN ຈາກອຸປະກອນທີ່ເຊື່ອມຕໍ່ກັນ"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 ຊົ່ວໂມງ"</item>
<item msgid="5198271470953124739">"ບໍ່ມີໝົດເວລາ"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (ຄ່າເລີ່ມຕົ້ນ)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"ອ່ອນ"</item>
<item msgid="2042505933058940139">"ອ່ອນ"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"ເກີນ 60 ມື້ແລ້ວ"</item>
<item msgid="5692284879054004388">"ເກີນ 90 ມື້ແລ້ວ"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"ໃຊ້ການຕັ້ງຄ່າເຄືອຂ່າຍ"</item>
+ <item msgid="8745603368609022803">"ໃຊ້ແບບວັດແທກປະລິມານ"</item>
+ <item msgid="2266114985518865625">"ໃຊ້ແບບບໍ່ວັດແທກປະລິມານ"</item>
+ </string-array>
</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index be04668..49558b2 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ອຸປະກອນຂອງທ່ານ"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ຈັບຄູ່ອຸປະກອນໃໝ່"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"ອະນຸຍາດໃຫ້ອຸປະກອນຈັບຄູ່ ແລະ ເຊື່ອມຕໍ່ຫາອຸປະກອນ Bluetooth ໄດ້"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ປິດສຽງໂທເຂົ້າ"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"ຢ່າໃຊ້ຣິງໂທນໂທລະສັບແບບກຳນົດເອງຢູ່ຫູຟັງ Bluetooth"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"ຕັ້ງວັນທີ"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ຮຽງຕາມຕົວອັກສອນ"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ຮຽງຕາມເຂດເວລາ"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> ເລີ່ມເມື່ອ <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"ການປ່ຽນເວລາກາງເວັນ"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"ເວລາມາດຕະຖານ"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"ເຂດເວລາຕາມຂົງເຂດ"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"ເຂດເວລາຊົດເຊີຍຄົງທີ່"</string>
<string name="date_picker_title" msgid="1338210036394128512">"ວັນທີ"</string>
<string name="time_picker_title" msgid="483460752287255019">"ເວລາ"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"ລັອກໂດຍອັດຕະໂນມັດ"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"ຂໍ້ຄວາມລັອກໜ້າຈໍ"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"ເປີດນຳໃຊ້ວິດເຈັດ"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ຖືກຜູ້ເບິ່ງແຍງລະບົບປິດໄວ້"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ບໍ່ມີ"</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">"ຕົວຢ່າງ, Android ຂອງໂຈ."</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"ຂໍ້ມູນໂປຣໄຟລ໌"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"ບັນຊີ"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"ການເຂົ້າລະຫັດ ແລະ ຂໍ້ມູນການເຂົ້າສູ່ລະບົບ"</string>
@@ -459,9 +471,16 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"ລະຫັດຜ່ານທີ່ທ່ານໃສ່ລົງໄປນັ້ນຖືກຕ້ອງແລ້ວ, ແຕ່ຂໍ້ມູນຂອງທ່ານເສຍຫາຍ. \n\n1ເພື່ອກັບໄປນຳໃຊ້ແທັບເລັດຂອງທ່ານ, ທ່ານຕ້ອງຕັ້ງຄ່າແທັບເລັດຂອງທ່ານກັບໄປເປັນຄ່າຈາກໂຮງງານຄືນ. ເມື່ອທ່ານຕັ້ງຄ່າແທັບເລັດຂອງທ່ານຫຼັງຈາກການຕັ້ງຄ່າຄືນ, ທ່ານຈະສາມາດດຶງຂໍ້ມູນທີ່ທ່ານສຳຮອງໄວ້ໃນບັນຊີ Google Account ຂອງທ່ານຄືນມາໄດ້."</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="8971630898700461034">"ຕັ້ງການລັອກໜ້າຈໍ"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ປົກປ້ອງອຸປະກອນຂອງທ່ານ"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"ໃຊ້ລາຍນິ້ວມື"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ປົດລັອກດ້ວຍລາຍນິ້ວມືຂອງທ່ານ"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"ເລືອກການລັອກໜ້າຈໍ"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ເລືອກການລັອກບ່ອນເຮັດວຽກ"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ເປັນລຳໂພງ"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ສຳລັບເພງ ແລະສື່"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ຈື່ການຕັ້ງຄ່າ"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ອຸປະກອນສຽງ Bluetooth ທີ່ເຊື່ອມຕໍ່ສູງສຸດ"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ເລືອກຈຳນວນອຸປະກອນສຽງ Bluetooth ທີ່ເຊື່ອມຕໍ່ສູງສຸດ"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"ການສົ່ງສັນຍານ"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ເປີດໃຊ້ງານການສະແດງພາບໄຮ້ສາຍ"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ບໍ່ມີອຸປະກອນຢູ່ໃນບໍລິເວນໃກ້ຄຽງ."</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"ຊື່"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"ເຂົ້າສູ່ລະບົບ"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ຕ້ອງການເປີດໃຊ້ Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ຕ້ອງການປິດ Wi-Fi"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"ເປີດໃຊ້ Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"ໃຊ້ Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"ການຕັ້ງຄ່າ Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"ຕັ້ງຄ່າ & ຈັດການຈຸດການເຂົ້າໃຊ້ລະບົບໄຮ້ສາຍ"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"ລະຫັດຜ່ານ"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"ສະແດງລະຫັດຜ່ານ"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"ເລືອກຄື້ນ AP"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ອັດຕະໂນມັດ"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"ຄື້ນ 2.4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"ຄື້ນ 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"ຕັ້ງຄ່າ IP"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (ສາມາດໃຊ້ WPS ໄດ້)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ໃສ່ລະຫັດເຄືອຂ່າຍຂອງທ່ານ"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"ເຄືອຂ່າຍ Wi‑Fi ຜູ້ໃຫ້ບໍລິການ"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"ເຊື່ອມຕໍ່ຜ່ານ <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"ເຊື່ອມຕໍ່ຜ່ານ <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ ແລະເພື່ອຈຸດປະສົງອື່ນໆ, <xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການເປີດນຳໃຊ້ການສະແກນເຄືອຂ່າຍ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ.\n\nອະນຸຍາດການດຳເນີນການນີ້ ໃຫ້ກັບທຸກແອັບຯທີ່ຕ້ອງການສະແກນບໍ່?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ເພື່ອປິດ, ໃຫ້ໄປທີ່ຫົວຂໍ້ຂັ້ນສູງ ໃນເມນູໂອເວີໂຟລ."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະນຸຍາດ"</string>
@@ -909,10 +933,8 @@
<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_local_only" msgid="857988412470694109">"ແອັບຕ່າງໆສາມາດສ້າງຮັອດສະປອດເພື່ອແບ່ງປັນເນື້ອຫາກັບອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ປິດຮັອດສະປອດອັດຕະໂນມັດ"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Wi‑Fi ຮັອດສະປອດຈະປິດຫາກບໍ່ມີອຸປະກອນເຊື່ອມຕໍ່"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"ກຳລັງເປີດໃຊ້ຮັອດສະປອດ..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"ກຳລັງປິດຮັອດສະປອດ..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ເຮັດວຽກຢູ່"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"ການໂທ Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"ເປີດໃຊ້ການໂທ Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"ໃຊ້ Wi-Fi ແທນເຄືອຂ່າຍມືຖື"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"ທີ່ຢູ່ສຸກເສີນ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ໃຊ້ເປັນສະຖານທີ່ຂອງທ່ານເມື່ອທ່ານໂທສຸກເສີນຜ່ານທາງ Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"ສຶກສາເພີ່ມເຕີມ"</annotation>" ກ່ຽວກັບຄຸນສົມບັດ DNS ສ່ວນຕົວ"</string>
<string name="display_settings_title" msgid="1708697328627382561">"ການສະແດງຜົນ"</string>
<string name="sound_settings" msgid="5534671337768745343">"ສຽງ"</string>
<string name="all_volume_title" msgid="4296957391257836961">"ລະດັບສຽງ"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"ປະເພດເຄືອຂ່າຍມືຖື"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"ຂໍ້ມູນຜູ່ໃຫ້ບໍລິການ"</string>
<string name="status_data_state" msgid="5503181397066522950">"ສະຖານະເຄືອຂ່າຍມືຖື"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"ສະຖານະບໍລິການ"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"ຄວາມແຮງສັນຍານ"</string>
<string name="status_roaming" msgid="2638800467430913403">"ໂຣມມິງ"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> ໃໝ່ຂອງທ່ານກຳລັງເຮັດວຽກຢູ່. \n\nເພື່ອຍ້າຍຮູບ,ໄຟລ໌ ແລະຂໍ້ມູນແອັບໄປໃສ່ອຸປະກອນນີ້, ໄປທີ່ການຕັ້ງຄ່າ > ບ່ອນຈັດເກັບຂໍ້ມູນ."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"ຍ້າຍ <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"ການຍ້າຍ <xliff:g id="APP">^1</xliff:g> ແລະຂໍ້ມູນຂອງມັນໃສ່ <xliff:g id="NAME_0">^2</xliff:g> ຈະໃຊ້ເວລາພຽງບຶດດຽວ. ທ່ານຈະບໍ່ສາມາດໃຊ້ແອັບໄດ້ຈົນກ່ວາຈະຍ້າຍສຳເລັດ. \n\nຢ່າຍ້າຍ <xliff:g id="NAME_1">^2</xliff:g> ໃນລະຫວ່າງການຍ້າຍ."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ເພື່ອຍ້າຍຂໍ້ມູນ, ທ່ານຈະຕ້ອງປົດລັອກຜູ້ໃຊ້ <xliff:g id="APP">^1</xliff:g> ກ່ອນ."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"ກຳລັງຍ້າຍ <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ຢ່າເອົາ <xliff:g id="NAME">^1</xliff:g> ອອກໄປໃນລະຫວ່າງການຍ້າຍ. \n\nແອັບ <xliff:g id="APP">^2</xliff:g> ຢູ່ໃນອຸປະກອນຈະບໍ່ມີໃຫ້ຈົນກ່ວາສຳເລັດການຍ້າຍ."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ຍົກເລີກການຍ້າຍ"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"ເຄືອຂ່າຍ, ແອັບ ຫຼື ອຸປະກອນທີ່ສາມາດຣີເຊັດໄດ້"</string>
<string name="reset_network_title" msgid="6166025966016873843">"ຣີເຊັດ Wi-Fi, ມືຖື ແລະ Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"ນີ້ຈະເປັນການຣີເຊັດການຕັ້ງຄ່າເຄືອຂ່າຍທັງໝົດ, ຮວມເຖິງ:\n\n"<li>"Wi‑Fi"</li>\n<li>"ອິນເຕີເນັດມືຖື"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"ຣີເຊັດ eSIM ນຳ"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"ຕັ້ງຄືນການຕັ້ງຄ່າ"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"ຕັ້ງຄືນທຸກການຕັ້ງຄ່າເຄືອຂ່າຍບໍ? ທ່ານບໍ່ສາມາດບໍ່ເຮັດການດຳເນີນການນີ້ໄດ້!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"ຕັ້ງຄືນການຕັ້ງຄ່າ"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"ຕັ້ງຄືນບໍ?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"ການຕັ້ງຄ່າເຄືອຂ່າຍຄືນໃໝ່ແມ່ນບໍ່ມີໃຫ້ສຳລັບຜູ້ໃຊ້ຄົນນີ້"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"ການຕັ້ງຄ່າເຄືອຂ່າຍຖືກຕັ້ງຄ່າຄືນໃໝ່ແລ້ວ."</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"ບໍ່ສາມາດຣີເຊັດ eSIM ໄດ້"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"ບໍ່ສາມາດຣີເຊັດ eSIM ໄດ້ເນື່ອງຈາກເກີດຄວາມຜິດພາດ."</string>
<string name="master_clear_title" msgid="3531267871084279512">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ຜູ້ໃຫ້ບໍລິການຢູ່ eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ນີ້ຈະບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</b>" ອອກນຳ."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"SD card"</b>" ອອກນຳ."</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"ກະລຸນາເຊື່ອມຕໍ່ກັບອິນເຕີເນັດ"</string>
<string name="location_title" msgid="1029961368397484576">"ທີ່ຢູ່ຂອງຂ້ອຍ"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ຈຸດທີ່ຕັ້ງສຳລັບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"ໂຫມດ"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ຄວາມຖືກຕ້ອງສູງ"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ປະຢັດໄຟ"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"ສະເພາະອຸປະກອນ"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"ຂໍ້ມູນສະຖານທີ່ແມ່ນປິດຢູ່"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"ສິດອະນຸຍາດລະດັບແອັບ"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"ການຮ້ອງຂໍຂໍ້ມູນສະຖານທີ່ຫຼ້າສຸດ"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"ຫຼ້າສຸດນີ້ບໍ່ມີແອັບຯໃດເອີ້ນໃຊ້ຂໍ້ມູນຕຳແໜ່ງ"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"ບໍລິການສະຖານທີ່"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"ໃຊ້ແບັດເຕີຣີ່ຫຼາຍ"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"ໃຊ້ແບັດເຕີຣີ່ໜ້ອຍ"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"ໂຫມດຂໍ້ມູນສະຖານທີ່"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ໃຊ້ GPS, Wi‑Fi, Bluetooth ຫຼື ເຄືອຂ່າຍມືຖືເພື່ອລະບຸສະຖານທີ່"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ໃຊ້ Wi‑Fi, Bluetooth ຫຼື ເຄືອຂ່າຍມືຖືເພື່ອລະບຸສະຖານທີ່"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ໃຊ້ GPS ແລະ ເຊັນເຊີຂອງອຸປະກອນເພື່ອລະບຸສະຖານທີ່"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"ການສະແກນ"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ການສະແກນ Wi‑Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ປັບປຸງທີ່ຕັ້ງໂດຍການອະນຸຍາດໃຫ້ແອັບ ແລະ ການບໍລິການຂອງລະບົບເພື່ອກວດຫາເຄືອຂ່າຍ Wi‑Fi ໄດ້ທຸກເວລາ."</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"ແຫລ່ງຂໍ້ມູນສະຖານທີ່"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"ເບິ່ງຂໍ້ມູນທາງກົດໝາຍ, ສະຖານະ, ເວີຊັນຊອບແວ"</string>
<string name="legal_information" msgid="5769301644270604095">"ຂໍ້ມູນທາງກົດໝາຍ"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"ເບິ່ງທັງໝົດ <xliff:g id="COUNT">%1$d</xliff:g> ແອັບ"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ແທັບເລັດ ແລະ ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານຈະສາມາດຖືກແອັບທີ່ບໍ່ຮູ້ຈັກໂຈມຕີໄດ້ງ່າຍຂຶ້ນ. ໂດຍການຕິດຕັ້ງແອັບຕ່າງໆຈາກແຫລ່ງຂໍ້ມູນເຫຼົ່ານີ້, ແມ່ນທ່ານຍອມຮັບວ່າຈະຮັບຜິດຊອບຕໍ່ຄວາມເສຍຫາຍທີ່ເກີດຂຶ້ນກັບໂທລະສັບຂອງທ່ານ ຫຼື ການສູນເສຍຂໍ້ມູນທີ່ອາດເກີດຂຶ້ນຈາກການນຳໃຊ້ແອັບເຫຼົ່ານັ້ນ."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"ໂທລະສັບ ແລະ ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານຈະສາມາດຖືກແອັບທີ່ບໍ່ຮູ້ຈັກໂຈມຕີໄດ້ງ່າຍຂຶ້ນ. ໂດຍການຕິດຕັ້ງແອັບຕ່າງໆຈາກແຫລ່ງຂໍ້ມູນເຫຼົ່ານີ້, ແມ່ນທ່ານຍອມຮັບວ່າຈະຮັບຜິດຊອບຕໍ່ຄວາມເສຍຫາຍທີ່ເກີດຂຶ້ນກັບໂທລະສັບຂອງທ່ານ ຫຼື ການສູນເສຍຂໍ້ມູນທີ່ອາດເກີດຂຶ້ນຈາກການນຳໃຊ້ແອັບເຫຼົ່ານັ້ນ."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"ອຸປະກອນ ແລະ ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານຈະສາມາດຖືກແອັບທີ່ບໍ່ຮູ້ຈັກໂຈມຕີໄດ້ງ່າຍຂຶ້ນ. ໂດຍການຕິດຕັ້ງແອັບຕ່າງໆຈາກແຫລ່ງທີ່ມາເຫຼົ່ານີ້, ແມ່ນທ່ານຍອມຮັບວ່າຈະຮັບຜິດຊອບຕໍ່ຄວາມເສຍຫາຍທີ່ເກີດຂຶ້ນກັບອຸປະກອນຂອງທ່ານ ຫຼື ການສູນເສຍຂໍ້ມູນທີ່ອາດເກີດຂຶ້ນຈາກການນຳໃຊ້ແອັບເຫຼົ່ານັ້ນ."</string>
<string name="advanced_settings" msgid="1777249286757067969">"ການຕັ້ງຄ່າຂັ້ນສູງ"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"ເປີດໃຊ້ໂຕເລືອກການຕັ້ງຄ່າເພີ່ມເຕີມ."</string>
<string name="application_info_label" msgid="5736524913065714880">"ຂໍ້ມູນແອັບຯ"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ອາດກະທົບກັບປະສິດທິພາບ"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ຄລິກຫຼັງຈາກຕົວຊີ້ຢຸດເຄື່ອນໄຫວແລ້ວ"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ໜ່ວງເວລາກ່ອນຄລິກ"</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_summary_state_enabled" msgid="8359913912320966304">"ເປີດ"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ປິດ"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"ສະແດງໃນການຕັ້ງຄ່າດ່ວນ"</string>
@@ -1987,7 +2015,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>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ກ່ອນຈະເຕັມ"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"ການເຄື່ອນໄຫວແອັບ"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"ຖືກຈຳກັດ"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"ອະນຸຍາດໃຫ້ແອັບເຮັດວຽກໃນພື້ນຫຼັງໄດ້"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"ແອັບສາມາດເຮັດວຽກໃນພື້ນຫຼັງໄດ້ເມື່ອບໍ່ມີການນຳໃຊ້"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"ການເຄື່ອນໄຫວໃນພື້ນຫຼັງຂອງແອັບແມ່ນຖືກຈຳກັດເມື່ອບໍ່ມີການນຳໃຊ້"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"ແບັດເຕີຣີເຮັດວຽກປົກກະຕິ"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ແອັບເຮັດວຽກປົກກະຕິ"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ຄວາມຈຸແບັດເຕີຣີເຫຼືອໜ້ອຍ"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ແບັດເຕີຣີບໍ່ສາມາດໃຫ້ອາຍຸການນຳໃຊ້ທີ່ດີໄດ້"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"ເປີດໃຊ້ຕົວຈັດການແບັດເຕີຣີອັດສະລິຍະ"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"ເປີດໃຊ້ເພື່ອປັບແຕ່ງການນຳໃຊ້ແບັດເຕີຣີ"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"ເປີດໂໝດແບັດເຕີຣີຕ່ຳ"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"ເພີ່ມອາຍຸແບັດເຕີຣີຂອງທ່ານ"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"ເປີດໂໝດແບັດເຕີຣີຕ່ຳແລ້ວ"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"ຄຸນສົມບັດບາງຢ່າງຖືກຈຳກັດໄວ້"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ໂທລະສັບຖືກໃຊ້ຢ່າງໜັກໜ່ວງ"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ແທັບເລັດຖືກໃຊ້ຢ່າງໜັກໜ່ວງ"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ອຸປະກອນຖືກໃຊ້ຢ່າງໜັກໜ່ວງ"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"ໃຊ້ໄປປະມານ <xliff:g id="HOUR">%1$s</xliff:g> ນັບຕັ້ງແຕ່ສາກໄຟເທື່ອຫຼ້າສຸດ"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"ໂທລະສັບຂອງທ່ານຖືກໃຊ້ຢ່າງໜັກໜ່ວງ ແລະ ເຮັດໃຫ້ໃຊ້ແບັດເຕີຣີຢ່າງຫຼວງຫຼາຍ. ແບັດເຕີຣີຂອງທ່ານເຮັດວຽກປົກກະຕິຢູ່.\n\n ໂທລະສັບຂອງທ່ານຖືກໃຊ້ປະມານ <xliff:g id="HOUR">%1$s</xliff:g> ນັບຕັ້ງແຕ່ສາກໄຟເຕັມເທື່ອຫຼ້າສຸດ.\n\n ການນຳໃຊ້ທັງໝົດ:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"ແທັບເລັດຂອງທ່ານຖືກໃຊ້ຢ່າງໜັກໜ່ວງ ແລະ ເຮັດໃຫ້ໃຊ້ແບັດເຕີຣີຢ່າງຫຼວງຫຼາຍ. ແບັດເຕີຣີຂອງທ່ານເຮັດວຽກປົກກະຕິຢູ່.\n\n ແທັບເລັດຂອງທ່ານຖືກໃຊ້ປະມານ <xliff:g id="HOUR">%1$s</xliff:g> ນັບຕັ້ງແຕ່ສາກໄຟເຕັມເທື່ອຫຼ້າສຸດ.\n\n ການນຳໃຊ້ທັງໝົດ:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"ອຸປະກອນຂອງທ່ານຖືກໃຊ້ຢ່າງໜັກໜ່ວງ ແລະ ເຮັດໃຫ້ໃຊ້ແບັດເຕີຣີຢ່າງຫຼວງຫຼາຍ. ແບັດເຕີຣີຂອງທ່ານເຮັດວຽກປົກກະຕິຢູ່.\n\n ອຸປະກອນຂອງທ່ານຖືກໃຊ້ປະມານ <xliff:g id="HOUR">%1$s</xliff:g> ນັບຕັ້ງແຕ່ສາກໄຟເຕັມເທື່ອຫຼ້າສຸດ.\n\n ການນຳໃຊ້ທັງໝົດ:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"ຕົວຈັດການແບັດເຕີຣີອັດສະລິຍະ"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"ຈັດການແບັດເຕີຣີອັດຕະໂນມັດ"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"ປັບລະດັບການໃຊ້ພະລັງງານຂອງແອັບຕ່າງໆໂດຍອັດຕະໂນມັດໂດຍອ້າງອີງຈາກການນຳໃຊ້"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"ແອັບທີ່ຈຳກັດໄວ້"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d ແອັບ</item>
+ <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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ການປັບແອັບໃຫ້ເໝາະສົມ"</string>
<string name="battery_saver" msgid="8172485772238572153">"ຕົວປະຢັດແບັດເຕີຣີ"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"ໃຊ້ຕົວປະຢັດແບັດເຕີຣີ"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ເປີດໃຊ້ອັດຕະໂນມັດ"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ບໍ່ມີປິດ"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"at <xliff:g id="PERCENT">%1$s</xliff:g>battery"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"ການຊິ້ງຂໍ້ມູນກຳລັງປະສົບບັນຫາຢູ່ໃນປັດຈຸບັນ. ມັນຈະກັບມາໃຊ້ໄດ້ໃນໄວໆນີ້."</string>
<string name="add_account_label" msgid="7811707265834013767">"ເພີ່ມບັນຊີ"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກບໍ່ສາມາດໃຊ້ໄດ້ເທື່ອ"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"ໂໝດບ່ອນເຮັດວຽກ"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"ອະນຸຍາດໃຫ້ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກສາມາດນຳໃຊ້ໄດ້ ເຊິ່ງຮວມທັງແອັບ, ການຊິ້ງຂໍ້ມູນໃນພື້ນຫຼັງ ແລະຄຸນສົມບັດທີ່ກ່ຽວຂ້ອງ"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"ລຶບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
<string name="background_data" msgid="5779592891375473817">"ຂໍ້ມູນພື້ນຫຼັງ"</string>
<string name="background_data_summary" msgid="8328521479872763452">"ແອັບຯສາມາດຊິ້ງຂໍ້ມູນ, ສົ່ງ ແລະຮັບຂໍ້ມູນໄດ້ທຸກເວລາ"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"ລຶບບັນຊີອອກ?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ການລຶບບັນຊີນີ້ຈະລຶບທຸກຂໍ້ຄວາມ, ລາຍຊື່ຜູ່ຕິດຕໍ່ ແລະຂໍ້ມູນອື່ນໆຂອງມັນຈາກແທັບເລັດ!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ການລຶບບັນຊີນີ້ຈະເປັນການລຶບຂໍ້ຄວາມ, ລາຍຊື່ຜູ່ຕິດຕໍ່ ແລະຂໍ້ມູນໂທລະສັບອື່ນໆທັງໝົດອອກ!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"ການລຶບບັນຊີນີ້ຈະເປັນການລຶບຂໍ້ຄວາມ, ລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ຂໍ້ມູນອື່ນໆທັງໝົດຂອງມັນອອກຈາກອຸປະກອນ!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"ຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ປ່ຽນແປງສິ່ງນີ້"</string>
<string name="provider_label" msgid="7724593781904508866">"ການຮັບຂໍ້ມູນແບບ Push"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="other">ກວດສອບໃບຮັບຮອງ</item>
<item quantity="one">ກວດສອບໃບຮັບຮອງ</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"ຜູ້ໃຊ້"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"ຜູ່ໃຊ້ & ໂປຣໄຟລ໌"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ເພີ່ມຜູ່ໃຊ້ ຫຼືໂປຣໄຟລ໌"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"ເພີ່ມຜູ້ໃຊ້"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, ສົ່ງສັນຍານ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ແອັບ ແລະ ການແຈ້ງເຕືອນ"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ສິດອະນຸຍາດ, ແອັບເລີ່ມຕົ້ນ"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"ຜູ້ໃຊ້ ແລະ ບັນຊີ"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ຫ້າມ ຫ້າມລົບກວນ, ຂັດຈັງຫວະ, ການຂັດຈັງຫວະ, ຢຸດເຊົາ"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"ໃກ້ຄຽງ, ສະຖານທີ່, ປະຫວັດ, ການລາຍງານ"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"ຄວາມຖືກຕ້ອງ"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"ບັນຊີ"</string>
<string name="keywords_users" msgid="3434190133131387942">"ຂໍ້ຈຳກັດ, ຈຳກັດ, ຈຳກັດແລ້ວ"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ການແກ້ໄຂຂໍ້ຄວາມໃຫ້ຖືກຕ້ອງ, ຖືກຕ້ອງ, ສຽງດັງ, ສັ່ນ, ສຽງ, ພາສາ, ທ່າທາງ, ແນະນຳ, ຄຳແນະນຳ, ຊຸດຮູບແບບ, ຫຍາບຄາຍ, ຄຳສັບ, ພິມ, ອີໂມຈິ, ສາກົນ"</string>
@@ -2872,6 +2924,7 @@
<item quantity="one">1 ກົດ</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"ຫ້າມລົບກວນ"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"ເປີດໂໝດຫ້າມລົບກວນ"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ພຶດຕິກຳ"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ອະນຸຍາດສຽງ ແລະ ການສັ່ນເຕືອນຈາກ"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ບໍ່ມີສຽງ"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"ເປີດໃຊ້ອັດຕະໂນມັດ"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"ກົດອັດຕະໂນມັດ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"ກົດອັດຕະໂນມັດ"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"ຕັ້ງກົດຂອງການຫ້າມລົບກວນ"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ຈຳກັດສຽງ ແລະ ການສັ່ງໃນບາງເວລາ"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"ຄວາມງຽບທັງໝົດ"</string>
@@ -2890,12 +2946,15 @@
<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_add" msgid="90014394953272517">"ເພີ່ມ"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ເປີດດຽວນີ້"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ປິດດຽວນີ້"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"ເປີດ"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ເປີດດຽວນີ້"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ປິດດຽວນີ້"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"ໂໝດຫ້າມລົບກວນຈະເປີດໃຊ້ຈົນກວ່າຈະຮອດ <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"ໂໝດຫ້າມລົບກວນຈະເປີດໃຊ້ຈົນກວ່າທ່ານຈະປິດມັນ"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"ເປີດໃຊ້ໂໝດຫ້າມລົບກວນໂດຍອັດຕະໂນມັດແລ້ວໂດຍກົດ <xliff:g id="RULE_NAME">%s</xliff:g> ແລ້ວ"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"ເປີດໃຊ້ໂໝດຫ້າມລົບກວນໂດຍອັດຕະໂນມັດແລ້ວໂດຍແອັບ <xliff:g id="APP_NAME">%s</xliff:g> ແລ້ວ"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"ສຳຄັນເທົ່ານັ້ນ"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2970,7 @@
<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="recent_notifications" msgid="5660639387705060156">"ສົ່ງຫຼ້າສຸດ"</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>
@@ -2930,7 +2990,7 @@
<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_importance_title" msgid="848692592679312666">"ຄວາມສໍາຄັນ"</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="5455049524984686275">"ບໍ່ມີສຽງ ຫຼື ການລົບກວນໃນໜ້າຈໍ"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"ຄວາມສຳຄັນປານກາງ"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"ການເຂົ້າເຖິງການແຈ້ງເຕືອນ"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ການເຂົ້າເຖິງການແຈ້ງເຕືອນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຖືກບລັອກໄວ້"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"ຫ້າມລົບກວນການເຂົ້າຫາ"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"ບໍ່ມີການຂໍແອັບທີ່ຕິດຕັ້ງໄວ້ ຫາຫ້າມລົບກວນການເຂົ້າ"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"ກຳລັງໂຫລດແອັບຯ..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ກຳລັງບລັອກການແຈ້ງເຕືອນແອັບບໍ່ໃຫ້ປາກົດໃນອຸປະກອນນີ້"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ກຳລັງບລັອກການແຈ້ງເຕືອນໃນໝວດໝູ່ນີ້ບໍ່ໃຫ້ປາກົດໃນອຸປະກອນນີ້"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ກຳລັງບລັອກກຸ່ມການແຈ້ງເຕືອນນີ້ບໍ່ໃຫ້ສະແດງຢູ່ອຸປະກອນ"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"ຕາມຄຳຂໍຂອງທ່ານ, Android ຈະບລັອກການແຈ້ງເຕືອນຂອງແອັບນີ້ບໍ່ໃຫ້ປາກົດຢູ່ອຸປະກອນນີ້"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"ຕາມຄຳຂໍຂອງທ່ານ, Android ຈະບລັອກໝວດໝູ່ການແຈ້ງເຕືອນນີ້ບໍ່ໃຫ້ປາກົດຢູ່ອຸປະກອນນີ້"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"ຕາມຄຳຂໍຂອງທ່ານ, Android ຈະບລັອກກຸ່ມການແຈ້ງເຕືອນນີ້ບໍ່ໃຫ້ປາກົດຢູ່ອຸປະກອນນີ້"</string>
<string name="notification_channels" msgid="5346841743182627500">"ໝວດໝູ່"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"ອື່ນໆ"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດຜ່ານກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\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="1793719723017395175">"ແມ່ນ"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"ບໍ່ແມ່ນ"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ຕ້ອງການລະຫັດ PIN ຫຼືບໍ່?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ຕ້ອງການຮູບແບບປົດລັອກບໍ່?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"ຕ້ອງການລະຫັດຜ່ານຫຼືບໍ່?"</string>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"ຜູ້ໃຊ້ປັດຈຸບັນ: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"ເຂົ້າສູ່ລະບົບເປັນ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ແມ່ນຄ່າເລີ່ມຕົ້ນ"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ເປີດ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ປິດ"</string>
<string name="backup_disabled" msgid="485189128759595412">"ການສຳຮອງຂໍ້ມູນຖືກປິດໃຊ້ແລ້ວ"</string>
<string name="about_summary" msgid="924181828102801010">"ອັບເດດເປັນ Android <xliff:g id="VERSION">%1$s</xliff:g> ແລ້ວ"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"ບໍ່ສາມາດປິດການສຳຮອງຂໍ້ມູນໄດ້"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"ຄຳສັ່ງນີ້ຖືກປິດໄວ້. ເພື່ອສຶກສາເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບອົງກອນຂອງທ່ານ."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"ລາຍລະອຽດເພີ່ມເຕີມ"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"ຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານສາມາດຕິດຕາມ ແລະ ຈັດການແອັບ ແລະ ຂໍ້ມູນທີ່ເຊື່ອມໂຍງກັບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານໄດ້ ເຊິ່ງຮວມເຖິງການຕັ້ງຄ່າ, ການອະນຸຍາດ, ການເຂົ້າເຖິງອົງກອນ, ການເຄື່ອນໄຫວເຄືອຂ່າຍ ແລະ ຂໍ້ມູນສະຖານທີ່ຂອງອຸປະກອນ."</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກປິດຢູ່"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"ແອັບ, ການຊິ້ງຂໍ້ມູນໃນພື້ນຫຼັງ ແລະຄຸນສົມບັດອື່ນທີ່ກ່ຽວຂ້ອງກັບໂປຣໄຟລ໌ຂອງທ່ານຖືກປິດໄວ້ແລ້ວ."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"ກຳນົດເວລາໄຟກາງຄືນ"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ການປັບສີຂອງແສງໜ້າຈໍຈະຊ່ວຍໃຫ້ທ່ານອນຫຼັບໄດ້ງ່າຍຂຶ້ນ"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"ເປີດໃຊ້ແສງກາງຄືນແລ້ວ"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ເພີ່ມເຕີມ"</string>
@@ -3537,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"ບໍ່ມີ"</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>
@@ -3559,31 +3628,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ເຊື່ອມຕໍ່ຫາຫຼາຍອຸປະກອນ"</string>
<string name="demo_mode" msgid="2798762752209330277">"ໂໝດເດໂມສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ລະບົບ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"ພວກເຮົາຢູ່ນີ້ເພື່ອຊ່ວຍເຫຼືອ"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ພວກເຮົາພ້ອມຊ່ວຍເຫຼືອທ່ານຕະຫຼອດ 24 ຊົ່ວໂມງ"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"ພວກເຮົາພ້ອມຊ່ວຍເຫຼືອທ່ານຕະຫຼອດ 24 ຊົ່ວໂມງ"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"ທີມງານຂອງພວກເຮົາຢູ່ນີ້ເພື່ອແກ້ໄຂທຸກບັນຫາ"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ທີມງານຊ່ວຍເຫຼືອຂອງພວກເຮົາຈະຢູ່ບ່ອນນີ້ຕະຫຼອດເວລາທຸກໆມື້"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"ຊອກຫາຄວາມຊ່ວຍເຫຼືອ ຫຼື ກັບມາໃນຕອນທີ່ເປີດເຮັດວຽກ (ເວລາທ້ອງຖິ່ນ):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ເວລາຊ່ວຍເຫຼືອທາງໂທລະສັບ (ເວລາທ້ອງຖິ່ນ)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ຊອກຫາຄວາມຊ່ວຍເຫຼືອ ຫຼື ສຳຫຼວດເບິ່ງເຄັດລັບ ແລະ ເທັກນິກຕ່າງໆ"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"ຮອງຮັບ:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"ກຳລັງເດີນທາງຢູ່ຕ່າງປະເທດບໍ?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"ອາດມີການຮຽກເກັບຄ່າບໍລິການແບບລະຫວ່າງປະເທດ"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"ໂທລະສັບ"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"ການສົນທະນາ"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ສຳຫຼວດເຄັດລັບ ແລະ ເທັກນິກຕ່າງໆ"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"ຊອກຫາການຊ່ວຍເຫຼືອ ແລະ ສົ່ງຄຳຕິຊົມ"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"ຕິດຕໍ່ທີມງານຊ່ວຍເຫຼືອ"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"ເຂົ້າສູ່ລະບົບ"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"ບໍ່ສາມາດເຂົ້າສູ່ລະບົບບໍ?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"ສົ່ງຂໍ້ມູນລະບົບ"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ບໍ່ຕ້ອງສະແດງອີກ"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"ກຳລັງຮ້ອງຂໍໃນນາມ"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"ເພີ່ມບັນຊີ"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"ຂໍ້ມູນລະບົບ"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Window Trace"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ຕິດຕາມພື້ນຜິວ"</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>
@@ -3599,11 +3645,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ວິນາທີ</item>
<item quantity="one">1 ວິນາທີ</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"ລໍຖ້າ ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</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="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>
@@ -3614,32 +3660,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ກົດປຸ່ມເປີດປິດສອງເທື່ອຕິດກັນເພື່ອເປີດກ້ອງຖ່າຍຮູບ"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"ພິກໂທລະສັບສອງເທື່ອຕິດກັນເພື່ອໃຊ້ໂໝດເຊວຟີ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"ພິກແທັບເລັດສອງເທື່ອຕິດກັນເພື່ອໃຊ້ໂໝດເຊວຟີ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"ພິກອຸປະກອນສອງເທື່ອຕິດກັນເພື່ອໃຊ້ໂໝດເຊວຟີ"</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_suggestion_summary" msgid="5987443721392571847">"ກວດສອບການແຈ້ງເຕືອນເມື່ອປິດໜ້າຈໍໄວ້"</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_pickup_suggestion_summary" msgid="7014700589991761035">"ກວດສອບການແຈ້ງເຕືອນເມື່ອປິດໜ້າຈໍໄວ້"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ເພື່ອກວດເບິ່ງການແຈ້ງເຕືອນຂອງທ່ານ, ໃຫ້ເລື່ອນລົງໃສ່ເຊັນເຊີນລາຍນິ້ວມືທີ່ຢູ່ຫຼັງອຸປະກອນຂອງທ່ານ"</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"ເບິ່ງການແຈ້ງເຕືອນແບບດ່ວນ"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ເລື່ອນນິ້ວລົງໃສ່ເຊັນເຊີລາຍນິ້ວມື"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"ເປີດ"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"ປິດ"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader ຖືກປົດລັອກຢູ່ກ່ອນແລ້ວ"</string>
@@ -3769,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"ການເຂົ້າເຖິງໄດເຣັກທໍຣີ"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"ການເຂົ້າເຖິງໄດເຣັກທໍຣີ"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 61c3ddb..6c13ed5 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"1 val."</item>
<item msgid="5198271470953124739">"Nėra skirtojo laiko pabaigos"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (numatytoji parinktis)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Prastas"</item>
<item msgid="2042505933058940139">"Prastas"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"Daugiau nei 60 dienų"</item>
<item msgid="5692284879054004388">"Daugiau nei 90 dienų"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Naudoti pageidaujamą tinklą"</item>
+ <item msgid="8745603368609022803">"Laikyti matuojamu"</item>
+ <item msgid="2266114985518865625">"Laikyti nematuojamu"</item>
+ </string-array>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2ecc8bc..16475f2 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -172,6 +172,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsų įrenginiai"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Susieti naują įrenginį"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Leisti įrenginiui susieti ir prisijungti prie „Bluetooth“ įrenginių"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Išjungti diapazono skambėjimą"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Neleisti tinkintų telefono skambėjimo tonų per „Bluetooth“ ausines"</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>
@@ -334,6 +336,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Nustatyti datą"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Rūšiuoti pagal abėcėlę"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rūšiuoti pagal laiko juostą"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> prasideda <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Vasaros laikas"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Standartinis laikas"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Laiko juosta pagal regioną"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fiksuoto poslinkio laiko juostos"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
<string name="time_picker_title" msgid="483460752287255019">"Laikas"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Automatiškai užrakinti"</string>
@@ -352,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profilio informacija"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Paskyros"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Vietovė"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Naudoti vietovę"</string>
<string name="account_settings_title" msgid="626177544686329806">"Paskyros"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Saugumas ir vieta"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifruotė ir prisijungimo duomenys"</string>
@@ -713,6 +721,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaip kalbėtojo telefonas"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muzikai ir medijai"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Atsiminti nustatymus"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimalus prijungtų „Bluetooth“ garso įrenginių skaičius"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Pasirinkite maksimalų prijungtų „Bluetooth“ garso įrenginių skaičių"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Perdavimas"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Įgalinti belaidį rodymą"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nerasta netoliese esančių įrenginių."</string>
@@ -727,6 +737,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Pavadinimas"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Prisijungti"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d MB per sek."</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"Programa „<xliff:g id="REQUESTER">%s</xliff:g>“ nori įjungti „Wi-Fi“"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"Programa „<xliff:g id="REQUESTER">%s</xliff:g>“ nori išjungti „Wi-Fi“"</string>
@@ -744,6 +755,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Įjungti „Wi-Fi“"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Naudoti „Wi-Fi“"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"„Wi-Fi“ nustatymai"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Nustatyti ir valdyti bevielius prieigos taškus"</string>
@@ -855,7 +867,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (galima WPS)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Įveskite tinklo slaptažodį"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Operatoriaus „Wi‑Fi“ ryšio tinklas"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Prisijunkite per „<xliff:g id="NAME">%1%s</xliff:g>“"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Prisijunkite per „<xliff:g id="NAME">%1$s</xliff:g>“"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Siekiant tiksliau nustatyti vietą ir dėl kitų priežasčių, „<xliff:g id="APP_NAME">%1$s</xliff:g>“ prašo leidimo nuskaityti tinklus, net kai „Wi-Fi“ yra išjungtas.\n\nAr norite suteikti leidimą nuskaityti visoms to prašančioms programoms?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Kad išjungtumėte, perpildymo meniu eikite į skiltį „Išplėstiniai“"</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Leisti"</string>
@@ -933,10 +945,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Prieigos taško juosta"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Naudodami viešosios interneto prieigos tašką, galite sukurti „Wi‑Fi“ tinklą kitiems įrenginiams. Internetas teikiamas per viešosios interneto prieigos tašką naudojant mobiliųjų duomenų ryšį. Gali būti taikomi papildomi mobiliojo ryšio duomenų mokesčiai."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programos gali sukurti viešosios interneto prieigos tašką ir bendrinti turinį su netoliese esančiais įrenginiais."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Išjungti viešosios interneto prieigos tašką automatiškai"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"„Wi‑Fi“ viešosios interneto prieigos taškas bus išjungtas, jei nebus prijungta jokių įrenginių"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Įjungiamas viešosios interneto prieigos taškas…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Išjungiamas viešosios interneto prieigos taškas…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktyvus"</string>
@@ -985,6 +995,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Adresas prireikus pagalbos"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Naudojama kaip vietos informacija, kai skambinate pagalbos numeriu naudodami „Wi-Fi“"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Sužinokite daugiau"</annotation>" apie privataus DNS funkcijas"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
<string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Garsumas"</string>
@@ -1334,6 +1345,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Nauja <xliff:g id="NAME">^1</xliff:g> veikia. \n\nKad perkeltumėte nuotraukas, failus ir programų duomenis į šį įrenginį, eikite į skiltį „Nustatymai“ > „Atmintis“."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Perkelti programą <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Programos <xliff:g id="APP">^1</xliff:g> ir jos duomenų perkėlimas į <xliff:g id="NAME_0">^2</xliff:g> truks neilgai. Negalėsite naudoti programos, kol perkėlimas bus baigtas. \n\nKol perkeliama, nepašalinkite <xliff:g id="NAME_1">^2</xliff:g>."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Jei norite perkelti duomenis, turite atrakinti naudotoją <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Perkeliama programa <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Nepašalinkite <xliff:g id="NAME">^1</xliff:g>, kol perkeliama. \n\nPrograma <xliff:g id="APP">^2</xliff:g> šiame įrenginyje nebus pasiekiama, kol perkėlimas bus baigtas."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Atšaukti perkėlimą"</string>
@@ -1494,6 +1506,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Vietovės šaltiniai"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Apie planšetinį kompiuterį"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Apie telefoną"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Apie įrenginį"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Apie emuliuojamą įrenginį"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Žiūrėti teisinę informaciją, būseną, programinės įrangos versiją"</string>
<string name="legal_information" msgid="5769301644270604095">"Teisinė informacija"</string>
@@ -1601,6 +1614,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Žr. visas programas (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Įdiegus nežinomų programų didėja planšetinio kompiuterio ir asmeninių duomenų pažeidimo rizika. Diegdami programas iš šio šaltinio sutinkate, kad esate patys atsakingi už žalą planšetiniam kompiuteriui arba duomenų praradimą dėl jų naudojimo."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Įdiegus nežinomų programų didėja telefono ir asmeninių duomenų pažeidimo rizika. Diegdami programas iš šio šaltinio sutinkate, kad esate patys atsakingi už žalą telefonui arba duomenų praradimą dėl jų naudojimo."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Įdiegus nežinomų programų didėja įrenginio ir asmeninių duomenų pažeidimo rizika. Diegdami programas iš šio šaltinio sutinkate, kad esate patys atsakingi už žalą įrenginiui arba duomenų praradimą dėl programų naudojimo."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Išplėstiniai nustatymai"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Įgalinti daugiau nustatymų parinkčių"</string>
<string name="application_info_label" msgid="5736524913065714880">"Programos informacija"</string>
@@ -1902,6 +1916,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Gali paveikti našumą"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Spustelėkite, kai žymeklis nustos judėti"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delsa prieš paspaudimą"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ĮJUNGTI"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IŠJUNGTA"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Rodyti sparčiuosiuose nustatymuose"</string>
@@ -2072,14 +2089,37 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Akumuliatoriaus būsena gera"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Programos veikia įprastai"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Maža akumuliatoriaus talpa"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Akumuliatoriaus veikimo laikas nebus ilgas"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Įjunkite išmaniąją akumuliatoriaus tvarkytuvę"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Įjunkite, kad galėtumėte optimizuoti akumuliatoriaus naudojimą"</string>
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
<skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefonas naudotas intensyviai"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Planšetinis kompiuteris naudotas intensyviai"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Įrenginys naudotas intensyviai"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Išnaudota maždaug <xliff:g id="HOUR">%1$s</xliff:g> nuo paskutinio visiško įkrovimo"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Telefonas buvo intensyviai naudojamas ir todėl buvo suvartota daug akumuliatoriaus energijos. Akumuliatorius veikia normaliai.\n\n Telefonas buvo naudojamas maždaug <xliff:g id="HOUR">%1$s</xliff:g> nuo paskutinio visiško įkrovimo.\n\n Bendras naudojimas:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Planšetinis kompiuteris buvo intensyviai naudojamas ir todėl buvo suvartota daug akumuliatoriaus energijos. Akumuliatorius veikia normaliai.\n\n Planšetinis kompiuteris buvo naudojamas maždaug <xliff:g id="HOUR">%1$s</xliff:g> nuo paskutinio visiško įkrovimo.\n\n Bendras naudojimas:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Įrenginys buvo intensyviai naudojamas ir todėl buvo suvartota daug akumuliatoriaus energijos. Akumuliatorius veikia normaliai.\n\n Įrenginys buvo naudojamas maždaug <xliff:g id="HOUR">%1$s</xliff:g> nuo paskutinio visiško įkrovimo.\n\n Bendras naudojimas:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Išmanioji akumuliatoriaus tvarkymo priemonė"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Automatinis akumuliatoriaus tvarkymas"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Automatiškai koreguoti programų sunaudojamą energiją atsižvelgiant į naudojimą"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Apribotos programos"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d programa</item>
+ <item quantity="few">%1$d programos</item>
+ <item quantity="many">%1$d programos</item>
+ <item quantity="other">%1$d programų</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Sustabdyti programą?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefonas negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP">%1$s</xliff:g>“ jį pažadina.\n\nKad pabandytumėte išspręsti šią problemą, galite sustabdyti programą.\n\nJei tai kartosis, gali reikėti pašalinti programą, kad pagerintumėte akumuliatoriaus našumą."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Planšetinis kompiuteris negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP">%1$s</xliff:g>“ jį pažadina.\n\nKad pabandytumėte išspręsti šią problemą, galite sustabdyti programą.\n\nJei tai kartosis, gali reikėti pašalinti programą, kad pagerintumėte akumuliatoriaus našumą."</string>
@@ -2188,6 +2228,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Medijos serveris"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Programų optimizavimas"</string>
<string name="battery_saver" msgid="8172485772238572153">"Akumuliatoriaus tausojimo priemonė"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Naudoti Akumuliatoriaus tausojimo priemonę"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Įjungti automatiškai"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Niekada"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"kai akumuliatoriaus įkrovos lygis yra <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2408,6 +2449,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Pašalinti paskyrą?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Pašalinus šią paskyrą iš planšetinio kompiuterio bus ištrinti visi pranešimai, kontaktai ir kiti duomenys!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Pašalinus šią paskyrą iš telefono bus ištrinti visi jos pranešimai, kontaktai ir kiti duomenys!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Pašalinus šią paskyrą iš įrenginio bus ištrinti visi pranešimai, kontaktai ir kiti duomenys."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Administratorius neleidžia atlikti šio pakeitimo"</string>
<string name="provider_label" msgid="7724593781904508866">"Paspauskite „Prenumeratos“"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2944,8 +2986,8 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokuoti vaizdinius trikdžius"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Leisti vaizdinius signalus"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Pridėti"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ĮJUNGTI DABAR"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"IŠJUNGTI DABAR"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Įjungti dabar"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Išjungti dabar"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Netrukdymo režimas įjungtas iki <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Netrukdymo režimas bus įjungtas, kol jį išjungsite"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Netrukdymo režimą automatiškai įjungė taisyklė („<xliff:g id="RULE_NAME">%s</xliff:g>“)"</string>
@@ -2984,7 +3026,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Programų pranešimai"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Pranešimo kategorija"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Pranešimų kategorijos grupė"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Svarba"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Elgsena"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Leisti garsą"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Niekada nerodyti pranešimų"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Neskambėti ir nepertraukti vaizdo"</string>
@@ -3002,6 +3044,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Vidutinė svarba"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Didelė svarba"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Skubi svarba"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Rodyti pranešimus"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Pranešimų pagelbiklis"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Prieiga prie pranešimų"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Prieiga prie darbo profilio pranešimų užblokuota"</string>
@@ -3034,9 +3077,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Prieiga „Netrukdyti“"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Jokios įdiegtos programos nepateikė prieigos „Netrukdyti“ užklausos"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"„Android“ blokuoja šios programos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"„Android“ blokuoja šios kategorijos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"„Android“ blokuoja šios grupės pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"„Android“ jūsų prašymu blokuoja šios programos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"„Android“ jūsų prašymu blokuoja šios kategorijos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"„Android“ jūsų prašymu blokuoja šios grupės pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
<string name="notification_channels" msgid="5346841743182627500">"Kategorijos"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Kita"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3651,31 +3694,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Sparčiųjų nustatymų kūrėjo išklotinės elementai"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Esame pasiruošę padėti"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Esame pasiruošę padėti 24 val. per parą, 7 dienas per savaitę"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Esame pasiruošę padėti 24 val. per parą, 7 dienas per savaitę"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Palaikymo komanda pasiruošusi išspręsti bet kokią kilusią problemą"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Palaikymo komanda pasiekiama visą dieną, kasdien"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Ieškokite pagalbos arba grįžkite palaikymo komandos darbo laiku (vietos laiku):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Palaikymo telefonu komandos darbo laikas (vietos laiku)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Ieškokite pagalbos ir naršykite patarimus bei gudrybes"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Palaikymas:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Keliaujate užsienyje?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Gali būti taikomi tarptautiniai mokesčiai"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefonas"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Pokalbis"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Naršyti patarimus ir gudrybes"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Ieškoti pagalbos ir siųsti atsiliepimą"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Susisiekite su palaikymo komanda"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prisijungti"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Negalite prisijungti?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Siųsti sistemos informaciją"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Daugiau nerodyti"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Užklausa pateikiama kaip"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Pridėti paskyrą"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Sistemos informacija"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Lango žymė"</string>
+ <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Sluoksnio žymė"</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>
@@ -3697,11 +3717,11 @@
<item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> sekundės</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekundžių</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Palaukite ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Tvarkyti saugyklą"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Kad padėtų atlaisvinti saugyklos vietos, saugyklos tvarkytuvė iš įrenginio pašalina nuotraukas ir vaizdo įrašus, kurių atsarginė kopija sukurta."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Pašalinti nuotraukas ir vaizdo įrašus"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Saugyklos tvarkytuvė"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Naudoti Saugyklos tvarkytuvę"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiniai"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Neautomatiniai"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Atlaisvinkite vietos dabar"</string>
@@ -3881,8 +3901,8 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
- <skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <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="storage_access" msgid="8905018810338984531">"Saugyklos prieiga"</string>
+ <string name="keywords_storage_access" msgid="3708874088152933579">"saugyklos prieigos tikslinis katalogas"</string>
</resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 39fbcb2..de774f7 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Копче „Притисни“"</item>
<item msgid="1624323946324499595">"PIN од спарен уред"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 час"</item>
<item msgid="5198271470953124739">"Времето никогаш да не истече"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (Стандардно)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Слаба"</item>
<item msgid="2042505933058940139">"Слаб"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Постари од 60 дена"</item>
<item msgid="5692284879054004388">"Постари од 90 дена"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Користете ги поставките на мрежата"</item>
+ <item msgid="8745603368609022803">"Сметај како ограничена мрежа"</item>
+ <item msgid="2266114985518865625">"Сметај како неограничена мрежа"</item>
+ </string-array>
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 1eadad6..d9ad2bb 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваши уреди"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Спарување нов уред"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Дозволете уредот да се спарува и поврзува со уреди со Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Оневозможете ѕвонење во појас"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Не пуштајте приспособени мелодии за телефон на слушалки за Bluetooth"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Постави датум"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Подреди по азбучен ред"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Подреди по временска зона"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> почнува на <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Летно сметање на времето"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Стандардно време"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Временска зона според регионот"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Временски зони со фиксно отстапување"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Датум"</string>
<string name="time_picker_title" msgid="483460752287255019">"Време"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Автоматско заклучување"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Порака на закл.екран"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Овозможи виџети"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Оневозможено од администраторот"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Приказ на опцијата за заклучување"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Опција на копчето за вклучување на екранот што ги исклучува продолжениот пристап и отклучувањето со отпечаток."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Нема"</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">"На пр. Android-от на Миле."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Информации за профил"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Сметки"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрирање и акредитиви"</string>
@@ -459,9 +469,11 @@
<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="8971630898700461034">"Поставете заклучување на екранот"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Заштитете го уредот"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Користете отпечаток"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Поставување заклучување екран"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Спречете другите да го користат вашиот таблет"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Спречете ги другите да го користат вашиот уред"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Спречете ги другите да го користат вашиот телефон"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Отклучи со отпечаток"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Отклучете со отпечаток"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Избери заклучување на екранот"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Избери закл. раб. профил"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Како интерфон"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"За музика и медиуми"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомни поставки"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Максимален број аудиоуреди поврзани преку Bluetooth"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Изберете го максималниот број аудиоуреди поврзани преку Bluetooth"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Емитувај"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Овозможи приказ на безжични мрежи"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Не се пронајдени уреди во близина."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Име"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Најави се"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> сака да ја вклучи Wi-Fi мрежата"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> сака да ја исклучи Wi-Fi мрежата"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Вклучи Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Користи Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Поставки за Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Постави и управувај со безжични пристапни точки"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Лозинка"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Прикажи лозинка"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Изберете појас на АП"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Автоматски"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Појас од 2,4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Појас од 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Поставки на ИП"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Достапен WPS)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Внесете ја вашата мрежна лозинка"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi мрежа на операторот"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Поврзете се преку <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Поврзете се преку <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"За да се подобри точноста на локација и за други цели, <xliff:g id="APP_NAME">%1$s</xliff:g> сака да се вклучи скенирање за мрежи дури и кога Wi-Fi е исклучена.\n\nДозволи го ова за сите апликации кои сакаат да се скенира?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"За да го исклучите ова, одете на Напредни во менито на прелевање."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволи"</string>
@@ -909,10 +926,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Појас на точката на пристап"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Користете точка на пристап за да создадете Wi‑Fi мрежа за другите уреди. Точката на пристап обезбедува интернет со помош на мобилната интернет-врска. Може да ви се наплатат дополнителни трошоци за мобилен интернет."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Апликациите може да создадат точка на пристап за да споделуваат содржини со уредите во близина."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Автоматско исклучување на точката на пристап"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Точката на пристап преку Wi‑Fi ќе се исклучи ако нема поврзани уреди"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Вклучување точка на пристап..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Исклучување точка на пристап..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> е активно"</string>
@@ -923,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Повикување преку Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Вклучете Повици преку Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Користете Wi-Fi наместо мобилна мрежа"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Зголемете ја покриеноста со повикување преку 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_roaming_mode_title" msgid="1565039047187685115">"Поставки за роаминг"</string>
@@ -961,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Адреса за итни случаи"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Се користи како ваша локација кога остварувате итен повик преку Wi-Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Дознајте повеќе"</annotation>" за функциите на приватен DNS"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
<string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Јачини"</string>
@@ -1175,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Тип мобилна мрежа"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Информации за операторот"</string>
<string name="status_data_state" msgid="5503181397066522950">"Состојба на мобилна мрежа"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Состојба на услуга"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Јачина на сигнал"</string>
<string name="status_roaming" msgid="2638800467430913403">"Роаминг"</string>
@@ -1308,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Вашата нова <xliff:g id="NAME">^1</xliff:g> работи. \n\nЗа да преместите фотографии, датотеки и податоци за апликацијата на уредов, одете во Поставки и меморија."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Премести <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Преместувањето на <xliff:g id="APP">^1</xliff:g> и нејзините податоци на <xliff:g id="NAME_0">^2</xliff:g> ќе потрае само неколку моменти. Нема да може да ја користите апликацијата додека преместувањето не заврши. \n\nНе отстранувајте ја <xliff:g id="NAME_1">^2</xliff:g> за време на преместувањето."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"За преместување податоци, треба да го отклучите корисникот <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Се преместува <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Не отстранувајте ја <xliff:g id="NAME">^1</xliff:g> за време на преместувањето. \n\nАпликацијата <xliff:g id="APP">^2</xliff:g> на уредов нема да биде достапна додека преместувањето не заврши."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Откажи преместување"</string>
@@ -1360,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Може да се ресетира мрежа, апликации или уред"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Ресетирај Wi-Fi, мобилен интернет и Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Ова ќе ги ресетира сите мрежни поставки, вклучувајќи:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилен интернет"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Ресетирај ги и eSIM-картичките"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Избришете ги сите eSIM-картички на телефонот. Треба да контактирате со операторот за повторно да ја преземете вашата eSIM-картичка. Тоа нема да го откаже вашиот план за мобилна услуга."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Ресетирај поставки"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Да се ресетираат сите мрежни поставки? Не може да се врати ова дејство!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Ресетирај поставки"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Ресетирај?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Мрежното ресетирање не е достапно за овој корисник"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Мрежните поставки се ресетирани"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Не може да се ресетираат eSIM-картичките"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM-картичките не може да се ресетираат поради грешка."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Избриши ги сите податоци (фабричко ресетирање)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Оператори на eSIM-картичката"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM-картички"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Тоа нема да го откаже вашиот пакет за мобилни услуги."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"меморијата"</b>" треба да се избрише."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"СД картичката"</b>" треба да се избрише."</string>
@@ -1432,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Поврзете се на интернет"</string>
<string name="location_title" msgid="1029961368397484576">"Моја локација"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Локација за работен профил"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Голема прецизност"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Заштеда на батерија"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Само уред"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Локацијата е исклучена"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Дозволи на ниво на апликација"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Последни барања за локација"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Нема апликации што скоро побарале локација"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Услуги за локација"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Голема употреба на батеријата"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Мала употреба на батеријата"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим на локација"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Користи GPS, Wi‑Fi, Bluetooth или мобилни мрежи за утврдување на локацијата"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Користи Wi‑Fi, Bluetooth или мобилни мрежи за утврдување на локацијата"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Користи GPS и сензорите на уредот за утврдување на локацијата"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Скенирање"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Скенирање на Wi‑Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"За да ја подобрите локацијата, дозволете системските апликации и услуги да откриваат Wi‑Fi мрежи во секое време."</string>
@@ -1468,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Извори на локација"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"Прикажи правни информации, статус, верзија на софтвер"</string>
<string name="legal_information" msgid="5769301644270604095">"Правни информации"</string>
@@ -1575,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Видете ги сите <xliff:g id="COUNT">%1$d</xliff:g> апликации"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Вашиот таблет и личните податоци се повеќе подложни на напади од апликации од непознати извори. Ако инсталирате апликации од изворов, се согласувате дека сте одговорни за каква било штета на таблетот или губењето податоци што може да произлезат од користењето на овие апликации."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Вашиот телефон и личните податоци се повеќе подложни на напади од апликации од непознати извори. Ако инсталирате апликации од изворов, се согласувате дека сте одговорни за каква било штета на телефонот или губењето податоци што може да произлезат од користењето на овие апликации."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Вашиот уред и личните податоци се повеќе подложни на напади од непознати апликации. Ако инсталирате апликации од изворов, се согласувате дека сте одговорни за каква било штета на уредот или губење податоци што може да произлезат од користењето на апликациите."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Напредни поставки"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Овозможи повеќе опции за подесување"</string>
<string name="application_info_label" msgid="5736524913065714880">"Информации за апликацијата"</string>
@@ -1874,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Може да влијае на изведбата"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Кликнување откако покажувачот ќе престане да се движи"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Одложување пред кликнување"</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_summary_state_enabled" msgid="8359913912320966304">"ВКЛУЧЕНО"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИСКЛУЧЕНО"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Прикажи во „Брзи поставки“"</string>
@@ -1987,7 +2005,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>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> до полнење"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Активност во заднина"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Ограничено"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Дозволете апликацијата да работи во заднина"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Апликациите може да се извршуваат во заднина кога не се користат"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Активноста на апликациите во заднина е ограничена кога не се користат"</string>
@@ -2030,14 +2048,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батеријата е во добра форма"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Апликациите се однесуваат нормално"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Низок капацитет на батеријата"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Батеријата не може да обезбеди добар век на траење"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Вклучете го паметниот управник со батерија"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Вклучете за да се оптимизира користењето на батеријата"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Вклучување режим на „Слаба батерија“"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Продолжете го траењето на вашата батерија"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Режимот на „Слаба батерија“ е вклучен"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Некои функции се ограничени"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Телефонот е користен интензивно"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Таблетот е користен интензивно"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Уредот е користен интензивно"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Користено е околу <xliff:g id="HOUR">%1$s</xliff:g> од последното целосно полнење"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Вашиот телефон се користел интензивно што значително ја испразнило батеријата. Батеријата е исправна.\n\n Телефонот се користел околу <xliff:g id="HOUR">%1$s</xliff:g> од последното целосно полнење.\n\n Вкупно користење:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Вашиот таблет се користел интензивно што значително ја испразнило батеријата. Батеријата е исправна.\n\n Таблетот се користел околу <xliff:g id="HOUR">%1$s</xliff:g> од последното целосно полнење.\n\n Вкупно користење:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Вашиот уред се користел интензивно што значително ја испразнило батеријата. Батеријата е исправна.\n\n Уредот се користел околу <xliff:g id="HOUR">%1$s</xliff:g> од последното целосно полнење.\n\n Вкупно користење:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Паметен управник со батерија"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Автоматско управување со батерија"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Автоматски приспособувај го користењето на батеријата по апликација врз основа на користењето"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Ограничени апликации"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d апликација</item>
+ <item quantity="other">%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>
@@ -2146,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Оптимизација на апликација"</string>
<string name="battery_saver" msgid="8172485772238572153">"Штедач на батерија"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Користи го штедачот на батерија"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Вклучи автоматски"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Никогаш"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"при <xliff:g id="PERCENT">%1$s</xliff:g> батерија"</string>
@@ -2333,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Во моментов има проблеми со синхронизацијата. Ќе се среди наскоро."</string>
<string name="add_account_label" msgid="7811707265834013767">"Додај сметка"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Работниот профил уште не е достапен"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Режим на работа"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Дозволете работниот профил да функционира, вклучувајќи ги апликациите, синхронизирањето во заднина и други поврзани карактеристики"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Работен профил"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Управувано од вашата организација"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Апликациите и известувањата се исклучени"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Отстрани го работниот профил"</string>
<string name="background_data" msgid="5779592891375473817">"Податоци во заднина"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Апл. може секогаш да се синхрон., праќаат и примаат податоци"</string>
@@ -2366,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Отстрани сметка?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Со отстранување на оваа сметка ќе се избришат сите нејзини пораки, контакти и другите податоци од таблетот!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Со отстранување на оваа сметка ќе се избришат сите нејзини пораки, контакти и другите податоци од телефонот!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Со отстранување на оваа сметка ќе се избришат сите нејзини пораки, контакти и другите податоци од уредот!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Администраторот не ја дозволува промената"</string>
<string name="provider_label" msgid="7724593781904508866">"Рекламни претплати"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2622,8 @@
<item quantity="one">Проверка на сертификати</item>
<item quantity="other">Проверка на сертификати</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Корисници"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Корисници и профили"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Додајте корисник или профил"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Додајте корисник"</string>
@@ -2774,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Апликации и известувања"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дозволи, стандардни апликации"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"Корисници и сметки"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"не вознемирувај, прекини, прекинување, пауза"</string>
<string name="keywords_app" msgid="6334757056536837791">"РАМ"</string>
<string name="keywords_location" msgid="6615286961552714686">"во близина, локација, историја, известување"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"точност"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"сметка"</string>
<string name="keywords_users" msgid="3434190133131387942">"ограничување, ограничи, ограничено"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"поправка на текст, поправи, звук, вибрирај, автоматски, јазик, движење, предложи, предлог, тема, навредлив, збор, напиши, емотикон, меѓународно"</string>
@@ -2872,6 +2911,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> правила</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Не вознемирувај"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Исклучување на „Не вознемирувај“"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Однесување"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дозволете звуци и вибрации од"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без звук"</string>
@@ -2881,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Вклучи автоматски"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Автоматски правила"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Автоматско правило"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Правила за „Не вознемирувај“"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ограничете звуци и вибрации"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Не вознемирувај во одредено време"</string>
+ <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_no_interruptions" msgid="8107126344850276878">"Целосна тишина"</string>
@@ -2890,12 +2931,15 @@
<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_add" msgid="90014394953272517">"Додај"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ВКЛУЧИ СЕГА"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ИСКЛУЧИ СЕГА"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Вклучи"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Вклучи сега"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Исклучи сега"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Режимот „Не вознемирувај“ ќе биде вклучен до <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Режимот „Не вознемирувај“ ќе биде вклучен сѐ додека не го исклучите"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Дадено правило <xliff:g id="RULE_NAME">%s</xliff:g> го вклучи режимот „Не вознемирувај“ автоматски"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Дадена апликација <xliff:g id="APP_NAME">%s</xliff:g> го вклучи режимот „Не вознемирувај“ автоматски"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Само приоритетно"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2955,7 @@
<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="recent_notifications" msgid="5660639387705060156">"Неодамна испратени"</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>
@@ -2930,7 +2975,7 @@
<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_importance_title" msgid="848692592679312666">"Важност"</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="5455049524984686275">"Без звук или визуелен прекин"</string>
@@ -2948,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Средна важност"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"Пристап до известување"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Пристапот до известувањата на работниот профил е блокиран"</string>
@@ -2978,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Пристап до „Не вознемирувај“"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Ниту една од инсталираните апликации не побарала пристап до „Не вознемирувај“"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Вчитување апликации…"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android го блокира појавувањето на известувањата за апликацијава на уредов"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android го блокира појавувањето на оваа категорија известувања на уредов"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android го блокира појавувањето на оваа група известувања на уредов"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"На ваше барање, Android го блокира појавувањето на известувањата за апликацијава на уредов"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"На ваше барање, Android го блокира појавувањето на оваа категорија известувања на уредов"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"На ваше барање, Android го блокира појавувањето на оваа група известувања на уредов"</string>
<string name="notification_channels" msgid="5346841743182627500">"Категории"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Друго"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Освен користењето на отпечатокот за отклучување на уредот, може дополнително да го заштитите ако бара лозинка пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, вклучувајќи и аларми.\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="1793719723017395175">"Да"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Не"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Барајте PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Барајте шема?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Барајте лозинка?"</string>
@@ -3254,8 +3302,8 @@
<string name="high_power_off" msgid="3393904131961263278">"Се оптимизира користењето на батеријата"</string>
<string name="high_power_system" msgid="7362862974428225301">"Оптимизација на батеријата не е достапна"</string>
<string name="high_power_desc" msgid="6283926163708585760">"Не применувајте оптимизација на батеријата. Може побрзо да ја истроши вашата батерија."</string>
- <string name="high_power_prompt_title" msgid="6358673688590282655">"Да се дозволи апликациите секогаш да се извршуваат во заднина?"</string>
- <string name="high_power_prompt_body" msgid="1031422980602565049">"Ако дозволите „<xliff:g id="APP_NAME">%1$s</xliff:g>“ секогаш да се извршува во заднина, тоа може да ја намали трајноста на батеријата. \n\nТоа може да го промените подоцна во Поставки > Апликации и известувања."</string>
+ <string name="high_power_prompt_title" msgid="6358673688590282655">"Да се извршува во заднина?"</string>
+ <string name="high_power_prompt_body" msgid="1031422980602565049">"Ако дозволите <xliff:g id="APP_NAME">%1$s</xliff:g> секогаш да се извршува во заднина, тоа може да ја намали трајноста на батеријата. \n\nТоа може да го промените подоцна во Поставки > Апликации и известувања."</string>
<string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> употреба од последното целосно полнење"</string>
<string name="battery_power_management" msgid="5571519699679107523">"Управување со напојувањето"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"Нема употреба на батерија од последното целосно полнење"</string>
@@ -3397,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Тековен корисник: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Најавени сте како <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> е стандардна"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ВКЛУЧЕНО / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ИСКЛУЧЕНО"</string>
<string name="backup_disabled" msgid="485189128759595412">"Бекапот е оневозможен"</string>
<string name="about_summary" msgid="924181828102801010">"Ажурирано на Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3407,6 +3456,7 @@
<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="6346948990624612516">"Не може да се исклучи бекапот"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Дејството е оневозможено. Контактирајте со администраторот на организацијата за да дознаете повеќе."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Повеќе детали"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Администраторот може да ги следи и да управува со апликациите и податоците поврзани со вашиот работен профил, заедно со поставките, дозволите, корпоративниот пристап, мрежната активност и информациите за локацијата на уредот."</string>
@@ -3430,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Работниот профил е исклучен"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Апликациите, синхронизирањето во заднина и други карактеристики поврзани со вашиот работен профил се исклучени."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Поставете распоред на „Ноќно светло“"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Боја на килибар за да заспиете"</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="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>
<string name="suggestions_more_title" msgid="8223690393059519879">"Уште <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3537,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"Нема"</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>
@@ -3559,31 +3612,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Поврзан со повеќе уреди"</string>
<string name="demo_mode" msgid="2798762752209330277">"Демо-режим на кориснички интерфејс на систем"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Плочки на програмерот за брзи поставки"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Тука сме за да ви помогнеме"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Ние сме тука за вас 24/7"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Ние сме тука за вас 24 часа на ден"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Нашиот тим за поддршка е тука за да ви помогне да се справите со секој проблем"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Нашиот тим за поддршка е достапен по цел ден, секој ден"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Пребарајте помош или обратете се во текот на работното време на поддршката (локално време):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Работно време на поддршката преку телефон (локално време)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Пребарајте ја помошта или истражувајте ги советите и триковите"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Поддршка за:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Патувате во странство?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Може да се применат меѓународни трошоци"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Разговор"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Истражувајте ги советите и триковите"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Пребарајте помош и испратете повратни информации"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Контактирајте со поддршката"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Најави се"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Не може да се најавите?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Испрати системски информации"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Не покажувај повторно"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Бара како"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Додај сметка"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Системски информации"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Трага од прозорец"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Површинска трага"</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>
@@ -3599,11 +3629,11 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> чекање"</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="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>
@@ -3614,32 +3644,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"За камерата, притиснете го копчето за вклучување двапати"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Завртете го телефонот двапати за режим на селфи"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Завртете го таблетот двапати за режим на селфи"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Завртете го уредот двапати за режим на селфи"</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_suggestion_summary" msgid="5987443721392571847">"Проверувајте ги известувањата кога екранот е исклучен"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Проверувајте ги известувањата кога екранот е исклучен"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"За да ги проверите известувањата, повлечете надолу на сензорот за отпечатоци на задната страна на уредот."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Видете ги известувањата набрзина"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Повлечете надолу на сензорот за отпечатоци"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Вклучено"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Исклучено"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Подигнувачот веќе е отклучен"</string>
@@ -3769,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Пристап до адресарот"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"пристап до адресарот"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"Мојот телефон"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"Мојот таблет"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"Мојот уред"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Сметка"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Име на уред"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Користење Bluetooth при возење"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Вклучување Bluetooth автоматски при возење"</string>
</resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 2dd30af..a336127 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"പുഷ് ബട്ടൺ"</item>
<item msgid="1624323946324499595">"പിയർ ഉപകരണത്തിൽ നിന്നുള്ള പിൻ"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"ഒരു മണിക്കൂർ"</item>
<item msgid="5198271470953124739">"ഒരിക്കലും കാലഹരണപ്പെടരുത്"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (ഡിഫോൾട്ട്)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"മോശം"</item>
<item msgid="2042505933058940139">"മോശം"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 ദിവസത്തിലധികം പഴയത്"</item>
<item msgid="5692284879054004388">"90 ദിവസത്തിലധികം പഴയത്"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"നെറ്റ്വര്ക്ക് മുൻഗണന ഉപയോഗിക്കുക"</item>
+ <item msgid="8745603368609022803">"മീറ്റർ-മാപകമായി കണക്കാക്കുക"</item>
+ <item msgid="2266114985518865625">"മീറ്റർ മാപകമല്ലാത്തതായി കണക്കാക്കുക"</item>
+ </string-array>
</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 9e76515..96fa71b 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"നിങ്ങളുടെ ഉപകരണങ്ങൾ"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"പുതിയ ഉപകരണവുമായി ജോടിയാക്കുക"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"bluetooth ഉപകരണങ്ങളിലേക്ക് ജോടിയാക്കാനും കണക്റ്റ് ചെയ്യാനും ഉപകരണത്തെ അനുവദിക്കുക"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ഇൻ-ബാൻഡ് റിംഗ് ചെയ്യൽ പ്രവർത്തനരഹിതമാക്കുക"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Bluetooth ഹെഡ്സെറ്റുകളിൽ ഇഷ്ടാനുസൃത ഫോൺ റിംഗ്ടോണുകൾ പ്ലേ ചെയ്യരുത്"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"തീയതി സജ്ജീകരിക്കുക"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"അക്ഷരമാലക്രമത്തിൽ അടുക്കുക"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"സമയ മേഖലയനുസരിച്ച് അടുക്കുക"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TRANSITION_DATE">%2$s</xliff:g>-ന് <xliff:g id="TIME_TYPE">%1$s</xliff:g> ആരംഭിക്കുന്നു."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"പകൽ നേരത്ത് സംരക്ഷിക്കുന്ന സമയം"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"സ്റ്റാന്ഡേര്ഡ് സമയം"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"പ്രദേശ പ്രകാരമുള്ള സമയ മേഖല"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"സ്ഥിരമായ ഓഫ്സെറ്റ് സമയ മേഖലകൾ"</string>
<string name="date_picker_title" msgid="1338210036394128512">"തീയതി"</string>
<string name="time_picker_title" msgid="483460752287255019">"സമയം"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"സ്വമേധയാ ലോക്കുചെയ്യുക"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"ലോക്ക് സ്ക്രീൻ സന്ദേശം"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"വിജറ്റുകൾ പ്രവർത്തനക്ഷമമാക്കുക"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"അഡ്മിൻ പ്രവർത്തനരഹിതമാക്കി"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ഒന്നുമില്ല"</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">"ഉദാ. ജോയുടെ Android."</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"പ്രൊഫൈൽ വിവരം"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"അക്കൗണ്ടുകൾ"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"എൻക്രിപ്ഷനും ക്രെഡന്ഷ്യലുകളും"</string>
@@ -459,9 +471,16 @@
<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="8971630898700461034">"സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"നിങ്ങളുടെ ഉപകരണം പരിരക്ഷിക്കുക"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"വിരലടയാളം ഉപയോഗിക്കുക"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിച്ച് അൺലോക്കുചെയ്യുക"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"സ്ക്രീൻലോക്ക് തിരഞ്ഞെടുക്കൂ"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ഔദ്യോഗിക ലോക്ക് തിരഞ്ഞെടുക്കുക"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"സ്പീക്കർ ഫോണായി"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"സംഗീതം, മീഡിയ എന്നിവയ്ക്കായി"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ക്രമീകരണങ്ങൾ ഓർമ്മിക്കുക"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"കണക്റ്റ് ചെയ്ത പരമാവധി Bluetooth ഓഡിയോ ഉപകരണങ്ങൾ"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"കണക്റ്റ് ചെയ്ത പരമാവധി Bluetooth ഓഡിയോ ഉപകരണങ്ങളുടെ എണ്ണം തിരഞ്ഞെടുക്കുക"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"കാസ്റ്റുചെയ്യുക"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"വയർലസ്ഡിസ്പ്ലേ സജീവമാക്കൂ"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"സമീപത്തുള്ള ഉപകരണങ്ങളൊന്നും കണ്ടെത്തിയില്ല."</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"പേര്"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"സൈൻ ഇൻ ചെയ്യുക"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"വൈഫൈ ഓഫാക്കാൻ <xliff:g id="REQUESTER">%s</xliff:g> താൽപ്പര്യപ്പെടുന്നു"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"വൈഫൈ ഓഫാക്കാൻ <xliff:g id="REQUESTER">%s</xliff:g> താൽപ്പര്യപ്പെടുന്നു"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"വൈഫൈ"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"വൈഫൈ ഓണാക്കുക"</string>
<string name="wifi_settings" msgid="29722149822540994">"വൈഫൈ"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"വൈഫൈ ഉപയോഗിക്കുക"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"വൈഫൈ ക്രമീകരണങ്ങൾ"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"വൈഫൈ"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"വയർലെസ് ആക്സസ് പോയിന്റുകൾ സജ്ജീകരിക്കുക, നിയന്ത്രിക്കുക"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"പാസ്വേഡ്"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"പാസ്വേഡ് കാണിക്കുക"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ബാൻഡ് തിരഞ്ഞെടുക്കുക"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"സ്വമേധയാ"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz ബാൻഡ്"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz ബാൻഡ്"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ക്രമീകരണം"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ലഭ്യമാണ്)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"നിങ്ങളുടെ നെറ്റ്വർക്ക് പാസ്വേഡ് നൽകുക"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"കാരിയർ വൈഫൈ നെറ്റ്വർക്ക്"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> എന്നയാൾ വഴി കണക്റ്റുചെയ്യുക"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> എന്നയാൾ വഴി കണക്റ്റുചെയ്യുക"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്തുന്നതിനും മറ്റ് ആവശ്യകതകൾക്കായും, വൈഫൈ ഓഫായിരിക്കുമ്പോൾപ്പോലും നെറ്റ്വർക്ക് സ്കാൻ ചെയ്യാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു.\n\nസ്കാൻ ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്ന എല്ലാ അപ്ലിക്കേഷനുകൾക്കായും ഇത് അനുവദിക്കണോ?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ഇത് ഓഫുചെയ്യുന്നതിന്, ഓവർഫ്ലോ മെനുവിലെ വിപുലമായത് എന്നതിലേക്ക് പോകുക."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"അനുവദിക്കുക"</string>
@@ -909,10 +933,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ബാൻഡ്"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"നിങ്ങളുടെ മറ്റ് ഉപകരണങ്ങൾക്കായി ഒരു വൈഫൈ നെറ്റ്വർക്ക് സൃഷ്ടിക്കുന്നതിന് ഹോട്ട്സ്പോട്ട് ഉപയോഗിക്കുക. ഹോട്ട്സ്പോട്ട് ഇന്റർനെറ്റ് നൽകുന്നത് നിങ്ങളുടെ മൊബൈൽ ഡാറ്റാ കണക്ഷൻ ഉപയോഗിച്ചുകൊണ്ടാണ്. അധിക മൊബൈൽ ഡാറ്റാ നിരക്കുകൾ ബാധകമായേക്കാം."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ചുറ്റുവട്ടത്തുള്ള ഉപകരണങ്ങളുമായി ഉള്ളടക്കം പങ്കിടുന്നതിന് ആപ്പുകൾക്ക് ഹോട്ട്സ്പോട്ട് സൃഷ്ടിക്കാൻ കഴിയും."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ഹോട്ട്സ്പോട്ട് സ്വമേധയാ ഓഫാക്കുക"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"ഉപകരണങ്ങളൊന്നും കണക്റ്റ് ചെയ്തില്ലെങ്കിൽ വൈഫൈ ഹോട്ട്സ്പോട്ട് ഓഫാക്കപ്പെടും"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"ഹോട്ട്സ്പോട്ട് ഓണാക്കുന്നു…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"ഹോട്ട്സ്പോട്ട് ഓഫാക്കുന്നു…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> സജീവമാണ്"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"വൈഫൈ കോളിംഗ്"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"വൈഫൈ കോളിംഗ് ഓണാക്കുക"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"മൊബൈൽ നെറ്റ്വർക്കിന് പകരം വൈഫൈ ഉപയോഗിക്കുക"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"അടിയന്തര വിലാസം"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"വൈഫൈ ഉപയോഗിച്ച് നിങ്ങളൊരു അടിയന്തര കോൾ ചെയ്യുമ്പോൾ, നിങ്ങളുടെ ലൊക്കേഷനായി ഉപയോഗിക്കപ്പെടും"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"സ്വകാര്യ DNS ഫീച്ചറുകളെ കുറിച്ച് "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"ഡിസ്പ്ലേ"</string>
<string name="sound_settings" msgid="5534671337768745343">"ശബ്ദം"</string>
<string name="all_volume_title" msgid="4296957391257836961">"വോളിയം"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"മൊബൈൽ നെറ്റ്വർക്ക് തരം"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"ഓപ്പറേറ്റർ വിവരം"</string>
<string name="status_data_state" msgid="5503181397066522950">"മൊബൈൽ നെറ്റ്വർക്ക് നില"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"സേവന നില"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"സിഗ്നൽ ശക്തി"</string>
<string name="status_roaming" msgid="2638800467430913403">"റോമിംഗ്"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"നിങ്ങളുടെ പുതിയ <xliff:g id="NAME">^1</xliff:g> പ്രവർത്തിക്കുന്നു. \n\nഫോട്ടോകൾ, ഫയലുകൾ അപ്ലിക്കേഷൻ വിവരം എന്നിവ ഈ ഉപകരണത്തിലേക്ക് നീക്കാൻ, ക്രമീകരണം > സ്റ്റോറേജ് എന്നതിലേക്ക് പോകുക."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> നീക്കുക"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="NAME_0">^2</xliff:g> എന്നതിലേക്ക് <xliff:g id="APP">^1</xliff:g> എന്നതും അതിന്റെ വിവരവും നീക്കുന്നതിന് കുറച്ച് നിമിഷങ്ങൾ മാത്രമേയെടുക്കൂ. നീക്കുന്ന പ്രവർത്തനം പൂർത്തിയാകുന്നതുവരെ നിങ്ങൾക്ക് അപ്ലിക്കേഷൻ ഉപയോഗിക്കാനാവില്ല. \n\nനീക്കുന്നതിനിടെ <xliff:g id="NAME_1">^2</xliff:g> നീക്കംചെയ്യരുത്."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ഡാറ്റ നീക്കാൻ <xliff:g id="APP">^1</xliff:g> ഉപയോക്താവിനെ അൺലോക്ക് ചെയ്യേണ്ടതുണ്ട്."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> നീക്കുന്നു…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"നീക്കുന്നതിനിടെ <xliff:g id="NAME">^1</xliff:g> നീക്കംചെയ്യരുത്. \n\nനീക്കുന്ന പ്രവർത്തനം പൂർത്തിയാകുന്നതുവരെ ഈ ഉപകരണത്തിലെ <xliff:g id="APP">^2</xliff:g> അപ്ലിക്കേഷൻ ലഭ്യമാകില്ല."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"നീക്കുന്നത് റദ്ദാക്കുക"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"നെറ്റ്വർക്കോ ആപ്പുകളോ ഉപകരണമോ റീസെറ്റുചെയ്യാം"</string>
<string name="reset_network_title" msgid="6166025966016873843">"വൈഫൈ, മൊബൈൽ, Bluetooth എന്നിവ റീസെറ്റുചെയ്യുക"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"ഇങ്ങനെ ചെയ്താൽ ഇനിപ്പറയുന്നവ ഉപ്പെടെയുള്ള എല്ലാ നെറ്റ്വർക്ക് ക്രമീകരണവും പുനഃക്രമീകരിക്കപ്പെടും:\n\n"<li>"വൈഫൈ"</li>\n<li>"മൊബൈൽ ഡാറ്റ"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"ഇ-സിമ്മുകളും പുനഃസജ്ജീകരിക്കുക"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"ക്രമീകരണം റീസെറ്റുചെയ്യുക"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"എല്ലാ നെറ്റ്വർക്കിംഗ് ക്രമീകരണവും റീസെറ്റുചെയ്യണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാവില്ല!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"ക്രമീകരണം റീസെറ്റുചെയ്യുക"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"റീസെറ്റുചെയ്യണോ?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"ഈ ഉപയോക്താവിന് നെറ്റ്വർക്ക് റീസെറ്റ് ലഭ്യമല്ല"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"നെറ്റ്വർക്ക് ക്രമീകരണം റീസെറ്റുചെയ്തു"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"ഇ-സിമ്മുകൾ പുനഃസജ്ജീകരിക്കാനാവില്ല"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"പിശക് കാരണം ഇ-സിമ്മുകൾ പുനഃസജ്ജീകരിക്കാനാവില്ല."</string>
<string name="master_clear_title" msgid="3531267871084279512">"എല്ലാ ഡാറ്റയും മായ്ക്കുക (ഫാക്ടറി റീസെറ്റ്)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-ലെ കാരിയറുകൾ"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"ഇ-സിമ്മുകൾ"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"നിങ്ങളുടെ മൊബൈൽ സർവീസ് പ്ലാൻ ഇത് റദ്ദാക്കുകയില്ല."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"USB സ്റ്റോറേജ് "</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"SD കാർഡ്"</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"ഇന്റർനെറ്റിൽ കണക്റ്റുചെയ്യുക"</string>
<string name="location_title" msgid="1029961368397484576">"എന്റെ ലൊക്കേഷൻ"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ഔദ്യോഗിക പ്രൊഫൈലിനായുള്ള ലൊക്കേഷൻ"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"മോഡ്"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ഉയർന്ന കൃത്യത"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ബാറ്ററി ലാഭിക്കൽ"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"ഉപകരണം മാത്രം"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"ലോക്കേഷൻ ഓഫാണ്"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"ആപ്പ്-തല അനുമതികൾ"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"പുതിയ ലൊക്കേഷൻ അഭ്യർത്ഥനകൾ"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"അപ്ലിക്കേഷനുകളൊന്നും അടുത്തിടെ ലൊക്കേഷൻ അഭ്യർത്ഥിച്ചില്ല"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"ഉയർന്ന ബാറ്ററി ഉപയോഗം"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"കുറഞ്ഞ ബാറ്ററി ഉപയോഗം"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"സ്ഥാന നിർണ്ണയ രീതി"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"GPS, വൈഫൈ, Bluetooth, മൊബൈൽ നെറ്റ്വർക്കുകൾ എന്നിവയിലൊന്ന് ലൊക്കേഷൻ നിർണ്ണയിക്കുന്നതിന് ഉപയോഗിക്കുക"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"വൈഫൈ, Bluetooth, മൊബൈൽ നെറ്റ്വർക്കുകൾ എന്നിവയിലൊന്ന് ലൊക്കേഷൻ നിർണ്ണയിക്കുന്നതിന് ഉപയോഗിക്കുക"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS-ഉം ഉപകരണ സെൻസറുകളും ഉപയോഗിക്കുക"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"സ്കാനിംഗ്"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"വൈഫൈ സ്കാനിംഗ്"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ഏത് സമയത്തും വൈഫൈ നെറ്റ്വർക്കുകളെ തിരിച്ചറിയാൻ സിസ്റ്റം ആപ്സിനെയും സേവനങ്ങളെയും അനുവദിച്ചുകൊണ്ട് ലൊക്കേഷൻ മെച്ചപ്പെടുത്തുക."</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"ലൊക്കേഷൻ ഉറവിടങ്ങൾ"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"നിയമ വിവരം, നില, സോഫ്റ്റ്വെയർ പതിപ്പ് എന്നിവ കാണുക"</string>
<string name="legal_information" msgid="5769301644270604095">"നിയമപരമായ വിവരം"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"എല്ലാ <xliff:g id="COUNT">%1$d</xliff:g> ആപ്പുകളും കാണൂ"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"തിരിച്ചറിയാനാകാത്ത ആപ്സിനാൽ നിങ്ങളുടെ ടാബ്ലെറ്റും വ്യക്തിഗത ഡാറ്റയും ആക്രമിക്കപ്പെടാനുള്ള സാധ്യത വളരെ കൂടുതലാണ്. ഈ ഉറവിടത്തിൽ നിന്ന് ആപ്സ് ഇൻസ്റ്റാൾ ചെയ്യുന്നതിലൂടെ, ഈ ആപ്സ് ഉപയോഗിക്കുന്നതിനാൽ നിങ്ങളുടെ ടാബ്ലെറ്റിന് സംഭവിച്ചേക്കാവുന്ന എല്ലാ നാശനഷ്ടങ്ങൾക്കും അല്ലെങ്കിൽ ഡാറ്റാ നഷ്ടങ്ങൾക്കും നിങ്ങൾക്കാണ് ഉത്തരവാദിത്തമെന്ന് നിങ്ങൾ അംഗീകരിക്കുന്നു."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"തിരിച്ചറിയാനാകാത്ത ആപ്സിനാൽ നിങ്ങളുടെ ഫോണും വ്യക്തിഗത ഡാറ്റയും ആക്രമിക്കപ്പെടാനുള്ള സാധ്യത വളരെ കൂടുതലാണ്. ഈ ഉറവിടത്തിൽ നിന്ന് ആപ്സ് ഇൻസ്റ്റാൾ ചെയ്യുന്നതിലൂടെ, ഈ ആപ്സ് ഉപയോഗിക്കുന്നതിനാൽ നിങ്ങളുടെ ഫോണിന് സംഭവിച്ചേക്കാവുന്ന എല്ലാ നാശനഷ്ടങ്ങൾക്കും അല്ലെങ്കിൽ ഡാറ്റാ നഷ്ടങ്ങൾക്കും നിങ്ങൾക്കാണ് ഉത്തരവാദിത്തമെന്ന് നിങ്ങൾ അംഗീകരിക്കുന്നു."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"തിരിച്ചറിയാനാകാത്ത ആപ്പുകളാൽ നിങ്ങളുടെ ഉപകരണവും വ്യക്തിഗത ഡാറ്റയും ആക്രമിക്കപ്പെടാനുള്ള സാധ്യത വളരെ കൂടുതലാണ്. ഈ ഉറവിടത്തിൽ നിന്ന് ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്യുന്നതിലൂടെ, ഈ ആപ്സ് ഉപയോഗിക്കുന്നതിനാൽ നിങ്ങളുടെ ഉപകരണത്തിന് സംഭവിച്ചേക്കാവുന്ന എല്ലാ നാശനഷ്ടങ്ങൾക്കും അല്ലെങ്കിൽ ഡാറ്റാ നഷ്ടങ്ങൾക്കും നിങ്ങൾക്കാണ് ഉത്തരവാദിത്തമെന്ന് നിങ്ങൾ അംഗീകരിക്കുന്നു."</string>
<string name="advanced_settings" msgid="1777249286757067969">"വിപുലമായ ക്രമീകരണം"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"കൂടുതൽ ക്രമീകരണ ഓപ്ഷനുകൾ പ്രവർത്തനക്ഷമമാക്കുക"</string>
<string name="application_info_label" msgid="5736524913065714880">"ആപ്പ് വിവരം"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"പ്രകടനത്തെ ബാധിച്ചേക്കാം"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"പോയിന്റർനിന്നശേഷം ക്ലിക്കുചെയ്യൂ"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ക്ലിക്കിന് മുമ്പുള്ള കാലതാമസം"</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_summary_state_enabled" msgid="8359913912320966304">"ഓൺ"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ഓഫ്"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"ദ്രുത്ര ക്രമീകരണങ്ങളിൽ ദൃശ്യമാക്കുക"</string>
@@ -1987,7 +2015,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> ശേഷിക്കുന്നു"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"ചാർജ്ജാകാനുള്ള സമയം <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"പശ്ചാത്തല ആക്റ്റിവിറ്റി"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"നിയന്ത്രിച്ചിരിക്കുന്നു"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"പശ്ചാത്തലത്തിൽ റൺ ചെയ്യുന്നതിന് ആപ്പിനെ അനുവദിക്കുക"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"ഉപയോഗത്തിലില്ലാത്തപ്പോൾ ആപ്പിന് പശ്ചാത്തലത്തിൽ റൺ ചെയ്യാനാകും"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"ഉപയോഗത്തിലില്ലാത്തപ്പോഴുള്ള ആപ്പിന്റെ പശ്ചാത്തല ആക്റ്റിവിറ്റി പരിമിതപ്പെടുത്തിയിരിക്കുന്നു"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"ബാറ്ററിക്ക് പ്രശ്നങ്ങളൊന്നുമില്ല"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ആപ്പുകൾ സാധാരണ രീതിയിൽ പ്രവർത്തിക്കുന്നു"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"കുറഞ്ഞ ബാറ്ററി ശേഷി"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ബാറ്ററിക്ക് മികച്ച ബാറ്ററി ലൈഫ് നൽകാനാവുന്നില്ല"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"സ്മാർട്ട് ബാറ്ററി മാനേജർ ഓണാക്കുക"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"ബാറ്ററി ഉപയോഗം ഓപ്റ്റിമൈസ് ചെയ്യാൻ ഓണാക്കുക"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"കുറഞ്ഞ ബാറ്ററി മോഡ് ഓണാക്കുക"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"ബാറ്ററി ലൈഫ് വർദ്ധിപ്പിക്കുക"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"കുറഞ്ഞ ബാറ്ററി മോഡ് ഓണാണ്"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"ചില ഫീച്ചറുകൾ പരിമിതമാണ്"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ഫോൺ വൻതോതിൽ ഉപയോഗിച്ചു"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ടാബ്ലെറ്റ് വൻതോതിൽ ഉപയോഗിച്ചു"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ഉപകരണം വൻതോതിൽ ഉപയോഗിച്ചു"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"അവസാനം പൂർണ്ണമായി ചാർജായ ശേഷം ഏകദേശം <xliff:g id="HOUR">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"ഫോൺ വൻതോതിൽ ഉപയോഗിച്ചതിനാൽ വളരെയധികം ബാറ്ററി ചാർജ് ഉപയോഗിക്കപ്പെട്ടു. ബാറ്ററി സാധാരണ രീതിയിൽ പ്രവർത്തിക്കുന്നു.\n\n അവസാനം പൂർണ്ണമായി ചാർജായ ശേഷം ഏകദേശം <xliff:g id="HOUR">%1$s</xliff:g> ഫോൺ ഉപയോഗിച്ചു.\n\n ആകെ ഉപയോഗം:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"ടാബ്ലെറ്റ് വൻതോതിൽ ഉപയോഗിച്ചതിനാൽ വളരെയധികം ബാറ്ററി ചാർജ് ഉപയോഗിക്കപ്പെട്ടു. ബാറ്ററി സാധാരണ രീതിയിൽ പ്രവർത്തിക്കുന്നു.\n\n അവസാനം പൂർണ്ണമായി ചാർജായ ശേഷം ഏകദേശം <xliff:g id="HOUR">%1$s</xliff:g> ടാബ്ലെറ്റ് ഉപയോഗിച്ചു.\n\n ആകെ ഉപയോഗം:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"ഉപകരണം വൻതോതിൽ ഉപയോഗിച്ചതിനാൽ വളരെയധികം ബാറ്ററി ചാർജ് ഉപയോഗിക്കപ്പെട്ടു. ബാറ്ററി സാധാരണ രീതിയിൽ പ്രവർത്തിക്കുന്നു.\n\n അവസാനം പൂർണ്ണമായി ചാർജായ ശേഷം ഏകദേശം <xliff:g id="HOUR">%1$s</xliff:g> ഉപകരണം ഉപയോഗിച്ചു.\n\n ആകെ ഉപയോഗം:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"സ്മാർട്ട് ബാറ്ററി മാനേജർ"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"ബാറ്ററി സ്വമേധയാ മാനേജ് ചെയ്യുക"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"ഉപയോഗത്തിന് അനുസൃതമായി, ആപ്പുകൾ പവർ ഉപയോഗം സ്വമേധയാ ക്രമീകരിക്കുന്നു"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"നിയന്ത്രിത ആപ്പുകൾ"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d ആപ്പുകൾ</item>
+ <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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"മീഡിയ സെർവർ"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ആപ്പ് ഓപ്റ്റിമൈസേഷന്"</string>
<string name="battery_saver" msgid="8172485772238572153">"ബാറ്ററി ലാഭിക്കൽ"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"ബാറ്ററി ലാഭിക്കൽ ഉപയോഗിക്കുക"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ഓട്ടോമാറ്റിക്കായി ഓണാക്കുക"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ഒരിക്കലും"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> ബാറ്ററിയിൽ"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"സമന്വയം നിലവിൽ പ്രശ്നങ്ങൾ നേരിടുകയാണ്. ഇത് ഉടൻ ശരിയാകും."</string>
<string name="add_account_label" msgid="7811707265834013767">"അക്കൗണ്ട് ചേർക്കുക"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"ഔദ്യോഗിക പ്രൊഫൈൽ ഇതുവരെ ലഭ്യമല്ല"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"പ്രവർത്തന മോഡ്"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"ആപ്സും, പശ്ചാത്തല സമന്വയവും ബന്ധപ്പെട്ട ഫീച്ചറുകളും ഉൾപ്പെടെ, ഔദ്യോഗിക പ്രൊഫൈലിനെ പ്രവർത്തിക്കാൻ അനുവദിക്കുക"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"ഔദ്യോഗിക പ്രൊഫൈൽ നീക്കംചെയ്യുക"</string>
<string name="background_data" msgid="5779592891375473817">"പശ്ചാത്തല ഡാറ്റ"</string>
<string name="background_data_summary" msgid="8328521479872763452">"അപ്ലിക്കേഷനുകൾക്ക് ഏതു സമയത്തും ഡാറ്റ സമന്വയിപ്പിക്കാനും അയയ്ക്കാനും നേടാനുമാകും"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"അക്കൗണ്ട് നീക്കംചെയ്യണോ?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ഈ അക്കൗണ്ട് നീക്കംചെയ്യുന്നത്, അതിന്റെ എല്ലാ സന്ദേശങ്ങളും കോൺടാക്റ്റുകളും മറ്റ് ഡാറ്റയും ടാബ്ലെറ്റിൽ നിന്ന് ഇല്ലാതാക്കുന്നതിനിടയാക്കും!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ഈ അക്കൗണ്ട് നീക്കംചെയ്യുന്നതിലൂടെ, അതിലെ എല്ലാ സന്ദേശങ്ങളും കോൺടാക്റ്റുകളും മറ്റ് ഡാറ്റയും ഫോണിൽ നിന്ന് ഇല്ലാതാക്കപ്പെടും!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"ഈ അക്കൗണ്ട് നീക്കം ചെയ്യുന്നതിലൂടെ, അതുമായി ബന്ധപ്പെട്ട എല്ലാ സന്ദേശങ്ങളും കോൺടാക്റ്റുകളും മറ്റ് വിവരങ്ങളും ഉപകരണത്തിൽ നിന്ന് ഇല്ലാതാക്കപ്പെടും!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"ഈ മാറ്റം നിങ്ങളുടെ അഡ്മിൻ അനുവദിച്ചതല്ല"</string>
<string name="provider_label" msgid="7724593781904508866">"പുഷ് സബ്സ്ക്രിപ്ഷനുകൾ"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="other">സർട്ടിഫിക്കറ്റുകൾ പരിശോധിക്കുക</item>
<item quantity="one">സർട്ടിഫിക്കറ്റ് പരിശോധിക്കുക</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"ഉപയോക്താക്കള്"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"ഉപയോക്താക്കളും പ്രൊഫൈലുകളും"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ഉപയോക്താവിനെയോ പ്രൊഫൈലോ ചേർക്കുക"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"ഉപയോക്താവിനെ ചേര്ക്കുക"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, കാസ്റ്റ്"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ആപ്സും അറിയിപ്പുകളും"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"അനുമതികൾ, ഡിഫോൾട്ട് ആപ്പുകൾ"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"ഉപയോക്താക്കളും അക്കൗണ്ടും"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"അരുത് ശല്യപ്പെടുത്തരുത്, തടസപ്പെടുത്തുക, തടസം, ബ്രേക്ക്"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"അടുത്തുള്ളത്, ലൊക്കേഷൻ, ചരിത്രം, റിപ്പോർട്ടുചെയ്യൽ"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"കൃത്യത"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"അക്കൗണ്ട്"</string>
<string name="keywords_users" msgid="3434190133131387942">"നിയന്ത്രണം, നിയന്ത്രിക്കുക, നിയന്ത്രിച്ചു"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ടെക്സ്റ്റ് ചെയ്യൽ തിരുത്തൽ, തിരുത്തുക, ശബ്ദം, വൈബ്രേറ്റ് ചെയ്യുക, സ്വമേധയാ, ഭാഷ, വിരൽചലനം, നിർദ്ദേശിക്കുക, നിർദ്ദേശം, തീം, നിന്ദ്യം, പദം, ടൈപ്പുചെയ്യുക, ഇമോജി, അന്തർദ്ദേശീയം"</string>
@@ -2872,6 +2924,7 @@
<item quantity="one">ഒരു നയം</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"ശല്യം ചെയ്യരുത്"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"\'ശല്യപ്പെടുത്തരുത്\' ഓണാക്കുക"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"പ്രവർത്തനരീതി"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ഇനിപ്പറയുന്നതിൽ നിന്നുള്ള ശബ്ദങ്ങളും അലാറമുകളും അനുവദിക്കുക"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ശബ്ദമില്ല"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"സ്വമേധയാ ഓണാക്കുക"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"സ്വമേധയാലുള്ള നയങ്ങൾ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"സ്വമേധയായുള്ള നയം"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\'ശല്യപ്പെടുത്തരുത്\' നിയമങ്ങൾ സജ്ജമാക്കുക"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ചില സമയത്ത് ശബ്ദവും വൈബ്രേഷനും പരിമിതപ്പെടുത്തുക"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"പൂർണ്ണ നിശബ്ദത"</string>
@@ -2890,12 +2946,15 @@
<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_add" msgid="90014394953272517">"ചേർക്കുക"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ഇപ്പോൾ ഓണാക്കുക"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ഇപ്പോൾ ഓഫ് ചെയ്യുക"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"ഓണാക്കുക"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ഇപ്പോൾ ഓണാക്കുക"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ഇപ്പോൾ ഓഫ് ചെയ്യുക"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> വരെ \'ശല്യപ്പെടുത്തരുത്\' ഓണാണ്"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"നിങ്ങൾ ഓഫാക്കുന്നത് വരെ \'ശല്യപ്പെടുത്തരുത്\' ഓണായി തുടരും"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"ഒരു നയം (<xliff:g id="RULE_NAME">%s</xliff:g>) സ്വമേധയാ \'ശല്യപ്പെടുത്തരുത്\' ഓണാക്കി"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"ഒരു ആപ്പ് (<xliff:g id="APP_NAME">%s</xliff:g>) സ്വമേധയാ \'ശല്യപ്പെടുത്തരുത്\' ഓണാക്കി"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"മുൻഗണന മാത്രം"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2970,7 @@
<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="recent_notifications" msgid="5660639387705060156">"അടുത്തിടെ അയച്ചവ"</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>
@@ -2930,7 +2990,7 @@
<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_importance_title" msgid="848692592679312666">"പ്രാധാന്യം"</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="5455049524984686275">"ശബ്ദപരമോ ദൃശ്യപരമോ ആയ തടസ്സമില്ല"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"ഇടത്തരം പ്രാധാന്യം"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"അറിയിപ്പ് ആക്സസ്സ്"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ഔദ്യോഗിക പ്രൊഫൈൽ അറിയിപ്പുകളിലേക്കുള്ള ആക്സസ്സ് ബ്ലോക്കുചെയ്തു"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"\'ശല്യപ്പെടുത്തരുത്\' ആക്സസ്സ്"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"ഇൻസ്റ്റാളുചെയ്തവയൊന്നും \'ശല്യപ്പെടുത്തരുത്\' മോഡിൽ പ്രവേശിക്കാൻ അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"ഈ ആപ്പിന്റെ അറിയിപ്പുകൾ ഉപകരണത്തില് ദൃശ്യമാകുന്നത് Android തടസ്സപ്പെടുത്തുന്നു"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"ഈ ഉപകരണത്തിൽ ഈ വിഭാഗത്തിൽ പെട്ട അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്കുചെയ്യുന്നു"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"ഈ ഗ്രൂപ്പിൽ പെട്ട അറിയിപ്പുകൾ ഈ ഉപകരണത്തിൽ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഉപകരണത്തിൽ ഈ ആപ്പിന്റെ അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഉപകരണത്തിൽ ഈ വിഭാഗത്തിൽപ്പെട്ട അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഗ്രൂപ്പിൽപ്പെട്ട അറിയിപ്പുകൾ ഈ ഉപകരണത്തിൽ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
<string name="notification_channels" msgid="5346841743182627500">"വിഭാഗങ്ങള്"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"മറ്റുള്ളവ"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ഉപകരണം അൺലോക്കുചെയ്യാൻ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കുന്നതിന് പുറമെ, ഉപകരണം ആരംഭിക്കുന്നതിന് മുമ്പ്, പാറ്റേൺ ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ സ്വീകരിക്കാനാകില്ല.\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="1793719723017395175">"അതെ"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"ഇല്ല"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN ആവശ്യമാണോ?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"പാറ്റേൺ ആവശ്യമാണോ?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"പാസ്വേഡ് ആവശ്യമാണോ?"</string>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"നിലവിലെ ഉപയോക്താവ്: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> എന്നയാളായി സൈൻ ഇൻ ചെയ്തു"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ഡിഫോൾട്ട് ആണ്"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ഓൺ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ഓഫ്"</string>
<string name="backup_disabled" msgid="485189128759595412">"ബാക്കപ്പ് പ്രവർത്തനരഹിതമാക്കി"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g>-ലേക്ക് അപ്ഡേറ്റ് ചെയ്തു"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"ബാക്കപ്പുകൾ ഓഫാക്കാനാവില്ല"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"ഈ പ്രവൃത്തി പ്രവർത്തനരഹിതമാക്കി, നിങ്ങളുടെ സ്ഥാപനത്തിന്റെ അഡ്മിനെ ബന്ധപ്പെടുക."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"കൂടുതൽ വിശദാംശങ്ങൾ"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"ക്രമീകരണവും അനുമതികളും കോർപ്പറേറ്റ് ആക്സസ്സും നെറ്റ്വർക്ക് ആക്റ്റിവിറ്റിയും ഉപകരണത്തിന്റെ ലൊക്കേഷൻ വിവരങ്ങളും ഉൾപ്പെടെ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലുമായി ബന്ധപ്പെട്ട ആപ്സും ഡാറ്റയും നിരീക്ഷിക്കാനും മാനേജുചെയ്യാനും അഡ്മിന് കഴിയും."</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"ഔദ്യോഗിക പ്രൊഫൈൽ ഓഫാണ്"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലുമായി ബന്ധപ്പെട്ട ആപ്സ്, പശ്ചാത്തല സമന്വയം, മറ്റ് ഫീച്ചറുകൾ എന്നിവ ഓഫാക്കിയിരിക്കുന്നു."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"നൈറ്റ് ലൈറ്റ് ഷെഡ്യൂൾ സജ്ജമാക്കുക"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"എളുപ്പത്തിൽ ഉറങ്ങാൻ സ്ക്രീനിന് ആംബർ നിറം"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"നൈറ്റ് ലൈറ്റ് ഓണാണ്"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> കൂടുതൽ"</string>
@@ -3537,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"ഒന്നുമില്ല"</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>
@@ -3559,31 +3628,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ഒന്നിലധികം ഉപകരണങ്ങളിൽ കണക്റ്റുചെയ്തു"</string>
<string name="demo_mode" msgid="2798762752209330277">"സിസ്റ്റം UI ഡെമോ മോഡ്"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ദ്രുത ക്രമീകരണ ഡെവലപ്പർ ടൈലുകൾ"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"സഹായിക്കാൻ ഞങ്ങൾ ഇവിടെയുണ്ട്"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"നിങ്ങൾക്ക് 24/7 സഹായം നൽകാൻ ഞങ്ങളുണ്ട്"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"നിങ്ങൾക്ക് 24/7 സഹായം നൽകാൻ ഞങ്ങളുണ്ട്"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"ഏത് പ്രശ്നവും പരിഹരിക്കുന്നതിന് ഞങ്ങളുടെ പിന്തുണ ടീമിന്റെ സഹായം ലഭിക്കും"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ദിവസം മുഴുവനും എല്ലാ സമയവും ഞങ്ങളുടെ പിന്തുണ ടീം സഹായത്തിനുണ്ട്"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"സഹായം തിരയുക അല്ലെങ്കിൽ പിന്തുണ സമയ (പ്രാദേശിക സമയം) വേളയിൽ തിരികെ വരിക:<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ഫോൺ പിന്തുണ സമയം (പ്രാദേശിക സമയം)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"സഹായം തിരയുക അല്ലെങ്കിൽ നുറുങ്ങുവിവരങ്ങളും പൊടിക്കൈകളും അടുത്തറിയുക"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"ഇതിനായുള്ള പിന്തുണ:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"വിദേശത്തേക്ക് യാത്ര ചെയ്യുകയാണോ?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"അന്താരാഷ്ട്ര നിരക്കുകൾ ബാധകമായേക്കാം"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"ഫോൺ"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"ചാറ്റുചെയ്യുക"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"നുറുങ്ങുവിവരങ്ങളും പൊടിക്കൈകളും അടുത്തറിയുക"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"സഹായം തിരയുക, ഫീഡ്ബാക്ക് അയയ്ക്കുക"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"പിന്തുണാവിഭാഗത്തെ ബന്ധപ്പെടുക"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"സൈൻ ഇൻ ചെയ്യുക"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"സൈൻ ഇൻ ചെയ്യാൻ കഴിയുന്നില്ലേ?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"സിസ്റ്റം വിവരങ്ങൾ അയയ്ക്കുക"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"വീണ്ടും കാണിക്കരുത്"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"ഇനിപ്പറയുന്നതായി അഭ്യർത്ഥിക്കുന്നു"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"അക്കൗണ്ട് ചേർക്കുക"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"സിസ്റ്റം വിവരങ്ങൾ"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"വിൻഡോ ട്രെയ്സ്"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ഉപരിതല ട്രെയ്സ്"</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>
@@ -3599,11 +3645,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> സെക്കൻഡ്</item>
<item quantity="one">ഒരു സെക്കൻഡ്</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> കാക്കുക"</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="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>
@@ -3614,32 +3660,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ക്യാമറ തുറക്കുന്നതിന് പവർ ബട്ടണിൽ രണ്ടുതവണ അമർത്തുക"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"സെൽഫി മോഡിന് ഫോൺ രണ്ടുതവണ തിരിക്കുക"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"സെൽഫി മോഡിന് ടാബ്ലെറ്റ് രണ്ടുതവണ തിരിക്കുക"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"സെൽഫി മോഡിന് ഉപകരണം രണ്ടുതവണ തിരിക്കുക"</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_suggestion_summary" msgid="5987443721392571847">"സ്ക്രീൻ ഓഫായിരിക്കുമ്പോൾ അറിയിപ്പുകൾ പരിശോധിക്കുക"</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_pickup_suggestion_summary" msgid="7014700589991761035">"സ്ക്രീൻ ഓഫായിരിക്കുമ്പോൾ അറിയിപ്പുകൾ പരിശോധിക്കുക"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"നിങ്ങളുടെ അറിയിപ്പുകൾ പരിശോധിക്കാൻ, ഉപകരണത്തിന്റെ പിൻവശത്തുള്ള വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"അറിയിപ്പുകൾ വേഗത്തിൽ കാണുക"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"ഓൺ"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"ഓഫ്"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ബൂട്ട്ലോഡർ ഇതിനകം അൺലോക്കുചെയ്തിട്ടുണ്ട്"</string>
@@ -3769,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"ഡയറക്റ്ററി ആക്സസ്"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"ഡയറക്റ്ററി ആക്സസ്"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index ac70b05..b51e995 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"1 तास"</item>
<item msgid="5198271470953124739">"कधीही टाइमआउट नाही"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"१ (डिफॉल्ट)"</item>
+ <item msgid="7584056855393485416">"२"</item>
+ <item msgid="844570832050176311">"३"</item>
+ <item msgid="1896812737336024220">"४"</item>
+ <item msgid="2664420770707984266">"५"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"१"</item>
+ <item msgid="2731443086402670729">"२"</item>
+ <item msgid="74627748729027880">"३"</item>
+ <item msgid="2654447223197666662">"४"</item>
+ <item msgid="7026157954713482328">"५"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"खराब"</item>
<item msgid="2042505933058940139">"खराब"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"60 दिवसांपेक्षा अधिक जुने"</item>
<item msgid="5692284879054004388">"90 दिवसांपेक्षा अधिक जुने"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"नेटवर्क प्राधान्य वापरा"</item>
+ <item msgid="8745603368609022803">"मीटरने मोजले जात असल्याचे धरा"</item>
+ <item msgid="2266114985518865625">"मीटरने मोजले जात नसल्याचे धरा"</item>
+ </string-array>
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index ed79038..4fd192b 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तुमचे डिव्हाइस"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नवीन डिव्हाइस जोडा"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"डिव्हाइसला ब्लुटूथ डिव्हाइससोबत पेअर आणि कनेक्ट होऊ द्या"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"इनबॅंड रिंग होणे बंद करा"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"ब्लूटूथ हेडसेटवर कस्टम फोन रिंगटोन प्ले करू नका"</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>
@@ -202,7 +204,7 @@
<string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="3242990404410530456">"सेल स्थान माहिती (बहिष्कृत):"</string>
<string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"शेजारील सेल माहिती (बहिष्कृत):"</string>
- <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"सेल माहिती रीफ्रेश रेट:"</string>
+ <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"सेल माहिती रिफ्रेश रेट:"</string>
<string name="radio_info_cellinfo_label" msgid="6213223844927623098">"सर्व सेल परिमाण माहिती:"</string>
<string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"डेटा कनेक्शन रीअल-टाइम माहिती:"</string>
<string name="radio_info_gprs_service_label" msgid="4209624131644060517">"डेटा सेवा:"</string>
@@ -228,7 +230,7 @@
<string name="ping_test_label" msgid="579228584343892613">"पिंग चाचणी चालवा"</string>
<string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="7258686760358791539">"अपडेट करा"</string>
- <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"रीफ्रेश करा"</string>
+ <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"रिफ्रेश करा"</string>
<string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"DNS तपासणी टॉगल करा"</string>
<string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-विशिष्ट माहिती/सेटिंग्ज"</string>
<string name="band_mode_title" msgid="4071411679019296568">"रेडिओ बॅण्ड मोड सेट करा"</string>
@@ -330,6 +332,16 @@
<string name="date_time_set_date" msgid="7021491668550232105">"तारीख सेट करा"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"अक्षरानुक्रमे क्रमवारी लावा"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"टाइम झोन नुसार क्रमवारी लावा"</string>
+ <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+ <skip />
+ <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+ <skip />
+ <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+ <skip />
<string name="date_picker_title" msgid="1338210036394128512">"तारीख"</string>
<string name="time_picker_title" msgid="483460752287255019">"वेळ"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"स्वयंचलितपणे लॉक करा"</string>
@@ -348,6 +360,8 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफाईल माहिती"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"खाती"</string>
<string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
+ <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+ <skip />
<string name="account_settings_title" msgid="626177544686329806">"खाती"</string>
<string name="security_settings_title" msgid="4918904614964215087">"सुरक्षितता आणि स्थान"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"एंक्रिप्शन आणि क्रेडेंशियल"</string>
@@ -638,7 +652,7 @@
<string name="bluetooth_error_title" msgid="6850384073923533096"></string>
<string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह कनेक्ट करणे शक्य झाले नाही."</string>
<string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"डिव्हाइसेससाठी स्कॅन करा"</string>
- <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"रीफ्रेश करा"</string>
+ <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"रिफ्रेश करा"</string>
<string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"शोधत आहे..."</string>
<string name="bluetooth_preference_device_settings" msgid="907776049862799122">"डिव्हाइस सेटिंग्ज"</string>
<string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"पेअर केलेले डिव्हाइस"</string>
@@ -691,6 +705,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्पीकर फोन म्हणून"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत आणि मीडियासाठी"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग्ज लक्षात ठेवा"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"जास्तीत जास्त कनेक्ट होऊ शकणारी ऑडिओ डिव्हाइस"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"जास्तीत जास्त कनेक्ट होऊ शकणार्या ऑडिओ डिव्हाइसची संख्या निवडा"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"कास्ट करा"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस डिस्प्ले सुरू करा"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"कोणतीही जवळपासची डिव्हाइसेस आढळली नाहीत."</string>
@@ -705,6 +721,8 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"नाव"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+ <skip />
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> वाय-फाय चालू करू इच्छित आहे"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> वाय-फाय बंद करू इच्छित आहे"</string>
@@ -722,6 +740,8 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"वाय-फाय"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"वाय-फाय चालू करा"</string>
<string name="wifi_settings" msgid="29722149822540994">"वाय-फाय"</string>
+ <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+ <skip />
<string name="wifi_settings_category" msgid="8719175790520448014">"वाय-फाय सेटिंग्ज"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"वाय-फाय"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस प्रवेश बिंदू सेट करा आणि व्यवस्थापित करा"</string>
@@ -833,7 +853,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आपला नेटवर्क पासवर्ड एंटर करा"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"वाहक वाय-फाय नेटवर्क"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ने कनेक्ट करा"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> ने कनेक्ट करा"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान अचूकता सुधारण्यासाठी आणि इतर हेतूंसाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला नेटवर्क स्कॅनिंग चालू करण्याची आवश्यकता आहे, वाय-फाय बंद असताना देखील.\n\nस्कॅन करू इच्छित सर्व अॅप्सना अनुमती द्यायची?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"हे बंद करण्यासाठी, ओव्हरफ्लो मेनू मधील प्रगत वर जा."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमती द्या"</string>
@@ -909,10 +929,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"तुमच्या इतर डिव्हाइससाठी वाय-फाय नेटवर्क तयार करण्यासाठी हॉटस्पॉटचा वापर करा. हॉटस्पॉट तुमचे मोबाइल डेटा कनेक्शन वापरून इंटरनेट पुरवते. अतिरिक्त मोबाइल डेटा शुल्क लागू शकते."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"जवळपासच्या डिव्हाइससोबत आशय शेअर करण्यासाठी अॅप्स हॉटस्पॉट तयार करू शकतात."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"हॉटस्पॉट आपोआप बंद करा"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"कुठलीही डिव्हाइस कनेक्ट केली नसल्यास, वाय-फाय हॉटस्पॉट बंद होईल"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्पॉट चालू करत आहे…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्पॉट बंद करत आहे…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय आहे"</string>
@@ -961,6 +979,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"संकटकालीन पत्ता"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"तुम्ही Wi-Fi वरून आणीबाणी कॉल केल्यावर हे तुमचे स्थान असल्याचे दाखवले जाते"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"खाजगी DNS वैशिष्ट्यांबद्दल "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"डिस्प्ले"</string>
<string name="sound_settings" msgid="5534671337768745343">"ध्वनी"</string>
<string name="all_volume_title" msgid="4296957391257836961">"आवाज"</string>
@@ -1308,6 +1327,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"आपले नवीन <xliff:g id="NAME">^1</xliff:g> कार्य करत आहे. \n\nया डिव्हाइसवर फोटो, फायली आणि अॅप डेटा हलविण्यासाठी, सेटिंग्ज > संचयनावर जा."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> हलवा"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> आणि त्याचा डेटा <xliff:g id="NAME_0">^2</xliff:g> वर हलविण्यास केवळ काही क्षण लागतील. हलविणे पूर्ण होईपर्यंत आपण अॅप वापरण्यास सक्षम असणार नाहीत. \n\nहलविण्यादरम्यान <xliff:g id="NAME_1">^2</xliff:g> काढू नका."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"डेटा हलवण्यासाठी तुम्हाला <xliff:g id="APP">^1</xliff:g> या वापरकर्त्याला अनलॉक करावे लागेल."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> हलवित आहे…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"हलविण्यादरम्यान <xliff:g id="NAME">^1</xliff:g> काढू नका. \n\nहलविणे पूर्ण होईपर्यंत या डिव्हाइसवरील <xliff:g id="APP">^2</xliff:g> अॅप उपलब्ध नसेल."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"हलविणे रद्द करा"</string>
@@ -1468,6 +1488,8 @@
<string name="location_sources_heading" msgid="1278732419851088319">"स्थान स्रोत"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"टॅबलेट विषयी"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"फोन विषयी"</string>
+ <!-- no translation found for about_settings (6717640957897546887) -->
+ <skip />
<string name="about_settings" product="emulator" msgid="221313099578564438">"अनुकरण केलेल्या डिव्हाइसबद्दल"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"कायदेशीर माहिती, स्थिती, सॉफ्टवेअर आवृत्ती पहा"</string>
<string name="legal_information" msgid="5769301644270604095">"कायदेशीर माहिती"</string>
@@ -1575,6 +1597,8 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"सगळे <xliff:g id="COUNT">%1$d</xliff:g> अॅप्स पहा"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"आपले टॅबलेट आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अॅप्स इंस्टॉल करून, आपण सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्या आपल्या टॅबलेटच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी आपण जबाबदार आहात."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"आपला फोन आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अॅप्स इंस्टॉल करून, आपण सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्या आपल्या फोनच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी आपण जबाबदार आहात."</string>
+ <!-- no translation found for install_all_warning (3648003301476423145) -->
+ <skip />
<string name="advanced_settings" msgid="1777249286757067969">"प्रगत सेटिंग्ज"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"अधिक सेटिंग्ज पर्याय सक्षम करा"</string>
<string name="application_info_label" msgid="5736524913065714880">"अॅप माहिती"</string>
@@ -1874,6 +1898,12 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"कार्यप्रदर्शन प्रभावित करू शकते"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"पॉइंटर हलविणे थांबविल्यानंतर क्लिक करा"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक करण्यापूर्वी विलंब करा"</string>
+ <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+ <skip />
+ <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+ <skip />
+ <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+ <skip />
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"चालू"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"बंद"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"द्रुत सेटिंग्जमध्ये दर्शवा"</string>
@@ -1947,17 +1977,17 @@
<string name="accessibility_no_service_selected" msgid="2840969718780083998">"कोणतीही सेवा निवडलेली नाही"</string>
<string name="accessibility_service_default_description" msgid="1072730037861494125">"वर्णन प्रदान केले नाही."</string>
<string name="settings_button" msgid="3006713718908152930">"सेटिंग्ज"</string>
- <string name="print_settings" msgid="4742428530112487843">"मुद्रण"</string>
+ <string name="print_settings" msgid="4742428530112487843">"प्रिंट"</string>
<string name="print_settings_summary_no_service" msgid="6354322414246865875">"बंद"</string>
<plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
- <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> मुद्रण सेवा चालू</item>
- <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> मुद्रण सेवा चालू</item>
+ <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>
<plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
- <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> मुद्रण कार्य</item>
- <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> मुद्रण कार्ये</item>
+ <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="print_settings_title" msgid="3685449667822217816">"मुद्रण सेवा"</string>
+ <string name="print_settings_title" msgid="3685449667822217816">"प्रिंट सेवा"</string>
<string name="print_no_services_installed" msgid="8443039625463872294">"कोणत्याही सेवा इंस्टॉल केल्या नाहीत"</string>
<string name="print_no_printers_found" msgid="989018646884973683">"कोणतेही प्रिंटर आढळले नाहीत"</string>
<string name="print_menu_item_settings" msgid="6591330373682227082">"सेटिंग्ज"</string>
@@ -1969,12 +1999,12 @@
<string name="print_menu_item_search" msgid="7025589328240514553">"शोध"</string>
<string name="print_searching_for_printers" msgid="4680248496457576358">"प्रिंटर शोधत आहे"</string>
<string name="print_service_disabled" msgid="7739452396114245222">"सेवा अक्षम केली"</string>
- <string name="print_print_jobs" msgid="3582094777756968793">"मुद्रण कार्ये"</string>
- <string name="print_print_job" msgid="7563741676053287211">"मुद्रण कार्य"</string>
+ <string name="print_print_jobs" msgid="3582094777756968793">"प्रिंट कार्ये"</string>
+ <string name="print_print_job" msgid="7563741676053287211">"प्रिंट कार्य"</string>
<string name="print_restart" msgid="8373999687329384202">"रीस्टार्ट"</string>
<string name="print_cancel" msgid="3621199386568672235">"रद्द करा"</string>
<string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
- <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> मुद्रण करत आहे"</string>
+ <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> प्रिंट करत आहे"</string>
<string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> रद्द करत आहे"</string>
<string name="print_failed_state_title_template" msgid="1436099128973357969">"प्रिंटर एरर <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="print_blocked_state_title_template" msgid="9065391617425962424">"प्रिंटरने <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> अवरोधित केले"</string>
@@ -2030,14 +2060,37 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"बॅटरी चांगल्या स्थितीत आहे"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"अॅप्स नेहमीसारखीच काम करत आहेत"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"बॅटरीची क्षमता कमी"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"बॅटरी लाइफ जास्त वेळ टिकण्यासारखी नाही"</string>
+ <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
<skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+ <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+ <skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"फोनचा भरपूर वापर झाला"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"टॅबलेटचा भरपूर वापर झाला"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"डिव्हाइसचा भरपूर वापर झाला"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"पूर्ण चार्ज केल्यापासून साधारणपणे <xliff:g id="HOUR">%1$s</xliff:g> वापरला गेले"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"तुमच्या फोनचा भरपूर वापर करण्यात आल्यामुळे, बॅटरीचा वापरही मोठ्या प्रमाणात झाला. तुमची बॅटरी नेहमीसारखी काम करत आहे.\n\n तुमचा फोन पूर्ण चार्ज केल्यापासून <xliff:g id="HOUR">%1$s</xliff:g> तास वापरला गेला आहे.\n\n एकूण वापर:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"तुमच्या टॅबलेटचा भरपूर वापर झाल्यामुळे, बॅटरीचा वापरसुद्धा मोठ्या प्रमाणात झाला. तुमची बॅटरी नेहमीसारखी काम करत आहे.\n\n तुमचा टॅबलेट पूर्ण चार्ज केल्यापासून <xliff:g id="HOUR">%1$s</xliff:g> तास वापरला गेला आहे.\n\n एकूण वापर:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"तुमच्या डिव्हाइसचा भरपूर वापर करण्यात आल्यामुळे, बॅटरीचा वापरही मोठ्या प्रमाणात झाला. तुमची बॅटरी नेहमीसारखी काम करत आहे.\n\n तुमचे डिव्हाइस पूर्ण चार्ज केल्यापासून <xliff:g id="HOUR">%1$s</xliff:g> तास वापरले गेले आहे.\n\n एकूण वापर:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"स्मार्ट बॅटरी व्यवस्थापक"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"बॅटरी आपोआप व्यवस्थापित करा"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"वापराच्या आधारावर अॅप्सचा वीजवापर आपोआप अॅडजस्ट करा"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"प्रतिबंधित अॅप्स"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d अॅप</item>
+ <item quantity="other">%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>
@@ -2141,11 +2194,13 @@
<string name="menu_stats_unplugged" msgid="8296577130840261624">"अनप्लग केल्यापासून <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> साठी अंतिम अनप्लग केलेले असताना"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"वापर एकूण"</string>
- <string name="menu_stats_refresh" msgid="1676215433344981075">"रीफ्रेश करा"</string>
+ <string name="menu_stats_refresh" msgid="1676215433344981075">"रिफ्रेश करा"</string>
<string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"मीडियासर्व्हर"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"अॅप ऑप्टिमायझेशन"</string>
<string name="battery_saver" msgid="8172485772238572153">"बॅटरी सेव्हर"</string>
+ <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+ <skip />
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"स्वयंचलितपणे चालू करा"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"कधीही नाही"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g>बॅटरीवर"</string>
@@ -2302,7 +2357,7 @@
<string name="wifi_setup_title_add_network" msgid="6932651000151032301">"एक नेटवर्क जोडा"</string>
<string name="wifi_setup_not_connected" msgid="6997432604664057052">"कनेक्ट केले नाही"</string>
<string name="wifi_setup_add_network" msgid="5939624680150051807">"नेटवर्क जोडा"</string>
- <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"सूची रीफ्रेश करा"</string>
+ <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"सूची रिफ्रेश करा"</string>
<string name="wifi_setup_skip" msgid="6661541841684895522">"वगळा"</string>
<string name="wifi_setup_next" msgid="3388694784447820477">"पुढील"</string>
<string name="wifi_setup_back" msgid="144777383739164044">"परत"</string>
@@ -2366,6 +2421,8 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"खाते काढायचे?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"हे खाते काढल्याने त्याचे सर्व संदेश, संपर्क आणि टॅब्लेटवरील अन्य डेटा हटतील!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"हे खाते काढल्याने त्याचे सर्व संदेश, संपर्क आणि फोनवरील अन्य डेटा हटवला जाईल!"</string>
+ <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+ <skip />
<string name="remove_account_failed" msgid="3901397272647112455">"या बदलाला आपल्या प्रशासकाद्वारे अनुमती नाही"</string>
<string name="provider_label" msgid="7724593781904508866">"पुश सदस्यता"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
<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_add" msgid="90014394953272517">"जोडा"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"आता चालू करा"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"आता बंद करा"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"आता चालू करा"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"आता बंद करा"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"व्यत्यय आणू नका <xliff:g id="FORMATTED_TIME">%s</xliff:g> पर्यंत चालू असणार आहे"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"तुम्ही बंद करेपर्यंत व्यत्यय आणू नका चालू राहील"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"<xliff:g id="RULE_NAME">%s</xliff:g> या नियमाने व्यत्यय आणू नका आपोआप चालू केले"</string>
@@ -2930,7 +2987,7 @@
<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_importance_title" msgid="848692592679312666">"महत्त्व"</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="5455049524984686275">"कोणताही ध्वनी किंवा व्हिज्युअल व्यत्यय नाही"</string>
@@ -2948,6 +3005,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"मध्यम महत्त्व"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"सूचना प्रवेश"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफाइल सूचनांचा अॅक्सेस ब्लॉक आहे"</string>
@@ -2978,9 +3036,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"व्यत्यय आणू नका प्रवेश"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"कोणत्याही इंस्टॉल केलेल्या अॅप्सने व्यत्यय आणू नका प्रवेशाची विनंती केली नाही"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"अॅप्स लोड करत आहे..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android या अॅपच्या सूचना या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android या प्रकारच्या सूचना या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"या सूचनांचा गट या डीव्हाइसवर दिसणे Android ब्लॉक करत आहे"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"तुमच्या विनंतीनुसार Android या अॅपच्या सूचना, या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"तुमच्या विनंतीनुसार Android, सूचनांच्या या वर्गवारीचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"तुमच्या विनंतीनुसार Android, सूचनांच्या या समूहाचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
<string name="notification_channels" msgid="5346841743182627500">"श्रेण्या"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3617,10 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"एकाधिक डिव्हाइसशी कनेक्ट केले"</string>
<string name="demo_mode" msgid="2798762752209330277">"सिस्टम UI डेमो मोड"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"द्रुत सेटिंग्ज विकासक टाइल"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"मदत करण्यासाठी आम्ही येथे आहोत"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"आम्ही तुमच्यासाठी 24/7 येथे आहोत"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"आम्ही तुमच्यासाठी 24/7 येथे आहोत"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"कोणत्याही समस्येचे निराकरण करण्यात मदत करण्यासाठी आमचा सहाय्य कार्यसंघ येथे आहे"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"आमचा सहाय्य कार्यसंघ दररोज, दिवसभर येथे आहे"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मदत शोधा किंवा साहाय्य तासांदरम्यान (स्थानिक वेळ) परत या:<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"फोन सहाय्य तास (स्थानिक वेळ)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मदत शोधा किंवा टिपा आणि युक्त्या एक्सप्लोर करा"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"यासाठी समर्थन:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"परदेशी प्रवास करीत आहात?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"आंतरराष्ट्रीय शुल्क लागू होऊ शकते"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"फोन"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"चॅट करा"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"टिपा आणि युक्त्या एक्सप्लोर करा"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"मदत शोधा आणि अभिप्राय पाठवा"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"सहाय्याशी संपर्क साधा"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन करा"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"साइन इन करू शकत नाही?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टम माहिती पाठवा"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"परत दाखवू नका"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"हे विनंती करत आहेत"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"खाते जोडा"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टम माहिती"</string>
+ <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+ <skip />
+ <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+ <skip />
<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>
@@ -3599,11 +3636,12 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> सेकंद</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकंद</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> प्रतीक्षा"</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>
+ <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+ <skip />
<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>
@@ -3659,7 +3697,7 @@
<string name="auto_sync_account_title" msgid="898796354710116383">"डेटा स्वयंचलितपणे संकालित करा"</string>
<string name="auto_sync_personal_account_title" msgid="8496263182646100610">"वैयक्तिक डेटा स्वयंचलितपणे संकालित करा"</string>
<string name="auto_sync_work_account_title" msgid="4489172450037434152">"कार्य डेटा स्वयंचलितपणे संकालित करा"</string>
- <string name="auto_sync_account_summary" msgid="692499211629185107">"अॅप्सना डेटा स्वयंचलितपणे रीफ्रेश करू द्या"</string>
+ <string name="auto_sync_account_summary" msgid="692499211629185107">"अॅप्सना डेटा स्वयंचलितपणे रिफ्रेश करू द्या"</string>
<string name="account_sync_title" msgid="7214747784136106491">"खाते संकालन"</string>
<string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> पैकी <xliff:g id="ID_1">%1$d</xliff:g> आयटमसाठी सिंक करणे चालू आहे"</string>
<string name="account_sync_summary_all_on" msgid="570431636622254156">"सर्व आयटमसाठी सिंक करणे चालू करा"</string>
@@ -3769,8 +3807,10 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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>
+ <!-- no translation found for storage_access (8905018810338984531) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for keywords_storage_access (3708874088152933579) -->
<skip />
</resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 8be20cd..9600d50 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"နှိပ်ရန်ခလုတ်"</item>
<item msgid="1624323946324499595">"တန်းတူစက်ပစ္စည်းမှပင်နံပါတ်"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"၁ နာရီ"</item>
<item msgid="5198271470953124739">"ဘယ်တော့မှ ပိတ်မပစ်ရန်"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"၁ (မူရင်း)"</item>
+ <item msgid="7584056855393485416">"၂"</item>
+ <item msgid="844570832050176311">"၃"</item>
+ <item msgid="1896812737336024220">"၄"</item>
+ <item msgid="2664420770707984266">"၅"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"၁"</item>
+ <item msgid="2731443086402670729">"၂"</item>
+ <item msgid="74627748729027880">"၃"</item>
+ <item msgid="2654447223197666662">"၄"</item>
+ <item msgid="7026157954713482328">"၅"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"ညံ့သည်"</item>
<item msgid="2042505933058940139">"ညံ့သည်"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"ရက်ပေါင်း ၆၀ ထက်ကျော်နေပါပြီ"</item>
<item msgid="5692284879054004388">"ရက်ပေါင်း ၉၀ ထက်ကျော်နေပါပြီ"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"ကွန်ရက် စိတ်ကြိုက်ရွေးချယ်မှုကို အသုံးပြုရန်"</item>
+ <item msgid="8745603368609022803">"အခမဲ့ မဟုတ်သော အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်"</item>
+ <item msgid="2266114985518865625">"အခမဲ့ အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်"</item>
+ </string-array>
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 48a1b59..d9d5052 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -20,7 +20,7 @@
<string name="no" msgid="6731231425810196216">"No"</string>
<string name="create" msgid="3578857613172647409">"ဖန်တီးရန်"</string>
<string name="allow" msgid="3349662621170855910">"ခွင့်ပြုပါ"</string>
- <string name="deny" msgid="6947806159746484865">"ငြင်းပယ်ခြင်း"</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>
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"သင်၏ စက်ပစ္စည်းများ"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"စက်ပစ္စည်းအသစ်ကို တွဲချိတ်ရန်"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"တွဲချိတ်၍ ဘလူးတုသ် ကိရိယာများသို့ ချိတ်ဆက်ရန် စက်ကိုခွင့်ပြုပါ"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ဘလူးတုသ်နားကြပ်တွင် ဖုန်းမြည်သံကို ပိတ်ရန်"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"မိမိစိတ်ကြိုက် ဖုန်းမြည်သံများကို ဘလူးတုသ်နားကြပ်တွင် မဖွင့်ရန်"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"ရက်စွဲ သတ်မှတ်ရန်"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"အက္ခရာစဉ်အလိုက်စီရန်"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"အချိန်ဇုန်နယ်အလိုက်စီရန်"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> သည် <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> တွင် စတင်ပါသည်။"</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"ဆောင်းရာသီ စံတော်ချိန်"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"စံတော်ချိန်"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"ဒေသအလိုက် စံတော်ချိန်"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"ပုံသေ စံတော်ချိန်"</string>
<string name="date_picker_title" msgid="1338210036394128512">"ရက်စွဲ"</string>
<string name="time_picker_title" msgid="483460752287255019">"အချိန်"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"အလိုအလျောက်လော့ခ်ချရန်"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"လော့ခ်မျက်နှာပြင်စာ"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"ဝဒ်ဂျက်များဖွင့်ရန်"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"စီမံခန့်ခွဲသူက ပိတ်ထားသည်"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"ပိတ်ရန် ရွေးချယ်စရာများကို ပြခြင်း"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"ထပ်တိုး အသုံးပြုခွင့်နှင့် လက်ဗွေဖြင့် လော့ဖ်ဖွင့်ခြင်းကို ပိတ်သည့် မျက်နှာပြင်ပြသမှု ပါဝါခလုတ်။"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"မရှိ"</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">"ဥပမာ၊ Joe ၏ Android"</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"ကိုယ်ရေးအချက်အလက်"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"အကောင့်များ"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"အသွင်ဝှက်ခြင်းနှင့် အထောက်အထားများ"</string>
@@ -459,9 +469,11 @@
<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="8971630898700461034">"မျက်နှာပြင်လော့ခ်ကို သတ်မှတ်ပါ"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"သင့်စက်ပစ္စည်းအား ကာကွယ်ပါ"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"လက်ဗွေရာကို သုံးပါ"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"မျက်နှာပြင်လော့ခ် သတ်မှတ်ရန်"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"အခြားသူများ သင့်တက်ဘလက်ကို အသုံးမပြုနိုင်အောင် ကာကွယ်ပါ"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"အခြားသူများ သင့်စက်ပစ္စည်းကို အသုံးမပြုနိုင်အောင် ကာကွယ်ပါ"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"အခြားသူများ သင့်ဖုန်းကို အသုံးမပြုနိုင်အောင် ကာကွယ်ပါ"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"လက်ဗွေရာသုံး၍ လော့ခ်ဖွင့်ခြင်း"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"သင့်လက်ဗွေဖြင့် သော့ဖွင့်ပါ"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"မျက်နှာပြင်လော့ခ်ချနည်းရွေးရန်"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"အလုပ် လော့ခ်ချခြင်းကို ရွေးပါ"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"စပီကာဖုန်းအနေဖြင့်"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"သီချင်းနှင့်မီဒီယာအတွက်"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ဆက်တင်များအားမှတ်မိစေရန်"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ဘလူးတုသ်စက်ပစ္စည်း အများဆုံးချိတ်ဆက်ထားနိုင်သည့် အရေအတွက်"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ချိတ်ဆက်ထားနိုင်သည့် ဘလူးတုသ် ချိတ်ဆက်နိုင်သည့် အများဆုံးအရေအတွက်ကို ရွေးပါ"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"ကာစ်"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ကြိုးမဲ့ ပြသမှုကို ဖွင့်ရန်"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"အနီးတဝိုက်တွင် စက်ပစ္စည်းများ ရှာမတွေ့ပါ။"</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"အမည်"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"လက်မှတ်ထိုးဝင်ရန်"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> က Wi-Fi ဖွင့်လိုသည်"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> က Wi-Fi ပိတ်လိုသည်"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"ဝိုင်ဖိုင်ဖွင့်ရန်"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fi သုံးရန်"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"ဝိုင်ဖိုင်ဆက်တင်များ"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"ကြိုးမဲ့ချိတ်ဆက်ပွိုင့်များအား သတ်မှတ်ခြင်း & စီမံခြင်း"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"စကားဝှက်"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"စကားဝှက်ကို ပြသရန်"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP လှိုင်း ရွေးရန်"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"အလိုအလျောက်"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz Band"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz Band"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ဆက်တင်များ"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSရရှိုနိုင်သည်)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"သင်၏ ကွန်ရက် စကားဝှက်ကို ထည့်သွင်းရန်"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"ဖုန်းကုမ္ပဏီ Wi‑Fi ကွန်ရက်"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> မှတစ်ဆင့် ချိတ်ဆက်ရန်"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> မှတစ်ဆင့် ချိတ်ဆက်ရန်"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"တည်နေရာ တိကျမှုနှင့် တခြားရည်ရွယ်ချက်များအတွက် ပိုကောင်းစေရန် <xliff:g id="APP_NAME">%1$s</xliff:g> သည် ဝိုင်ဖိုင်ပိတ်ထားချိန်မှာပင်လျှင် ကွန်ရက်ရှာဖွေမှုကို ဖွင့်လိုသည်။\n\n အခြား ရှာဖွေလိုသော အပလီကေးရှင်းအားလုံးကို ခွင့်ပြုရမည်လား?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ဒါကို ပိတ်ရန်၊ လျှံစီး မီနူးထဲက အဆင့်မြင့် ဆီကို သွားပါ။"</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ခွင့်ပြုရန်"</string>
@@ -909,10 +926,8 @@
<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_local_only" msgid="857988412470694109">"ပါဝင်သည့်အကြောင်းအရာများကို အနီးတစ်ဝိုက်ရှိ စက်ပစ္စည်းများနှင့် မျှဝေရန်အတွက် အက်ပ်များက ဟော့စပေါ့တစ်ခု ဖွင့်နိုင်ပါသည်။"</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ဟော့စပေါ့ကို အလိုအလျောက် ပိတ်ခြင်း"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"မည်သည့် စက်ပစ္စည်းကိုမျှ ချိတ်ဆက်ထားခြင်း မရှိလျှင် Wi‑Fi ဟော့စပေါ့ကို ပိတ်သွားပါမည်"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"ဟော့စပေါ့ ဖွင့်နေသည် …"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"ဟော့စပေါ့ ပိတ်နေသည် …"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ပွင့်နေသည်"</string>
@@ -923,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android ဟော့စပေါ့"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi ခေါ်ဆိုမှု"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi ခေါ်ဆိုမှုဖွင့်ပါ"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"မိုဘိုင်းကွန်ယက် အစား Wi-Fi ကိုအသုံးပြုပါ"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Wi-Fi သုံး၍ ခေါ်ဆိုခြင်းဖြင့် လိုင်းပိုမိလာအောင် လုပ်ပါ"</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>
@@ -961,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"အရေးပေါ်လိပ်စာ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi သုံး၍ အရေးပေါ်ဖုန်းခေါ်သောအခါ အသုံးပြုသည့် သင့်တည်နေရာ"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"သီးသန့် DNS ဝန်ဆောင်မှုများအကြောင်း "<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"ဖန်သားပြင်"</string>
<string name="sound_settings" msgid="5534671337768745343">"အသံ"</string>
<string name="all_volume_title" msgid="4296957391257836961">"အသံအတိုးအကျယ်"</string>
@@ -1175,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"မိုဘိုင်းကွန်ယက်အမျိုးအစား"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"ဖုန်းလိုင်းကုမ္ပဏီအကြောင်း"</string>
<string name="status_data_state" msgid="5503181397066522950">"မိုဘိုင်းကွန်ယက်အခြေအနေ"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"ဝန်ဆောင်မှု အခြေအနေ"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"ထုတ်လွင့်မှုအား"</string>
<string name="status_roaming" msgid="2638800467430913403">"ရုန်းမင်း"</string>
@@ -1308,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"သင့်<xliff:g id="NAME">^1</xliff:g>အသစ်သည် အလုပ်လုပ်ပါပြီ။ \n\nဓာတ်ပုံများ၊ ဖိုင်များနှင့် အပ်ဖ်ဒေတာများကို ဤစက်ပစ္စည်းသို့ ရွှေ့ရန် ကြိုတင်ချိန်ညှိချက်များထဲမှ > သိုလှောင်မှုသို့ သွားပါ။"</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ရွှေ့မည်"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> နှင့်၎င်း၏ ဒေတာများကို<xliff:g id="NAME_0">^2</xliff:g> သို့ရွှေ့ခြင်းသည် အချိန်အနည်းငယ် ကြာပါမည်။ ရွှေ့လျားမှု မပြီးမြောက်မချင်း အပ်ဖ်များကို အသုံးပြု၍ရမည် မဟုတ်ပါ။ \n\nရွှေ့လျားနေစဉ် <xliff:g id="NAME_1">^2</xliff:g> ကိုမဖယ်ရှားပါနှင့်။"</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ဒေတာများကို ရွှေ့ရန် အသုံးပြုသူ <xliff:g id="APP">^1</xliff:g> ကို လော့ခ်ဖွင့်ရပါမည်။"</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g>ရွှေ့နေသည်…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ရွှေ့လျားနေစဉ် <xliff:g id="NAME">^1</xliff:g>ကိုမဖယ်ရှားပါနှင့်။ \n\nဤစက်ပစ္စည်းပေါ်ရှိ <xliff:g id="APP">^2</xliff:g> အပ်ဖ်ကို ရွှေလျားမှုမပြီးသ၍ အသုံးပြု၍ရမည်မဟုတ်ပါ။"</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ရွှေ့လျားမှု ပယ်ဖျက်မည်"</string>
@@ -1360,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"ကွန်ရက်၊ အက်ပ် (သို့) ကိရိယာများကို ပြင်ဆင်သတ်မှတ်နိုင်ပါသည်"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi၊ မိုဘိုင်းနှင့် ဘလူးတုသ်ကို ပြင်ဆင်သတ်မှတ်ရန်"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"၎င်းသည် အောက်ပါတို့အပါအဝင် ကွန်ရက်ဆက်တင်များအားလုံးကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်−\n\n"<li>"Wi‑Fi"</li>\n<li>"မိုဘိုင်းဒေတာ"</li>\n<li>"ဘလူးတုသ်"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"eSIM များကိုလည်း ပြင်ဆင်သတ်မှတ်ရန်"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"ဖုန်းပေါ်ရှိ eSIM များအားလုံးကို ဖျက်ရန်။ သင်၏ eSIM များကို ပြန်လည်ဒေါင်းလုဒ်လုပ်ရန် သင်၏ မိုဘိုင်းဝန်ဆောင်မှုပေးသူကို ဆက်သွယ်ရပါမည်။ ၎င်းသည် သင်၏ မိုဘိုင်းဝန်ဆောင်မှု အစီအစဉ်ကို ပယ်ဖျက်လိုက်မည် မဟုတ်ပါ။"</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"ဆက်တင်များ ပြန်လည်သတ်မှတ်ရန်"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"ကွန်ရက်ချိန်ညှိချက်များအားလုံးပြန်လည်သတ်မှတ်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍ မရပါ!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"ဆက်တင်များ ပြန်လည်သတ်မှတ်ရန်"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"ပြန်လည်စတင်ရန် ပြုလုပ်မလား?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"ဤအသုံးပြုသူအတွက် ကွန်ရက်ပြန်လည်သတ်မှတ်မှု မရရှိနိုင်ပါ"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"ကွန်ရက်ချိန်ညှိချက်များ ပြန်လည်သတ်မှတ်ပြီးပါပြီ"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM များ ပြင်ဆင်သတ်မှတ်၍မရပါ"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"အမှားတစ်ခုကြောင့် eSIM များ ပြင်ဆင်သတ်မှတ်၍မရပါ။"</string>
<string name="master_clear_title" msgid="3531267871084279512">"ဒေတာအားလုံးကို ဖျက်ရန် (စက်ရုံထုတ်ဆက်တင်အတိုင်း ပြင်ဆင်သတ်မှတ်ရန်)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ဤသည်မှာ သင့်တက်ဘလက်ထဲရှိ"<b></b>"သင့်ဂူးဂဲလ်အကောင့်\n\n"<li>"စနစ်နှင့် အက်ပ်ဒေတာနှင့် ဆက်တင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အက်ပ်"</li>"iအပါအဝင်\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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM ရှိ ဖုန်းကုမ္ပဏီများ"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM များ"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"၎င်းက သင်၏ မိုဘိုင်းဝန်ဆောင်မှုအစီအစဉ်ကို ဖျက်သိမ်းမည်မဟုတ်ပါ။"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"သီချင်း၊ ပုံများနှင့် အသုံးပြုသူ၏တခြားဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"USBသိုလှောင်ကိရိယာ"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"သီချင်း၊ ပုံများနှင့် တခြားသောအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SDကဒ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
@@ -1432,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"ကျေးဇူးပြု၍ အင်တာနက်ဖြင့် ချိတ်ဆက်ပါ။"</string>
<string name="location_title" msgid="1029961368397484576">"ကျွန်ုပ်၏တည်နေရာ"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"အလုပ်ပရိုဖိုင်အတွက် တည်နေရာ"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"စနစ်"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"တိကျမှုမြင့်မားခြင်း"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ဘက်ထရီအသုံးပြုမှု ချွေတာရန်"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"စက်ပစ္စည်းသာလျှင်"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"တည်နေရာပိတ်ရန်"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"အက်ပ်အဆင့် ခွင့်ပြုချက်များ"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"လတ်တလောတည်နေရာ တောင်းခံမှုများ"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"လတ်တလောတွင် မည်သည့်အပလီကေးရှင်းမှ တည်နေရာကို တောင်းခံမှုမရှိပါ။"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"တည်နေရာဝန်ဆောင်မှုများ"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"ဘက်ထရီအသုံးပြုမှုမြင့်သော"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"ဘက်ထရီအသုံးပြုမှုနိမ့်သော"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"တည်နေရာပြစနစ်"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"တည်နေရာကို ဆုံးဖြတ်ရန် GPS၊ Wi-Fi၊ ဘလူးတုသ် သို့မဟုတ် မိုဘိုင်းကွန်ရက်များကို အသုံးပြုပါ"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"တည်နေရာကို ဆုံးဖြတ်ရန် Wi-Fi၊ ဘလူးတုသ် သို့မဟုတ် မိုဘိုင်းကွန်ရက်များကို အသုံးပြုပါ"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"တည်နေရာကို ဆုံးဖြတ်ရန် GPS နှင့် စက်ပစ္စည်း၏ အာရုံခံကိရိယာများကို သုံးပါ"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"ကြည့်ရှုနေပါသည်"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi ရှာဖွေနေသည်"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"စနစ်၏ အက်ပ်များနှင့် ဝန်ဆောင်မှုများအား Wi-Fi စက်ပစ္စည်းများကို အချိန်မရွေး ရှာဖွေခွင့်ပေးခြင်းဖြင့် တည်နေရာရှာဖွေခြင်းကို ပို၍ကောင်းမွန်စေမည်။"</string>
@@ -1468,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"တည်နေရာ ရင်းမြစ်များ"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"ဥပဒေဆိုင်ရာအချက်အလက်၊ အခြေအနေ၊ ဆော့ဝဲလ်ဗားရှင်းအား ကြည့်ရှုရန်"</string>
<string name="legal_information" msgid="5769301644270604095">"ဥပဒေဆိုင်ရာအချက်အလက်များ"</string>
@@ -1575,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"အက်ပ် <xliff:g id="COUNT">%1$d</xliff:g> ခုလုံးကို ကြည့်ရန်"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"သင်၏တက်ဘလက်နှင့် ကိုယ်ရေးကိုယ်တာ အချက်အလက်များသည် အမျိုးအမည် မသိသောအက်ပ်များ၏ တိုက်ခိုက်ခြင်းကို ပိုမိုခံရနိုင်ပါသည်။ ဤနေရာမှ ရယူထားသည့် အက်ပ်များကို ထည့်သွင်းအသုံးပြုခြင်းဖြင့် ဖြစ်ပေါ်လာနိုင်သော ဖုန်းပျက်စီးမှု သို့မဟုတ် ဒေတာဆုံးရှုံးမှုများအတွက် သင့်ထံ၌သာ တာဝန်ရှိကြောင်းကို သင်က သဘောတူရာရောက်ပါသည်။"</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"သင်၏ဖုန်းနှင့် ကိုယ်ရေးကိုယ်တာ အချက်အလက်များသည် အမျိုးအမည် မသိသောအက်ပ်များ၏ တိုက်ခိုက်ခြင်းကို ပိုမိုခံရနိုင်ပါသည်။ ဤနေရာမှ ရယူထားသည့် အက်ပ်များကို ထည့်သွင်းအသုံးပြုခြင်းဖြင့် ဖြစ်ပေါ်လာနိုင်သော ဖုန်းပျက်စီးမှု သို့မဟုတ် ဒေတာဆုံးရှုံးမှုများအတွက် သင့်ထံ၌သာ တာဝန်ရှိကြောင်းကို သင်က သဘောတူရာရောက်ပါသည်။"</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"သင့်စက်ပစ္စည်းနှင့် ကိုယ်ရေးကိုယ်တာ အချက်အလက်များသည် အမျိုးအမည် မသိသောအက်ပ်များ၏ တိုက်ခိုက်ခြင်းကို ပိုမိုခံရနိုင်ပါသည်။ ဤနေရာမှ ရယူထားသည့် အက်ပ်များကို ထည့်သွင်းအသုံးပြုခြင်းအားဖြင့် ဖြစ်ပေါ်လာနိုင်သော စက်ပစ္စည်းပျက်စီးမှု (သို့) ဒေတာဆုံးရှုံးမှုများအတွက် သင့်ထံ၌သာ တာဝန်ရှိကြောင်းကို သင်သဘောတူထားပါသည်။"</string>
<string name="advanced_settings" msgid="1777249286757067969">"အဆင့်မြင့်အပြင်အဆင်များ"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"ပိုမိုပြီးရွေးချယ်နိုင်သော အပြင်အဆင်များ ရရှိခြင်း"</string>
<string name="application_info_label" msgid="5736524913065714880">"အက်ပ်အချက်အလက်များ"</string>
@@ -1874,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"စွမ်းဆောင်ရည် ကျစေနိုင်ပါသည်"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ညွှန်တံရပ်သွားသည့်အခါ နှိပ်ရန်"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"မနှိပ်မီ စောင့်ချိန်"</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_summary_state_enabled" msgid="8359913912320966304">"ဖွင့်ပါ"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ပိတ်ထားသည်"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"အမြန်ဆက်တင်များတွင်ပြပါ"</string>
@@ -1987,7 +2005,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> ကျန်ရှိနေ"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> အားသွင်းမည်"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"နောက်ခံ လုပ်ဆောင်မှု"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"ကန့်သတ်ထားသည်"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"အက်ပ်ကို နောက်ခံတွင် ဖွင့်ခွင့်ပြုပါ"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"အက်ပ်ကို အသုံးမပြုသည့်အခါတွင် ၎င်းအားနောက်ခံတွင် ဖွင့်ထားနိုင်သည်"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"အက်ပ်ကို အသုံးမပြုသည့်အခါတွင် ၎င်း၏နောက်ခံ လုပ်ဆောင်ချက်အား ကန့်သတ်ထားပါသည်"</string>
@@ -2030,14 +2048,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"ဘက်ထရီသည် ကောင်းမွန်စွာ လုပ်ဆောင်နေပါသည်"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"အက်ပ်များသည် ပုံမှန်လုပ်ဆောင်နေပါသည်"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ဘက်ထရီစွမ်းရည်နည်း"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ဘက်ထရီက ကောင်းမွန်သော ဘက်ထရီသက်တမ်း ထုတ်မပေးနိုင်ပါ"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"အဆင့်မြင့် ဘက်ထရီစီမံခန့်ခွဲမှုစနစ်ကို ဖွင့်ခြင်း"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"ဘက်ထရီအသုံးပြုမှု ပိုကောင်းလာစေရန်အတွက် ဖွင့်ပါ"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"ဘက်ထရီအားနည်းသည့်မုဒ်ကို ဖွင့်ခြင်း"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"သင်၏ ဘက်ထရီသက်တမ်းကို တိုးမြှင့်လိုက်ပါ"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"ဘက်ထရီအားနည်းသည့်မုဒ်ကို ဖွင့်ထားခြင်း"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"အချို့ဝန်ဆောင်မှုများကို ကန့်သတ်ထားသည်"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ဖုန်းအသုံးပြုမှုများခြင်း"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"တက်ဘလက် အသုံးပြုများခြင်း"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"စက်အသုံးပြုမှုများခြင်း"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် <xliff:g id="HOUR">%1$s</xliff:g> ခန့် အသုံးပြုထားပါသည်"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"သင့်စက်ကို အသုံးပြုမှုများသောကြောင့် ဘက်ထရီအားကိုလည်း များစွာသုံးထားပါသည်။ သင့်ဘက်ထရီသည် ပုံမှန် အလုပ်လုပ်နေပါသည်။\n\n နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် သင့်စက်ကို <xliff:g id="HOUR">%1$s</xliff:g> ခန့် သုံးထားပါသည်။\n\n စုစုပေါင်း အသုံးပြုမှု-"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"သင့်တက်ဘလက်ကို အသုံးပြုမှုများသောကြောင့် ဘက်ထရီအားကိုလည်း များစွာသုံးထားပါသည်။ သင့်ဘက်ထရီသည် ပုံမှန် အလုပ်လုပ်နေပါသည်။\n\n နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် သင့်တက်ဘလက်ကို <xliff:g id="HOUR">%1$s</xliff:g> ခန့် သုံးထားပါသည်။\n\n စုစုပေါင်း အသုံးပြုမှု-"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"သင့်စက်ကို အသုံးပြုမှုများသောကြောင့် ဘက်ထရီအားကိုလည်း များစွာသုံးထားပါသည်။ သင့်ဘက်ထရီသည် ပုံမှန် အလုပ်လုပ်နေပါသည်။\n\n နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် သင့်စက်ကို <xliff:g id="HOUR">%1$s</xliff:g> ခန့် သုံးထားပါသည်။\n\n စုစုပေါင်း အသုံးပြုမှု-"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"အဆင့်မြင့် ဘက်ထရီ စီမံခန့်ခွဲမှုစနစ်"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"ဘက်ထရီကို အလိုအလျောက် စီမံခြင်း"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"အသုံးပြုမှုအလိုက် အက်ပ်များသုံးသည့် ပါဝါကို အလိုအလျောက် ချိန်ညှိရန်"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"ကန့်သတ်ထားသည့် အက်ပ်များ"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">အက်ပ် %1$d ခု</item>
+ <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>
@@ -2146,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"မီဒီယာဆာဗာ"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"အက်ပ်ပိုမိုကောင်းအောင်ပြုခြင်း"</string>
<string name="battery_saver" msgid="8172485772238572153">"ဘက်ထရီ အားထိန်း"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"ဘက်ထရီအားထိန်းကို သုံးရန်"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"အလိုအလျောက် ဖွင့်ရန်"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ဘယ်တော့မှ"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"ဘတ်ထရီ <xliff:g id="PERCENT">%1$s</xliff:g> ၌"</string>
@@ -2333,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"စင့်ခ်လုပ်ရန် လက်ရှိတွင် ပြဿနာရှိနေပါသည်။ ခဏကြာလျှင် ပြန်လည်ရရှိပါမည်။"</string>
<string name="add_account_label" msgid="7811707265834013767">"အကောင့်ထည့်ရန်"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"အလုပ် ပရိုဖိုင်ကို မရရှိနိုင်သေးပါ"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"အလုပ်မုဒ်"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"အက်ပ်များ၊ နောက်ခံစင့်ခ်လုပ်ခြင်း၊ နှင့်သက်ဆိုင်သည့်အင်္ဂါရပ်များကို ဆောင်ရွက်ရန် အလုပ်ပရိုဖိုင်ကိုခွင့်ပြုပါ။"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"အလုပ်ပရိုဖိုင်"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"သင်၏ အဖွဲ့အစည်းက စီမံခန့်ခွဲထားပါသည်"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"အက်ပ်နှင့် အကြောင်းကြားချက်များကို ပိတ်ထားသည်"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"အလုပ် ပရိုဖိုင်ကို ဖယ်ရှားပစ်ရန်"</string>
<string name="background_data" msgid="5779592891375473817">"နောက်ခံတွင်အသုံးပြုသောဒေတာ"</string>
<string name="background_data_summary" msgid="8328521479872763452">"အက်ပ်များက ဒေတာ ပို့၊ လက်ခံ၊ စင့်ခ် အချိန်မရွေးလုပ်နိုင်သည်"</string>
@@ -2366,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"အကောင့်ကို ဖယ်ရှားမလား"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ဤအကောင့်ကို ဖယ်ရှားခြင်းအားဖြင့် တက်ဘလက်ထဲမှ မက်ဆေ့ဂျ်များ၊ အဆက်အသွယ်များနှင့် တခြားဒေတာများအားလုံး ပျက်သွားပါမည်။"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ဤအကောင့်ကို ဖယ်ရှားခြင်းအားဖြင့် ဖုန်းထဲမှ မက်ဆေ့ဂျ်များ၊ အဆက်အသွယ်များနှင့် တခြားဒေတာများအားလုံး ပျက်သွားပါမည်။"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"ဤအကောင့်ကို ဖယ်ရှားလိုက်ခြင်းဖြင့် စက်ပစ္စည်းထဲရှိ မက်ဆေ့ဂျ်၊ အဆက်အသွယ်နှင့် အခြားဒေတာများ အားလုံးကို ဖျက်လိုက်ပါမည်။"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"ဤပြောင်းလဲမှုကို သင့်စီမံခန့်ခွဲသူက ခွင့်မပြုပါ"</string>
<string name="provider_label" msgid="7724593781904508866">"စာရင်းသွင်းထားမှုများ နှိပ်ရန်"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2622,8 @@
<item quantity="other">အသိအမှတ်ပြုလက်မှတ်များကို စစ်ဆေးပါ</item>
<item quantity="one">အသိအမှတ်ပြုလက်မှတ်ကို စစ်ဆေးပါ</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"အသုံးပြုသူများ"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"သုံးစွဲသူများ &ကိုယ်ရေးအချက်အလက်များ"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"သုံးစွဲသူ သို့မဟုတ် ပရိုဖိုင်ကို ထည့်ရန်"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"သုံးစွဲသူကို ထည့်ရန်"</string>
@@ -2774,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ဘလူးတုသ်၊ ကာစ်"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"အက်ပ်နှင့်အကြောင်းကြားချက်"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ခွင့်ပြုချက်များ၊ မူရင်းအက်ပ်များ"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"အသုံးပြုသူနှင့် အကောင့်များ"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"မနှောင့်ယှက်ပါနှင့်၊ ကြားဝင်စွတ်ဖက်သည်၊ ကြားဝင်စွတ်ဖက်ခြင်း၊ အနားယူခြင်း"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"အနီးတဝိုက်၊ တည်နေရာ၊ သမိုင်း၊ အစီရင်ခံခြင်း"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"တိကျမှု"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"အကောင့်"</string>
<string name="keywords_users" msgid="3434190133131387942">"ကန့်သတ်ခြင်း၊ ကန့်သတ်မှု၊ ကန့်သတ်ထားသည်"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"စာသားအမှားပြင်ဆင်ခြင်း၊ မှန်သည်၊ အသံ၊ တုန်ခါမှု၊ အလိုအလျောက်၊ ဘာသာစကား၊ အမူအယာ၊ အကြံပြုရန်၊ အချက်ပြုချက်၊ အပြင်အဆင်၊ စိတ်အနှောင့်အယှက်ဖြစ်စေသော၊ စကားလုံး၊ စာရိုက်ခြင်း၊ စိတ်ခံစားမှုရုပ်ပုံလေးများ၊ အပြည်ပြည်ဆိုင်ရာ"</string>
@@ -2872,6 +2911,7 @@
<item quantity="one">စည်းမျဉ်း ၁ ခု</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"မနှောင့်ယှက်ရ"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"\'မနှောင့်ယှက်ရ\' ဖွင့်ခြင်း"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"အပြုအမူ"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ဤနေရာမှ အသံနှင့် တုန်ခါမှုများကို ခွင့်ပြုပါ-"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"အသံပိတ်ထားသည်"</string>
@@ -2881,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"အလိုအလျောက် ဖွင့်ရန်"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"အလိုအလျောက် စည်းမျဉ်းများ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"အလိုအလျောက် စည်းမျဉ်း"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"မနှောင့်ယှက်ရ စည်းမျဉ်းထည့်ရန်"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"အချို့အချိန်များ၌ ကန့်သတ်ရန်"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"အချို့အချိန်များ၌ဖုန်းအသံတိတ်ခြင်း"</string>
+ <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_no_interruptions" msgid="8107126344850276878">"လုံးဝ တိတ်ဆိတ်ခြင်း"</string>
@@ -2890,12 +2931,15 @@
<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_add" msgid="90014394953272517">"ထည့်ရန်"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ယခုဖွင့်ပါ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ယခု ပိတ်ပါ"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"ဖွင့်ရန်"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ယခုဖွင့်ရန်"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ယခုပိတ်ရန်"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"\"မနှောင့်ယှက်ရ\" ကို <xliff:g id="FORMATTED_TIME">%s</xliff:g> အထိ ဖွင့်ထားသည်"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"\"မနှောင့်ယှက်ရ\" သည် ၎င်းကို မပိတ်မချင်း ပွင့်နေပါမည်"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"\"မနှောင့်ယှက်ရ\" ကို <xliff:g id="RULE_NAME">%s</xliff:g> စည်းကမ်းအရ အလိုအလျောက် ဖွင့်ပေးခဲ့သည်"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"\"မနှောင့်ယှက်ရ\" ကို <xliff:g id="APP_NAME">%s</xliff:g> အက်ပ်က အလိုအလျောက် ဖွင့်ပေးခဲ့သည်"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"ဦးစားပေးများသာ"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>။ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2955,7 @@
<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="recent_notifications" msgid="5660639387705060156">"လတ်တလော ပို့ထားသည်"</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>
@@ -2930,7 +2975,7 @@
<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_importance_title" msgid="848692592679312666">"အရေးပါမှု"</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="5455049524984686275">"အသံ သို့မဟုတ် ရုပ်ပုံ ဖွင့်ခြင်းတို့ကို မပြုလုပ်လိုပါ"</string>
@@ -2948,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"အတန်အသင့် အရေးပါသည်"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"အကြောင်းကြားချက် ရယူခြင်း"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"အလုပ်ပရိုဖိုင် အကြောင်းကြားချက်များသို့ ဝင်ရောက်ခြင်းကို ပိတ်ထားသည်"</string>
@@ -2978,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"\"မနှောင့်ယှက်ရ\" ကိုအသုံးပြုခြင်း"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"မနှောက်ယှက်ရန် အသုံးပြုခြင်းအတွက် မည်သည့်ထည့်သွင်းထားသည့် အပ်ဖ်မှ တောင်းဆိုမှုမရှိပါ"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"အက်ပ်များကို တင်နေ..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"၎င်းအက်ပ်၏ သတိပေးချက်များကို ဤစက်ပစ္စည်းတွင် ပေါ်မလာစေရန် Android က ပိတ်ထားပါသည်"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"၎င်းသတိပေးချက်အမျိုးအစားကို ဤစက်ပစ္စည်းတွင် ပေါ်မလာစေရန် Android က ပိတ်ဆို့ထားပါသည်"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"၎င်းသတိပေးချက်အုပ်စုကို ဤစက်ပစ္စည်းတွင် ပေါ်မလာစေရန် Android က ပိတ်ဆို့ထားပါသည်"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအက်ပ်၏ အကြောင်းကြားချက်များ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအကြောင်းကြားချက်အမျိုးအစားများ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအကြောင်းကြားချက်အုပ်စုများ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
<string name="notification_channels" msgid="5346841743182627500">"အမျိုးအစားများ"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"အခြား"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"သင်၏စက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန် လက်ဗွေရာကို သုံးခြင်းအပြင် စက်ကို စဖွင့်ဖွင့်ချင်း စကားဝှက်ထည့်ရန် သတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်းကို မဖွင့်မချင်း နှိုးစက်များအပြင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်ဖွင့်ချင်း စကားဝှက်ထည့်ရန် သတ်မှတ်ထားလိုပါသလား။"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Yes"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"No"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN လိုပါသလား?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ရေးဆွဲပုံစံ လိုပါသလား?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"လျှို့ဝှက်ကုဒ် လိုပါသလား?"</string>
@@ -3397,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"လက်ရှိ အသုံးပြုသူ− <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> အဖြစ် လက်မှတ်ထိုးဝင်ထားသည်"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> သည်မူရင်းဖြစ်သည်"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ဖွင့်ပါ၊ <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ပိတ်ရန်"</string>
<string name="backup_disabled" msgid="485189128759595412">"အရံကူးယူခြင်း ပိတ်ထားသည်"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> သို့ အပ်ဒိတ်လုပ်ထားသည်"</string>
@@ -3407,6 +3456,7 @@
<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="6346948990624612516">"အရန်သိမ်းခြင်းကို ပိတ်၍မရပါ"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"ဤလုပ်ဆောင်ချက်ကို ပိတ်ထားပါသည်။ ပိုမိုလေ့လာရန် သင့်အဖွဲ့အစည်း၏ စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"နောက်ထပ် အသေးစိတ်များ"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"သင်၏စီမံခန့်ခွဲသူသည် ဆက်တင်များ၊ ခွင့်ပြုချက်များ၊ ပူးပေါင်းသုံးစွဲခွင့်များ၊ ကွန်ရက်လုပ်ဆောင်ချက်နှင့် စက်ပစ္စည်း၏ တည်နေရာ အချက်အလက်များအပါအဝင် သင်၏ အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်နေသည့် အက်ပ်နှင့် ဒေတာများကို စောင့်ကြည့်စီမံနိုင်ပါသည်။"</string>
@@ -3430,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"အလုပ်ပရိုဖိုင်ပိတ်ထားသည်"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"သင့်အလုပ်ပရိုဖိုင်နှင့် သက်ဆိုင်သည့် အက်ပ်များ၊ နောက်ခံစင့်ခ်လုပ်ခြင်း၊ နှင့်အခြား အင်္ဂါရပ်များကို ပိတ်ထားပါသည်။"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"ညအလင်းရောင် အစီအစဉ်ကို သတ်မှတ်ရန်"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ပယင်းရောင်စကရင်ကအိပ်ပျော်စေသည်"</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="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>
<string name="suggestions_more_title" msgid="8223690393059519879">"နောက်ထပ် +<xliff:g id="ID_1">%1$d</xliff:g> ခု"</string>
@@ -3537,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"တစ်ခုမျှမဟုတ်"</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>
@@ -3559,31 +3612,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"စက်ပစ္စည်းအများအပြားနှင့် ချိတ်ဆက်ထားပါသည်"</string>
<string name="demo_mode" msgid="2798762752209330277">"စနစ် UI သရုပ်ပြမုဒ်"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ဆော့ဖ်ဝဲအင်ဂျင်နီယာ အကွက်များကို အမြန်သတ်မှတ်ခြင်း"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"ကျွန်ုပ်တို့ကူညီဖို့ အသင့်ရှိနေပါသည်"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"သင့်အတွက် ကျွန်ုပ်တို့သည် တစ်နေ့ ၂၄ နာရီနှင့် ၇ ရက်တပတ်လုံး အသင့်ရှိနေပါသည်။"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"ကျွန်ုပ်တို့သည် တစ်နေ့ ၂၄ နာရီနှင့် ၇ ရက်တပတ်လုံး အသင့်ရှိနေပါသည်"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"ကျွန်ုပ်တို့၏ ဝန်ဆောင်မှုပေးရေးအဖွဲ့သည် ပြဿနာအရပ်ရပ်ကို ဖြေရှင်းပေးရန် အသင့်ရှိပါသည်။"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ကျွန်ုပ်တို့၏ ဝန်ဆောင်မှုပေးရေးအဖွဲ့သည် နေ့တိုင်းဤနေရာတွင် တစ်နေကုန်အသင့်ရှိနေပါသည်"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"အကူအညီကိုရှာပါ သို့မဟုတ် ဝန်ဆောင်မှုပေးသည့်အချိန်တွင် ပြန်လာပါ (ဒေသစံတော်ချိန်) − <br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ဖုန်းဖြင့် ဝန်ဆောင်မှုပေးသည့် အချိန် (ဒေသစံတော်ချိန်)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"အကူအညီကိုရှာဖွေပါ သို့မဟုတ် နည်းလမ်းများကို ရှာဖွေပါ"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"အောက်ပါနိုင်ငံများတွင် ပံ့ပိုးပေးသည် −"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"ပြည်ပခရီးထွက်မလား။"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"အပြည်ပြည်ဆိုင်ရာ ငွေကျသင့်မှုများ ရှိနိုင်သည်"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"ဖုန်း"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"ချတ်လုပ်ရန်"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"နည်းစနစ်များနှင့် အကြံဉာဏ်များကို လေ့လာရန်"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"အကူအညီရှာရန်နှင့် အကြံပြုချက်ပေးပို့ရန်"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"ဝန်ဆောင်မှုပေးရေးအဖွဲ့သို့ ဆက်သွယ်ပါ"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"လက်မှတ်ထိုး ဝင်ပါ"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"လက်မှတ်ထိုးဝင်၍ မရဘူးလား။"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"စနစ်အချက်အလက်များကို ပို့ပါ"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"နောက်တစ်ခါ မပြပါနှင့်"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"အဖြစ် တောင်းဆိုနေသည်"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"အကောင့်ထည့်ရန်"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"စနစ်အချက်အလက်"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"ဝင်းဒိုး မျဉ်းဆွဲခြင်း"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"မျက်နှာပြင် မျဉ်းဆွဲခြင်း"</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>
@@ -3599,11 +3629,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> စက္ကန့်</item>
<item quantity="one">၁ စက္ကန့်</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"စောင့်ဆိုင်းရမည့်အချိန် ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</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="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>
@@ -3614,32 +3644,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ကင်မရာကို ဖွင့်ရန်အတွက် ဖွင့်ပိတ်ခလုတ်ကို နှစ်ကြိမ်နှိပ်ပါ"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"ဆယ်ဖီမုဒ်အတွက် ဖုန်းကို နှစ်ကြိမ်လှည့်ပါ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"ဆယ်ဖီမုဒ်အတွက် တက်ဘလက်ကို နှစ်ကြိမ်လှည့်ပါ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"ဆယ်ဖီမုဒ်အတွက် စက်ပစ္စည်းကို နှစ်ကြိမ်လှည့်ပါ"</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_suggestion_summary" msgid="5987443721392571847">"ဖန်သားပြင်ပိတ်ထားစဉ် အကြောင်းကြားချက်များကို စစ်ဆေးရန်"</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_pickup_suggestion_summary" msgid="7014700589991761035">"ဖန်သားပြင်ပိတ်ထားစဉ် အကြောင်းကြားချက်များကို စစ်ဆေးရန်"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"အကြောင်းကြားချက်များကို ကြည့်ရန် ကိရိယာ၏ နောက်ကျောဘက်ရှိ လက်ဗွေ အာရုံခံကိရိယာပေါ်တွင် အောက်သို့ ပွတ်ဆွဲပါ။"</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"အကြောင်းကြားချက်များကို အမြန်ကြည့်ရန်"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"လက်ဗွေ အာရုံခံကိရိယာပေါ်တွင် အောက်သို့ ပွတ်ဆွဲပါ"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"ဖွင့်ထားသည်"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"ပိတ်ထားသည်"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"စဖွင့်သည့်စနစ်ကို လော့ခ်ဖွင့်ပြီးပါပြီ"</string>
@@ -3769,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"ဖိုင်လမ်းညွှန် သုံးခွင့်"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"ဖိုင်လမ်းညွှန် သုံးခွင့်"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"ကျွန်ုပ်၏ဖုန်း"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"ကျွန်ုပ်၏တက်ဘလက်"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"ကျွန်ုပ်၏စက်ပစ္စည်း"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"အကောင့်"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"စက်ပစ္စည်း အမည်"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ကားမောင်းနေစဉ် ဘလူးတုသ် သုံးခြင်း"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ကားမောင်းနေစဉ် ဘလူးတုသ် အလိုအလျောက် ဖွင့်ပါ"</string>
</resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index ceae0b3..f650da5 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"Én time"</item>
<item msgid="5198271470953124739">"Aldri tidsavbrudd"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (standard)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Dårlig"</item>
<item msgid="2042505933058940139">"Dårlig"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"Over 60 dager gamle"</item>
<item msgid="5692284879054004388">"Over 90 dager gamle"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Bruk nettverksinnstilling"</item>
+ <item msgid="8745603368609022803">"Behandle som med datamåling"</item>
+ <item msgid="2266114985518865625">"Behandle som uten datamåling"</item>
+ </string-array>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 0df2374..79b90b7 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Enhetene dine"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Koble til en ny enhet"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Tillat at enheten kobler sammen med og kobler til Bluetooth-enheter"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Slå av innenbåndsringing"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Ikke spill av tilpassede ringelyder på Bluetooth-hodetelefoner"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Tilkoblet for øyeblikket"</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>
@@ -330,6 +332,16 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Angi dato"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortér alfabetisk"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortér etter tidssone"</string>
+ <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+ <skip />
+ <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+ <skip />
+ <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+ <skip />
<string name="date_picker_title" msgid="1338210036394128512">"Dato"</string>
<string name="time_picker_title" msgid="483460752287255019">"Tid"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Låses automatisk"</string>
@@ -348,6 +360,8 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profilinformasjon"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Kontoer"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Posisjon"</string>
+ <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+ <skip />
<string name="account_settings_title" msgid="626177544686329806">"Kontoer"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Sikkerhet og posisjon"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Kryptering og legitimasjon"</string>
@@ -559,7 +573,7 @@
<string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"For mange mislykkede forsøk. Dataene på denne enheten blir slettet."</string>
<string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"For mange mislykkede forsøk. Denne brukeren blir slettet."</string>
<string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"For mange mislykkede forsøk. Denne jobbprofilen og tilknyttede data blir slettet."</string>
- <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Avvis"</string>
+ <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Lukk"</string>
<string name="lockpassword_password_too_short" msgid="2726090378672764986">"Må være minst <xliff:g id="COUNT">%d</xliff:g> tegn"</string>
<string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-koden må være minst <xliff:g id="COUNT">%d</xliff:g> sifre"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsett"</string>
@@ -691,6 +705,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som høyttalertelefon"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For musikk og medier"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk innstillinger"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimalt antall Bluetooth-lydenheter"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Velg maksimalt antall tilkoblede Bluetooth-lydenheter"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Slå på trådløs skjermdeling"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Finner ingen enheter i nærheten."</string>
@@ -705,6 +721,8 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Navn"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+ <skip />
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ønsker å slå på Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ønsker å slå av Wi-Fi"</string>
@@ -722,6 +740,8 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Slå på Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+ <skip />
<string name="wifi_settings_category" msgid="8719175790520448014">"Innstillinger for Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Sett opp og styr trådløse aksesspunkt"</string>
@@ -833,7 +853,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tilgjengelig)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Skriv inn nettverkspassordet ditt"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Operatørens Wi-Fi-nettverk"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Koble til via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Koble til via <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å bruke nettverksskanning, også når Wi-Fi er slått av, for bedre posisjonsnøyaktighet og andre formål. \n\nVil du tillate dette for alle apper som prøver å skanne?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"For å slå dette av går du til Avansert i overflytsmenyen."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillat"</string>
@@ -909,10 +929,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-bånd"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Bruk Wi-Fi-soner for å opprette Wi-Fi-nettverk for de andre enhetene dine. Wi-Fi-soner gir Internett-tilgang ved hjelp av mobildatatilkoblingen din. Ytterligere avgifter for databruk kan påløpe."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Du kan bruke apper til å opprette Wi-Fi-soner for deling av innhold med enheter i nærheten."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Slå av Wi-Fi-sone automatisk"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Wi‑Fi-sonen blir slått av hvis ingen enheter er koblet til"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Slår på Wi-Fi-sone …"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Slår av trådløs sone …"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktiv"</string>
@@ -961,6 +979,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Adresse for nødssituasjoner"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Brukes som posisjonen din når du gjør et nødanrop over Wi-Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Finn ut mer"</annotation>" om funksjoner for privat DNS"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
<string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumer"</string>
@@ -1308,6 +1327,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> fungerer. \n\nFor å flytte bilder, filer og programdata til denne enheten, gå til Innstillinger og lagring."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Flytt <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Det tar bare et par øyeblikk å flytte <xliff:g id="APP">^1</xliff:g> og tilhørende data til <xliff:g id="NAME_0">^2</xliff:g>. Du kan ikke bruke appen før flyttingen er ferdig. \n\nIkke fjern <xliff:g id="NAME_1">^2</xliff:g> mens flyttingen pågår."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Du må låse opp brukeren <xliff:g id="APP">^1</xliff:g> for å flytte data."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Flytter <xliff:g id="APP">^1</xliff:g> …"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ikke fjern <xliff:g id="NAME">^1</xliff:g> under flyttingen. \n\n<xliff:g id="APP">^2</xliff:g>-appen på denne enheten blir ikke tilgjengelig før flyttingen er ferdig."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Avbryt flyttingen"</string>
@@ -1468,6 +1488,8 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Posisjonskilder"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Om nettbrettet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Om telefonen"</string>
+ <!-- no translation found for about_settings (6717640957897546887) -->
+ <skip />
<string name="about_settings" product="emulator" msgid="221313099578564438">"Om den emulerte enheten"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Vis juridisk informasjon, status og programvareversjon"</string>
<string name="legal_information" msgid="5769301644270604095">"Juridisk informasjon"</string>
@@ -1575,6 +1597,8 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Se alle de <xliff:g id="COUNT">%1$d</xliff:g> appene"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Nettbrettet ditt og personopplysningene dine er mer sårbare for angrep hvis du bruker ukjente apper. Ved å installere apper fra denne kilden godtar du at du selv er ansvarlig for enhver skade på nettbrettet eller tap av data som kan oppstå, fra bruk av slike apper."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonen din og personopplysningene dine er mer sårbare for angrep hvis du bruker ukjente apper. Ved å installere apper fra denne kilden godtar du at du selv er ansvarlig for enhver skade på telefonen eller tap av data som kan oppstå, fra bruk av slike apper."</string>
+ <!-- no translation found for install_all_warning (3648003301476423145) -->
+ <skip />
<string name="advanced_settings" msgid="1777249286757067969">"Avanserte innstillinger"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Aktiver flere innstillingsalternativer"</string>
<string name="application_info_label" msgid="5736524913065714880">"Info om appen"</string>
@@ -1874,6 +1898,12 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan påvirke ytelsen"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikk etter at markøren stanser"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Forsinkelse før klikk"</string>
+ <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+ <skip />
+ <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+ <skip />
+ <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+ <skip />
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"PÅ"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"AV"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Vis i hurtiginnstillingene"</string>
@@ -2030,14 +2060,37 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Alt er bra med batteriet"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Apper fungerer som de skal"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Lav batterikapasitet"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batteriet kan ikke gi god batterilevetid"</string>
+ <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
<skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+ <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+ <skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefonen er brukt mye"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Nettbrettet er brukt mye"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Enheten er brukt mye"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Brukt omtrent <xliff:g id="HOUR">%1$s</xliff:g> siden sist batteriet var fulladet"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Telefonen din har blitt brukt mye, og dette har brukt mye batteristrøm. Batteriet ditt oppfører seg som normalt.\n\n Telefonen din er brukt omtrent <xliff:g id="HOUR">%1$s</xliff:g> siden sist batteriet var fulladet.\n\n Total bruk:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Nettbrettet ditt har blitt brukt mye, og dette har brukt mye batteristrøm. Batteriet ditt oppfører seg som normalt.\n\n Nettbrettet ditt er brukt omtrent <xliff:g id="HOUR">%1$s</xliff:g> siden sist batteriet var fulladet.\n\n Total bruk:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Enheten din har blitt brukt mye, og dette har brukt mye batteristrøm. Batteriet ditt oppfører seg som normalt.\n\n Enheten din er brukt omtrent <xliff:g id="HOUR">%1$s</xliff:g> siden sist batteriet var fulladet.\n\n Total bruk:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Smart batteristyring"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Administrer batteriet automatisk"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Juster strømbruken til apper automatisk basert på bruk"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Begrensede apper"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d apper</item>
+ <item quantity="one">%1$d app</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Vil du stoppe appen?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefonen kan ikke styre batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> holder telefonen aktiv.\n\nFor å forsøke å løse problemet kan du stoppe appen.\n\nHvis problemet vedvarer, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Nettbrettet kan ikke styre batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> holder nettbrettet aktivt.\n\nFor å forsøke å løse problemet kan du stoppe appen.\n\nHvis problemet vedvarer, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
@@ -2146,6 +2199,8 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Medietjener"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Appoptimalisering"</string>
<string name="battery_saver" msgid="8172485772238572153">"Batterisparing"</string>
+ <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+ <skip />
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Slå på automatisk"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Aldri"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"med <xliff:g id="PERCENT">%1$s</xliff:g> batteri"</string>
@@ -2366,6 +2421,8 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Vil du fjerne kontoen?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Hvis du fjerner denne kontoen, slettes alle tilhørende meldinger, kontakter og andre data fra nettbrettet!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Hvis du fjerner denne kontoen, slettes alle tilhørende e-poster, kontakter og andre data fra telefonen."</string>
+ <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+ <skip />
<string name="remove_account_failed" msgid="3901397272647112455">"Denne endringen er ikke tillatt av administratoren"</string>
<string name="provider_label" msgid="7724593781904508866">"Push-abonnementer"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokkér visuelle forstyrrelser"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Tillat visuelle signaler"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Legg til"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"SLÅ PÅ NÅ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"SLÅ AV NÅ"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Slå på nå"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Slå av nå"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Ikke forstyrr er slått på til <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Ikke forstyrr er på til du slår det av"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Ikke forstyrr ble slått på automatisk av en regel (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2930,7 +2987,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Appvarsler"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Varselkategori"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Varselkategorigruppe"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Viktighet"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Atferd"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Tillat lyd"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Vis aldri varsler"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Ingen lyd eller visuell forstyrrelse"</string>
@@ -2948,6 +3005,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Middels viktighet"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Høy viktighet"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Svært høy viktighet"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Vis varsler"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Varselassistent"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Varseltilgang"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Tilgang til varsler fra jobbprofilen er blokkert"</string>
@@ -2978,9 +3036,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"«Ikke forstyrr»-tilgang"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Ingen installerte apper har bedt om «Ikke forstyrr»-tilgang"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokkerer varslene fra denne appen fra å vises på denne enheten"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokkerer denne varselkategorien fra å vises på denne enheten"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokkerer denne varselgruppen fra å vises på denne enheten"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"I henhold til forespørselen din blokkerer Android varslene fra denne appen fra å vises på denne enheten"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"I henhold til forespørselen din blokkerer Android denne varselkategorien fra å vises på denne enheten"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"I henhold til forespørselen din blokkerer Android denne varselgruppen fra å vises på denne enheten"</string>
<string name="notification_channels" msgid="5346841743182627500">"Kategorier"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Annet"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3617,10 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Fliser med hurtiginnstillinger for utviklere"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Vi er her for å hjelpe deg"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Vi er her for å hjelpe deg døgnet rundt, sju dager i uken"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Vi er her for å hjelpe deg døgnet rundt, sju dager i uken"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Brukerstøtteteamet vårt er her for å hjelpe til med å løse eventuelle problemer"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Brukerstøtteteamet vårt er tilgjengelig hele dagen – hver eneste dag"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Søk i brukerstøtten eller kom tilbake i brukerstøttens åpningstid (lokal tid):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Brukerstøttens åpningstid (lokal tid)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Søk etter hjelp eller utforsk tips og triks"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Støtte for:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Reiser du i utlandet?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Utenlandstakster kan påløpe"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Se gode tips"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Søk i hjelp og send tilbakemelding"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Kontakt brukerstøtten"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Logg på"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Har du problemer med påloggingen?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Send systeminformasjon"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ikke vis dette igjen"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Sender forespørsel som"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Legg til konto"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Systeminformasjon"</string>
+ <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+ <skip />
+ <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+ <skip />
<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>
@@ -3599,11 +3636,12 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekunder</item>
<item quantity="one">1 sekund</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Ventetid: ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Administrer lagring"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"For å frigjøre lagringsplass fjernes sikkerhetskopierte bilder og videoer fra enheten din av lagringsadministratoren."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Fjern bilder og videoer"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Lagringsadministrator"</string>
+ <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+ <skip />
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisk"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuelle innstillinger"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Frigjør lagringsplass nå"</string>
@@ -3769,8 +3807,10 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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>
+ <!-- no translation found for storage_access (8905018810338984531) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for keywords_storage_access (3708874088152933579) -->
<skip />
</resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index f151d59..708f165 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Push बटन"</item>
<item msgid="1624323946324499595">"PIN जोडी उपकरणबाट"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"१ घन्टा"</item>
<item msgid="5198271470953124739">"कहिल्यै समय सकिँदैन"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"१ (पूर्वनिर्धारित मान)"</item>
+ <item msgid="7584056855393485416">"२"</item>
+ <item msgid="844570832050176311">"३"</item>
+ <item msgid="1896812737336024220">"४"</item>
+ <item msgid="2664420770707984266">"५"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"१"</item>
+ <item msgid="2731443086402670729">"२"</item>
+ <item msgid="74627748729027880">"३"</item>
+ <item msgid="2654447223197666662">"४"</item>
+ <item msgid="7026157954713482328">"५"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"कमजोर"</item>
<item msgid="2042505933058940139">"कमजोर"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"६० दिनभन्दा बढी पुरानो"</item>
<item msgid="5692284879054004388">"९० दिनभन्दा बढी पुरानो"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"नेटवर्कसम्बन्धी प्राथमिकता प्रयोग गर्नुहोस्"</item>
+ <item msgid="8745603368609022803">"मिटर गरिएको रूपमा व्यवहार गर्नुहोस्"</item>
+ <item msgid="2266114985518865625">"मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्"</item>
+ </string-array>
</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 9ebd004..f0c3587 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तपाईंका यन्त्रहरू"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नयाँ यन्त्रलाई जोडा बनाउनुहोस्"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"यन्त्रलाई ब्लुटुथ यन्त्रहरूसँग जोडा बनाउन र जडान गर्न दिनुहोस्"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"इन-ब्यान्ड घन्टी नामक सुविधा असक्षम पार्नुहोस्"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"ब्लुटुथका हेडसेटहरूमा फोनको इच्छ्याएका रिङटोनहरू प्ले नगर्नुहोला"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"मिति सेट गर्नुहोस्"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"क्रमबद्ध अनुसार मिलाउनुहोस्"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"समय क्षेत्रद्वारा क्रमबद्ध गर्नुहोस्"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TRANSITION_DATE">%2$s</xliff:g> मा <xliff:g id="TIME_TYPE">%1$s</xliff:g> सुरु हुन्छ।"</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"दिवाप्रकाश बचत समय"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"मानक समय"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"क्षेत्रअनुसारको समय क्षेत्र"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"स्थिर अन्तर भएका समय क्षेत्रहरू"</string>
<string name="date_picker_title" msgid="1338210036394128512">"मिति"</string>
<string name="time_picker_title" msgid="483460752287255019">"समय"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"स्वतः लक गर्नुहोस्"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"स्क्रिन सन्देश लक गर्नुहोस्"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"विजेटहरू सक्षम पार्नुहोस्"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"प्रशासकद्वारा असक्षम पारिएको छ"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"कुनै पनि होइन"</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">"उदाहरण, Joe को Android।"</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफाइल जानकारी"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"खाताहरू"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"इन्क्रिप्सन र प्रमाणहरू"</string>
@@ -453,15 +465,22 @@
<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="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_switch_input_method" msgid="4168332125223483198">"स्विच इनपुट विधि"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"स्क्रिन लक सेट गर्नुहोस्"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"तपाईँको यन्त्र सुरक्षित गर्नुहोस्"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"फिंगरप्रिन्टको प्रयोग गर्नुहोस्"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"तपाईंको फिंगरप्रिन्ट प्रयोग गरी अनलक गर्नुहोस्"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"स्क्रिन लक छान्नुहोस्"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"कार्यका लागि लक छनोट"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्पिकर फोनको रूपमा"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत र मिडियाका लागि"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिङहरू सम्झनुहोस्"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"जडान भएका ब्लुटुथ अडियो यन्त्रहरूको अधिकतम सङ्ख्या"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"जडान भएका ब्लुटुथ अडियो यन्त्रहरूको अधिकतम सङ्ख्या चयन गर्नुहोस्"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस प्रदर्शन सक्षम गर्नुहोस्"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"नजिकै कुनै उपकरण भेटिएन।"</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"नाम"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"२.४ GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"५ GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"साइन इन गर्नुहोस्"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi सक्रिय गर्न चाहन्छ"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi निष्क्रिय पार्न चाहन्छ"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi खोल्नुहोस्"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fi प्रयोग गर्नुहोस्"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi सेटिङहरू"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"ताररहित पहुँच बिन्दुहरू सेटअप र प्रबन्ध गर्नुहोस्"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"पासवर्ड:"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"पासवर्ड देखाउनुहोस्"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ब्यान्ड चयन गर्नुहोस्"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"स्वतः निर्धारित"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz ब्यान्ड"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz ब्यान्ड"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP सेटिङहरू"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आफ्नो सञ्जाल पासवर्ड प्रविष्ट गर्नुहोस्"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"सेवा प्रदायकको Wi‑Fi नेटवर्क"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> मार्फत जडान गर्नुहोस्"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> मार्फत जडान गर्नुहोस्"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान सटिकता सुधार गर्न र अन्य प्रायोजनहरूको लागि, <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्क्यानिङ खुला भएको चाहन्छ, Wi-Fi बन्द भएता पनि।\n\nके यसलाई सबै अनुप्रयोगहरूको लागि अनुमति दिन चाहनुहुन्छ जसले स्क्यान गर्न चाहन्छन्?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"यो बन्द गर्न, अतिप्रवाह मेनुमा उन्नतमा जानुहोस्।"</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दिनुहोस्"</string>
@@ -898,21 +922,19 @@
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>सँग जोडिने आमन्त्रण के रद्द गर्न चाहनु हुन्छ ?"</string>
<string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"यो समूह बिर्सनुभयो?"</string>
<string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi हटस्पट"</string>
- <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"अन्य यन्त्रहरूसँग इन्टरनेट वा सामग्री आदान-प्रदान गरिरहेको छैन"</string>
+ <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"अन्य यन्त्रहरूसँग इन्टरनेट वा सामग्री आदान प्रदान गरिरहेको छैन"</string>
<string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5936710887156133458">"हटस्पटमार्फत यो ट्याब्लेटको इन्टरनेट जडान साझा गर्दै"</string>
<string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5556202634866621632">"हटस्पटमार्फत यो फोनको इन्टरनेट जडान साझा गर्दै"</string>
- <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"अनुप्रयोगले सामग्री आदान-प्रदान गर्दैछ। इन्टरनेट जडान साझा गर्न हटस्पट निष्क्रिय पार्नुहोस् र त्यसपछि फेरि सक्रिय गर्नुहोस्"</string>
+ <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"अनुप्रयोगले सामग्री आदान प्रदान गर्दैछ। इन्टरनेट जडान साझा गर्न हटस्पट निष्क्रिय पार्नुहोस् र त्यसपछि फेरि सक्रिय गर्नुहोस्"</string>
<string name="wifi_hotspot_name_title" msgid="8237000746618636778">"हटस्पटको नाम"</string>
<string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> सक्रिय गर्दै..."</string>
<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_local_only" msgid="857988412470694109">"अनुप्रयोगहरूले नजिकैका यन्त्रहरूसँग सामग्री आदान-प्रदान गर्न एउटा हटस्पट सिर्जना गर्न सक्छन्।"</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"अनुप्रयोगहरूले नजिकैका यन्त्रहरूसँग सामग्री आदान प्रदान गर्न एउटा हटस्पट सिर्जना गर्न सक्छन्।"</string>
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Wi‑Fi हटस्पट स्वतः निष्क्रिय पार्नुहोस्"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"कुनै पनि यन्त्र जडान नहुँदा Wi‑Fi हटस्पट स्वतः निष्क्रिय हुनेछ"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"हटस्पट खुल्दै..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"हटस्पट बन्द गरिँदै..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय छ"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi कलिङ"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi कलिङलाई सक्रिय गर्नुहोस्"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"मोबाइल नेटवर्कको सट्टा Wi-Fi प्रयोग गर्नुहोस्"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"आपतकालीन ठेगाना"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"तपाईंले Wi‑Fi मार्फत आपतकालीन कल गर्दा उक्त ठेगानालाई तपाईंको स्थानको रूपमा प्रयोग गरिन्छ"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"DNS का सुविधाहरूबारे "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
<string name="sound_settings" msgid="5534671337768745343">"आवाज"</string>
<string name="all_volume_title" msgid="4296957391257836961">"भोल्युम"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"मोबाइल नेटवर्क प्रकार"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"संचालक जानकारी"</string>
<string name="status_data_state" msgid="5503181397066522950">"मोबाइल सञ्जाल वस्तुस्थिति"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"सेवा स्थिति"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"सङ्केत क्षमता"</string>
<string name="status_roaming" msgid="2638800467430913403">"रोमिङ"</string>
@@ -1286,7 +1312,7 @@
<string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल भण्डारणको रूपमा प्रयोग गर्नुहोस्"</string>
<string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"यन्त्रहरू बीच तस्बिर र अन्य मिडिया सार्नका लागि।"</string>
<string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"आन्तरिक भण्डारणको रूपमा प्रयोग गर्नुहोस्"</string>
- <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"यस यन्त्रमा मात्र कुनै पनि चीज, अनुप्रयोग र तस्बिरहरू भण्डारण गर्नका लागि। यसलाई ढाँचा मिलाउन आवश्यक हुन्छ जसले अर्का यन्त्रहरूसँग काम गर्नबाट रोक्छ।"</string>
+ <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"यस यन्त्रमा मात्र कुनै पनि चिज, अनुप्रयोग र तस्बिरहरू भण्डारण गर्नका लागि। यसलाई ढाँचा मिलाउन आवश्यक हुन्छ जसले अर्का यन्त्रहरूसँग काम गर्नबाट रोक्छ।"</string>
<string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"आन्तरिक भण्डारणको रुपमा ढाँचा गर्नुहोस्"</string>
<string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"यो सुरक्षित बनाउन यसलाई <xliff:g id="NAME_0">^1</xliff:g> ढाँचा बनाउन आवश्यकता छ। \n\nढाँचामा मिलाएपछि, यो यन्त्रमा यसले <xliff:g id="NAME_1">^1</xliff:g> मात्र काम गर्नेछ। \n\n"<b>" ढाँचा मिलाउँदा <xliff:g id="NAME_2">^1</xliff:g> मा हालैका भण्डारित सबै डेटा मेटिन्छ।"</b>" डेटा गुमाउनुपर्ने बाट जोगिन, यसको ब्याकअप राख्ने बारे विचार गर्नुहोस्।"</string>
<string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"पोर्टेबल भण्डारणका रूपमा फरम्याट गर्नुहोस्"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"तपाईँको नयाँ <xliff:g id="NAME">^1</xliff:g> ले काम गर्दैछ। \n\n यो यन्त्रमा तस्बिरहरू, फाइलहरू, र अनुप्रयोग डेटा सार्न, सेटिङ &gt मा जानुहोस्; भण्डारण गर्नुहोस्।"</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"सार्नुहोस् <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="NAME_0">^2</xliff:g> मा <xliff:g id="APP">^1</xliff:g> र यसको डेटा सार्न केही बेर मात्र लिनेछ। तपाईं सार्ने क्रम पूरा नहुन्जेल अनुप्रयोग प्रयोग गर्न सक्नुहुने छैन। \n\n सार्ने क्रममा <xliff:g id="NAME_1">^2</xliff:g> नहटाउनुहोस्।"</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"डेटा सार्न तपाईंले प्रयोगकर्ताको <xliff:g id="APP">^1</xliff:g> अनलक गर्नु पर्ने हुन्छ।"</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"सार्दै <xliff:g id="APP">^1</xliff:g>..."</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"सार्ने क्रममा <xliff:g id="NAME">^1</xliff:g> नहटाउनुहोस्। \n\nसार्ने क्रम पूरा नहुन्जेल सम्म यो यन्त्रको<xliff:g id="APP">^2</xliff:g> अनुप्रयोग उपलब्ध हुने छैन।"</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"सार्ने कार्य रद्द गर्नुहोस्"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"नेटवर्क, अनुप्रयोगहरू वा यन्त्रलाई रिसेट गर्न सकिन्छ"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, मोबाइल र ब्लुटुथ रिसेट गर्नुहोस्"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"यसले निम्न सेटिङहरू लगायत सम्पूर्ण नेटवर्क सम्बन्धी सेटिहरूलाई रिसेट गर्नेछ:\n\n"<li>"Wi‑Fi"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लुटुथ"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"eSIM हरू पनि रिसेट गर्नुहोस्"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"सेटिङहरू रिसेट गर्नुहोस्"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"सबै नेटवर्क सेटिङहरू रिसेट गर्ने हो? तपाईं यी कार्य अनडू गर्न सक्नुहुन्न!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिङहरू रिसेट गर्नुहोस्"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"रिसेट गर्ने हो?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"नेटवर्क रिसेट यो प्रयोगकर्ताको लागि उपलब्ध छैन"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"सञ्जाल सेटिङ्हरू रिसेट गरियो"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM हरू रिसेट गर्न सकिएन"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"कुनै त्रुटिले गर्दा eSIM हरू रिसेट गर्न सकिएन।"</string>
<string name="master_clear_title" msgid="3531267871084279512">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM मा रहेका सेवा प्रदायकहरू"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM हरू"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"यस कार्यले तपाईंको मोबाइल सेवाको योजना रद्द गर्नेछैन।"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n" \n संगीत, चित्र र अन्य उपयोगकर्ता डेटा हटाउन "<b>"USB संग्रह"</b>" मेटाउन जरुरी छ।"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n" \n संगीत, तस्वीरहरू, र अन्य प्रयोगकर्ता डेटा मेटाउनका लागि, "<b>" SD कार्ड "</b>" मेटाउनु पर्छ।"</string>
@@ -1413,7 +1445,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>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"कृपया इन्टरनेटसँग जोड्नुहोस्"</string>
<string name="location_title" msgid="1029961368397484576">"मेरो स्थान"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"काम प्रोफाइलका लागि स्थान"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च सटीकपना"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ब्याट्री बचत"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"उपकरण मात्र"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"स्थान बन्द छ"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"अनुप्रयोग-स्तरीय अनुमतिहरू"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"हालका स्थान अनुरोधहरू"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"हाल कुनै पनि अनुप्रयोगहरूले स्थान अनुरोध गरिएका छैनन्"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"स्थान सेवाहरू"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"उच्च ब्याट्री प्रयोग"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"कम ब्याट्री प्रयोग"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"स्थान निर्धारण गर्न GPS, Wi-Fi, ब्लुटुथ वा मोबाइल नेटवर्कहरूको प्रयोग गर्नुहोस्"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"स्थान निर्धारण गर्न Wi-Fi, ब्लुटुथ वा मोबाइल नेटवर्कहरूको प्रयोग गर्नुहोस्"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"स्थान निर्धारण गर्नका लागि GPS र यन्त्र सेन्सर प्रयोग गर्नुहोस्"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"स्क्यान गर्दै"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi स्क्यान हुँदै"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"प्रणाली अनुप्रयोगहरू र सेवाहरूलाई कुनै पनि समयमा Wi-Fi हरू पहिचान गर्न अनुमति दिएर स्थानको पहिचान सामर्थ्यतामा सुधार गर्नुहोस्।"</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"स्थान स्रोतहरू"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"कानुनी जानकारी, वस्तुस्थिति, सफ्ट्वेयर संस्करण हेर्नुहोस्"</string>
<string name="legal_information" msgid="5769301644270604095">"कानुनी जानकारी"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"सबै <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगहरू हेर्नुहोस्"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"तपाईंको ट्याब्लेट र व्यक्तिगत डेटा अज्ञात अनुप्रयोगहरूबाट हुने आक्रमणमा पर्न सक्ने जोखिम अझ बढी हुन्छ। यो स्रोतबाट प्राप्त हुने अनुप्रयोगहरूको स्थापना गरेर, तिनीहरूको प्रयोगबाट तपाईंको ट्याब्लेटमा हुनसक्ने क्षति वा डेटाको नोक्सानीको जिम्मेवार तपाईं आफैँ हुनुहुन्छ भन्ने कुरामा तपाईं सहमत हुनुहुन्छ।"</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"तपाईंको फोन र व्यक्तिगत डेटा अज्ञात अनुप्रयोगहरूबाट हुने आक्रमणमा पर्न सक्ने जोखिम अझ बढी हुन्छ। यो स्रोतबाट प्राप्त हुने अनुप्रयोगहरूको स्थापना गरेर, तिनीहरूको प्रयोगबाट तपाईंको फोनमा हुनसक्ने क्षति वा डेटाको नोक्सानीको जिम्मेवार तपाईं आफैँ हुनुहुन्छ भन्ने कुरामा तपाईं सहमत हुनुहुन्छ।"</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"तपाईंको यन्त्र र व्यक्तिगत डेटा अज्ञात अनुप्रयोगहरूबाट हुने आक्रमणमा पर्न सक्ने जोखिम अझ बढी हुन्छ। यो स्रोतबाट प्राप्त हुने अनुप्रयोगहरूको स्थापना गरेर, तिनीहरूको प्रयोगबाट फोनमा हुनसक्ने क्षति वा डेटाको नोक्सानीको जिम्मेवार तपाईं आफैँ हुनुहुन्छ भन्ने कुरामा तपाईं सहमत हुनुहुन्छ।"</string>
<string name="advanced_settings" msgid="1777249286757067969">"जटिल सेटिङहरू"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"थप सेटिङ विकल्पहरू सक्षम पार्नुहोस्"</string>
<string name="application_info_label" msgid="5736524913065714880">"अनुप्रयोग जानकारी"</string>
@@ -1689,7 +1714,7 @@
<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_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>
@@ -1731,7 +1756,7 @@
<string name="service_stop" msgid="6369807553277527248">"रोक्नुहोस्"</string>
<string name="service_manage" msgid="1876642087421959194">"सेटिङहरू"</string>
<string name="service_stop_description" msgid="9146619928198961643">"सेवा यसको अनुप्रयोगले सुरु गरेको हो। यसलाई रोक्दा अनुप्रयोग विफल हुन सक्छ।"</string>
- <string name="heavy_weight_stop_description" msgid="6050413065144035971">"यो अनुप्रयोग सुरक्षित तरिकाले रोक्न मिल्दैन। यदि तपाईंले यसलाई रोक्नुभयो भने तपाईंले हालको केही काम हराउन सक्नुहुने छ।"</string>
+ <string name="heavy_weight_stop_description" msgid="6050413065144035971">"यो अनुप्रयोग सुरक्षित तरिकाले रोक्न मिल्दैन। यदि तपाईंले यसलाई रोक्नुभयो भने तपाईंले हालको केही काम हराउन सक्नु हुने छ"</string>
<string name="background_process_stop_description" msgid="3834163804031287685">"यो पुरानो अनुप्रयोग प्रक्रिया हो जुन अझैं चलिरहेको छ, यो कुनै पनि बेला चाहिन सक्छ। सामान्यतया: यसलाई रोक्नु पर्ने कुनै कारण छैन।"</string>
<string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: अहिले प्रयोगमा छ। यसलाई नियन्त्रण गर्न सेटिङमा ट्याप गर्नुहोस्।"</string>
<string name="main_running_process_description" msgid="1130702347066340890">"मुख्य प्रक्रिया प्रयोगमा।"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"कार्यसम्पादनमा असर पार्न सक्छ"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"प्वाइन्टर चल्न रोकेपछि क्लिक गर्नुहोस्"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक गर्न अघि ढिलाइ"</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_summary_state_enabled" msgid="8359913912320966304">"सक्रिय छ"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"निष्क्रिय छ"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"द्रुत सेटिङमा देखाउनुहोस्"</string>
@@ -1987,7 +2015,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> बाँकी"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> चार्जमा"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"पृष्ठभूमिको गतिविधि"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"प्रतिबन्धित"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"अनुप्रयोगलाई पृष्ठभूमिमा चल्न अनुमति दिनुहोस्"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"प्रयोगमा नहुँदा अनुप्रयोग पृष्ठभूमिमा चल्न सक्छ"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"प्रयोगमा नहुँदा अनुप्रयोगको पृष्ठभूमिको गतिविधि सीमित हुन्छ"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"ब्याट्री राम्रो स्थितिमा छ"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"अनुप्रयोगले सामान्य तरिकाले काम गर्दैछ"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ब्याट्रीको कम चार्ज क्षमता"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ब्याट्रीको चार्ज स्तर बढी समयसम्म कायम रहन सक्दैन"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"स्मार्ट ब्याट्री प्रबन्धक सक्रिय गर्नुहोस्"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"ब्याट्रीको प्रयोगलाई अप्टिमाइज गर्न सक्रिय गर्नुहोस्"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"कम ब्याट्री मोडलाई सक्रिय गर्नुहोस्"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"आफ्नो ब्याट्रीको आयु बढाउनुहोस्"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"कम ब्याट्री मोड सक्रिय छ"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"केही विशेषताहरू सीमित छन्"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"फोन अत्यधिक प्रयोग गरियो"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ट्याब्लेट अत्यधिक प्रयोग गरियो"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"यन्त्र अत्यधिक प्रयोग गरियो"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"ब्याट्रीलाई पछिल्लोपटक पूर्ण रूपमा चार्ज गरेपछि यन्त्र लगभग <xliff:g id="HOUR">%1$s</xliff:g> प्रयोग गरियो"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"अत्यधिक प्रयोग गरिएबापत तपाईंको फोनले अत्यन्त बढी ब्याट्री खपत गऱ्यो। तपाईंको ब्याट्री पहिलाको जसरी नै चल्दै छ।\n\n ब्याट्रीलाई पछिल्लोपटक पूर्ण रूपमा चार्ज गरेपछि तपाईंको फोन लगभग <xliff:g id="HOUR">%1$s</xliff:g> प्रयोग गरियो।\n\n ब्याट्रीको कुल प्रयोग प्रतिशत:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"अत्यधिक प्रयोग गरिएबापत तपाईंको ट्याब्लेटले अत्यन्त बढी ब्याट्री खपत गऱ्यो। तपाईंको ब्याट्री पहिलाको जसरी नै चल्दै छ।\n\n ब्याट्रीलाई पछिल्लोपटक पूर्ण रूपमा चार्ज गरेपछि तपाईंको ट्याब्लेट लगभग <xliff:g id="HOUR">%1$s</xliff:g> प्रयोग गरियो।\n\n ब्याट्रीको कुल प्रयोग प्रतिशत:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"अत्यधिक प्रयोग गरिएबापत तपाईंको यन्त्रले अत्यन्त बढी ब्याट्री खपत गऱ्यो। तपाईंको ब्याट्री पहिलाको जसरी नै चल्दै छ।\n\n ब्याट्रीलाई पछिल्लोपटक पूर्ण रूपमा चार्ज गरेपछि तपाईंको यन्त्र लगभग <xliff:g id="HOUR">%1$s</xliff:g> प्रयोग गरियो।\n\n ब्याट्रीको कुल प्रयोग प्रतिशत:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"स्मार्ट ब्याट्री प्रबन्धक"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"ब्याट्री स्वतः व्यवस्थापन गर्नुहोस्"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"प्रयोगको आधारमा अनुप्रयोगहरूले प्रयोग गर्ने पावर स्वचालित रूपमा समायोजन गर्नुहोस्"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"प्रतिबन्धित अनुप्रयोगहरू"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d अनुप्रयोगहरू</item>
+ <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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"मिडिया सर्भर"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"अनुप्रयोग आफू अनुकूल"</string>
<string name="battery_saver" msgid="8172485772238572153">"ब्याट्री सेभर"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"ब्याट्री सेभर प्रयोग गर्नुहोस्"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"स्वतः खोल्नुहोस्"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"कहिले पनि होइन"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> ब्याट्री हुँदा"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"सिङ्कले अहिले समस्याहरू भोग्दै छ। यो तुरुन्तै आउने छ।"</string>
<string name="add_account_label" msgid="7811707265834013767">"खाता थप्नुहोस्"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"कार्य प्रोफाइल अझै उपलब्ध भएको छैन"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"कार्यको मोड"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"अनुप्रयोग, पृष्ठभूमि सिंक र सम्बन्धित विशेषताहरू सहित, कार्यको प्रोफाइललाई काम गर्न अनुमति दिनुहोस्"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"कार्य प्रोफाइल हटाउनुहोस्"</string>
<string name="background_data" msgid="5779592891375473817">"पृष्ठभूमि डेटा"</string>
<string name="background_data_summary" msgid="8328521479872763452">"अनुप्रयोगहरूले कुनै पनि समयमा डेटा सिंक गर्न पठाउन र प्राप्त गर्न सक्दछन्"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"खाता हटाउने हो?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"यो खाता मेटाउँदा ट्याब्लेटबाट यसका सबै सन्देश,सम्पर्क र अन्य डेटा मेटाइनेछन्!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"यस खातालाई हटाउँदा फोनबाट सम्पूर्ण सन्देश, सम्पर्क र अन्य डेटा हट्छ!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"यो खातालाई हटाउनुले यस यन्त्रबाट यस खातामा रहेका सम्पूर्ण सन्देश, सम्पर्कहरू र अन्य डेटा मेटाउने छ!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"यसलाई परिवर्तन गर्न तपाईंको प्रशासकले अनुमति दिँदैन"</string>
<string name="provider_label" msgid="7724593781904508866">"सदस्यता ठेल्नुहोस्"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="other">प्रमाणपत्रहरूलाई जाँच गर्नुहोस्</item>
<item quantity="one">प्रमाणपत्रलाई जाँच गर्नुहोस्</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"प्रयोगकर्ताहरू"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"प्रयोगकर्ता र प्रोफाइलहरू"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"प्रयोगकर्ता वा प्रोफाइल थप गर्नुहोस्"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"प्रयोगकर्ता थप्नुहोस्"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ब्लुटुथ, कास्ट गर्ने सुविधा"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अनुप्रयोग सम्बन्धी & सूचनाहरू"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"अनुमतिहरू, पूर्वनिर्धारित अनुप्रयोगहरू"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"प्रयोगकर्ता र खाताहरू"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"बाधा नपुर्याउनुहोस्, हस्तक्षेप गर्नुहोस्, हस्तक्षेप, ब्रेक"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"नजिकै, स्थान, इतिहास, रिपोर्ट गर्ने"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"सटिकता"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"खाता"</string>
<string name="keywords_users" msgid="3434190133131387942">"प्रतिबन्ध, प्रतिबन्ध लगाउनुहोस्, प्रतिबन्धित"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"पाठ सच्याइ, सही, ध्वनि, कम्पन, स्वतः, भाषा, इसारा, सुझाव दिनु, सुझाव, विषयवस्तु, अपमानजनक, शब्द, प्रकार, इमोजी, अन्तर्राष्ट्रिय"</string>
@@ -2872,6 +2924,7 @@
<item quantity="one">१ नियम</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"बाधा नपुऱ्याउनुहोस्"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"बाधा नपुऱ्याउनुहोस् नामक मोडलाई सक्रिय गर्नुहोस्"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"व्यवहार"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"निम्नबाट आउने आवाज र कम्पनहरूलाई अनुमति दिनु"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"कुनै पनि आवाज ननिकाल्ने"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"स्वतः सक्रिय गर्नुहोस्"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"स्वचालित नियमहरू"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"स्वचालित नियम"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"बाधा नपुर्याउनुहोस् मोडका नियमहरू सेट गर्नुहोस्"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"निश्चित समयहरूमा आवाज र कम्पनमाथि रोक लगाउनुहोस्"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"पूरै शान्त"</string>
@@ -2890,12 +2946,15 @@
<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_add" msgid="90014394953272517">"थप्नुहोस्"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"अहिले नै सक्रिय गर्नुहोस्"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"अहिले नै निष्क्रिय पार्नुहोस्"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"सक्रिय गर्नुहोस्"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"अहिले नै सक्रिय गर्नुहोस्"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"अहिले नै निष्क्रिय पार्नुहोस्"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> सम्म बाधा नपुर्याउनुहोस् नामक मोड सक्रिय हुन्छ"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"तपाईंले निष्क्रिय नपारेसम्म बाधा नपुर्याउनुहोस् नामक मोड सक्रिय रहनेछ"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"(<xliff:g id="RULE_NAME">%s</xliff:g>) नामक नियमले बाधा नपुर्याउनुहोस् नामक मोडलाई स्वतः सक्रिय गर्यो"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"कुनै अनुप्रयोग <xliff:g id="APP_NAME">%s</xliff:g> ले बाधा नपुर्याउनुहोस् नामक मोडलाई स्वतः सक्रिय गर्यो"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"प्राथमिकता मात्र"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>। <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2970,7 @@
<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="recent_notifications" msgid="5660639387705060156">"हालै पठाइएका अनुप्रयोगहरू"</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>
@@ -2930,7 +2990,7 @@
<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_importance_title" msgid="848692592679312666">"महत्त्व"</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="5455049524984686275">"कुनै आवाज ननिकाल्ने वा दृश्य सम्बन्धी अवरोध नपुर्याउने"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"सामान्य महत्वको सूचना"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"सूचना पहुँच"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफाइलमाथिका पहुँच सम्बन्धी सूचनाहरूलाई बन्द गरिएको छ"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"पहुँचमा बाधा नपुर्यानुहोस्"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"कुनै पनि स्थापित अनुप्रयोगहरू द्वारा पहुँचमा बाधा नपुर्यानुहोस् को माग गरेका छैनन्"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"अनुप्रयोगहरू लोड हुँदै..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ले यो यन्त्रमा यस अनुप्रयोगका सूचनाहरूलाई देखिनबाट रोक लगाइरहेको छ"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ले यो यन्त्रमा यस प्रकारका सूचनाहरूलाई देखिनबाट रोक लगाइरहेको छ"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ले यस यन्त्रमा यी सूचनाहरूको समूहलाई देखिनबाट रोक लगाइरहेको छ"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"तपाईंको अनुरोधबमोजिम Android ले यस अनुप्रयोगका सूचनाहरूलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस कोटिलाई यो यन्त्रमा देखिन दिइरहेको छैन"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस समूहलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
<string name="notification_channels" msgid="5346841743182627500">"कोटीहरू"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"आफ्नो यन्त्रलाई अनलक गर्नका लागि फिंगरप्रिन्ट प्रयोग गर्नुका साथसाथै, यो यन्त्र खुल्नुअघि आफ्नो पासवर्ड चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यन्त्रले कल, सन्देश वा अलार्म लगायताका सूचनाहरू प्राप्त गर्न सक्दैन।\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="1793719723017395175">"छ"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"छैन"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN आवश्यक छ?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"प्याटर्न आवश्यक छ?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"पासवर्ड आवश्यक छ?"</string>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"हालको प्रयोगकर्ता: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> रूपमा साइन इन गरियो"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> पूर्वनिर्धारित छ"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"सक्रिय / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"निष्क्रिय"</string>
<string name="backup_disabled" msgid="485189128759595412">"ब्याकअप असक्षम गरियो"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> मा अद्यावधिक गरियो"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"ब्याकअप कार्यहरूलाई निष्क्रिय पार्न सकिँदैन"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"यो कारबाहीलाई असक्षम पारिएको छ। थप जान्नका लागि आफ्नो संगठनको प्रशासकलाई सम्पर्क गर्नुहोस्।"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"थप विवरणहरु"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"तपाईंको प्रशासकले तपाईंको कार्य प्रोफाइलसँग सम्बन्धित अनुप्रयोग र डेटाका साथै सेटिङ। अनुमति, संस्थागत पहुँच, नेटवर्क सम्बन्धी गतिविधि र यस यन्त्रको स्थान सम्बन्धी जानकारीको अनुगमन र व्यवस्थापन गर्न सक्छ।"</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"कार्यको प्रोफाइल बन्द छ"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"तपाईँको कार्यको प्रोफाइलसँग सम्बन्धित अनुप्रयोग, पृष्ठभूमि सिंक र अन्य विशेषताहरू निष्क्रिय छन्।"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"रात्रि प्रकाशको समय तालिका सेट गर्नुहोस्"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"आफूलाई निदाउन सजिलो होस् भनेर स्क्रिनलाई हल्का एम्बर रङको बनाउनुहोस्"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"रात्रिको प्रकाश सक्रिय छ"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"थप +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3539,6 +3606,8 @@
<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_none" msgid="5144174674654097316">"कुनै पनि होइन"</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>
@@ -3561,31 +3630,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"धेरै यन्त्रहरूमा जडान गरियो"</string>
<string name="demo_mode" msgid="2798762752209330277">"प्रणालीको UI को प्रदर्शन मोड"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"द्रुत सेटिङहरू सम्बन्धी विकासकर्ताका टाइलहरू"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"हामी मद्दतका लागि तयार छौँ"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"हामी तपाईँको सहायताका लागि २४/७ उपलब्ध छौँ"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"हामी तपाईँको सहायताका लागि २४ घन्टा ७ दिन उपलब्ध छौँ"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"हाम्रो समर्थन टोली जुनसुकै समस्याको समाधान गर्नमा मद्दतका लागि तयार छ"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"हाम्रो सहायता टोली पूरा दिन र हरेक दिन तपाईँको सहायताका लागि उपलब्ध छ"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मद्दत खण्डमा गई खोज्नुहोस् वा सहायताको समयावधिमा फेरि आउनुहोस् (स्थानीय समय):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"फोन मार्फत गरिने सहायताको समयावधि (स्थानीय समय)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मद्दतमा खोज्नुहोस् वा सुझाव र जुक्तिहरूको अन्वेषण गर्नुहोस्"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"निम्नका लागि समर्थन:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"विदेश यात्रा गर्दै हुनुहुन्छ?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"अन्तर्राष्ट्रिय शुल्कहरू लाग्न सक्छन्"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"फोन"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"कुराकानी"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"सुझाव र जुक्तिहरूको अन्वेषण गर्नुहोस्"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"मद्दत खण्डमा खोज्नुहोस् र प्रतिक्रिया पठाउनुुहोस्"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"ग्राहक सहायतामा सम्पर्क गर्नुहोस्"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन गर्नुहोस्"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"साइन इन गर्न सक्नुहुन्न?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"प्रणाली सम्बन्धी जानकारी पठाउनुहोस्"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"फेरि नदेखाउनुहोस्"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"निम्न प्रयोगकर्ताको रूपमा अनुरोध गर्दै"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"खाता थप्नुहोस्"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"प्रणाली सम्बन्धी जानकारी"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"विन्डो ट्रेस"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"सतह पत्ता लगाउने कार्य"</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>
@@ -3601,11 +3647,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकेन्ड</item>
<item quantity="one">१ सेकेन्ड</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> कुर्नुहोस्"</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="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>
@@ -3616,32 +3662,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"क्यामेरा खोल्न पावर बटनमा दुई पटक थिच्नुहोस्"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"सेल्फी मोडका लागि Double-twist फोन"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"सेल्फी मोडका लागि Double-twist ट्याब्लेट"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"सेल्फी मोडका लागि Double-twist यन्त्र"</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_suggestion_summary" msgid="5987443721392571847">"स्क्रिन निष्क्रिय हुँदा सूचनाहरूको जाँच गर्नुहोस्"</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_pickup_suggestion_summary" msgid="7014700589991761035">"स्क्रिन निष्क्रिय हुँदा सूचनाहरूको जाँच गर्नुहोस्"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"अफ्ना सूचनाहरूको जाँच गर्न आफ्नो यन्त्रको पछाडिको भागमा रहेको फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्।"</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"सूचनाहरू छिट्टै हेर्नुहोस्"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"सुचनाहरूका लागि फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"सक्रिय"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"निष्क्रिय"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"बुटलोडर पहिले नै अनलक गरिएको छ"</string>
@@ -3771,8 +3810,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"निर्देशिकामाथिको पहुँच"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"निर्देशिकामाथिको पहुँच"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 3748d8e..3d86192 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"ਪੁਸ਼ ਬਟਨ"</item>
<item msgid="1624323946324499595">"ਪੀਅਰ ਡੀਵਾਈਸ ਤੋਂ ਪਿੰਨ"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 ਘੰਟਾ"</item>
<item msgid="5198271470953124739">"ਕਦੇ ਵੀ ਸਮਾਂ ਸਮਾਪਤ ਨਹੀਂ"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (ਪੂਰਵ-ਨਿਰਧਾਰਤ)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"ਖ਼ਰਾਬ"</item>
<item msgid="2042505933058940139">"ਕਮਜ਼ੋਰ"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
<item msgid="5692284879054004388">"90 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"ਨੈੱਟਵਰਕ ਤਰਜੀਹ ਵਰਤੋ"</item>
+ <item msgid="8745603368609022803">"ਮੀਟਰਬੱਧ ਮੰਨੋ"</item>
+ <item msgid="2266114985518865625">"ਗੈਰ-ਮੀਟਰਬੱਧ ਮੰਨੋ"</item>
+ </string-array>
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 2d559ca..fbf6e88 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ਤੁਹਾਡੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"ਡੀਵਾਈਸ ਨੂੰ ਜੋੜਾਬੱਧ ਅਤੇ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਦਿਓ"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ਬੈਂਡ ਦੀ ਘੰਟੀ ਵਜਾਉਣ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"ਵਿਉਂਤੀਆਂ ਫ਼ੋਨ ਰਿੰਗਟੋਨਾਂ ਨੂੰ ਬਲੂਟੁੱਥ ਹੈੱਡਸੈੱਟਾਂ \'ਤੇ ਨਾ ਚਲਾਓ"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"ਤਾਰੀਖ ਸੈੱਟ ਕਰੋ"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ਵਰਨਮਾਲਾ ਅਨੁਸਾਰ ਛਾਂਟੋ"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ਸਮਾਂ ਜ਼ੋਨ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> ਨੂੰ ਸ਼ੁਰੂ ਹੋਵੇਗਾ।"</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"ਦਿਨ ਦੀ ਰੌਸ਼ਨੀ ਸੰਬੰਧੀ ਬਚਤ ਸਮਾਂ"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"ਮਿਆਰੀ ਸਮਾਂ"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"ਖੇਤਰ ਮੁਤਾਬਕ ਸਮਾਂ ਖੇਤਰ"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"ਫਿਕਸਡ ਔਫਸੈੱਟ ਸਮਾਂ ਖੇਤਰ"</string>
<string name="date_picker_title" msgid="1338210036394128512">"ਤਾਰੀਖ"</string>
<string name="time_picker_title" msgid="483460752287255019">"ਸਮਾਂ"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"ਸਵੈਚਲਿਤ ਤਰੀਕੇ ਨਾਲ ਲਾਕ ਕਰੋ"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">" ਲਾਕ ਸਕ੍ਰੀਨ ਸੁਨੇਹਾ"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"ਵਿਜੇਟ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ਕੋਈ ਨਹੀਂ"</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">"ਉਦਾਹਰਨ ਵਜੋਂ, ਜੋਏ ਦਾ Android."</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"ਖਾਤੇ"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
@@ -459,9 +471,16 @@
<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="8971630898700461034">"ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ਆਪਣੇ ਡੀਵਾਈਸ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"ਸਕ੍ਰੀਨ ਲਾਕ ਚੁਣੋ"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ਕੰਮ ਲਾਕ ਚੁਣੋ"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ਸਪੀਕਰ ਫ਼ੋਨ ਦੇ ਤੌਰ ਤੇ"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ਸੰਗੀਤ ਅਤੇ ਮੀਡੀਆ ਲਈ"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ਸੈਟਿੰਗਾਂ ਯਾਦ ਰੱਖੋ"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ਵੱਧ ਤੋਂ ਵੱਧ ਕਨੈਕਟ ਕੀਤੇ ਬਲੂਟੁੱਥ ਆਡੀਓ ਡੀਵਾਈਸ"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ਵੱਧ ਤੋਂ ਵੱਧ ਕਨੈਕਟ ਕੀਤੇ ਬਲੂਟੁੱਥ ਆਡੀਓ ਡੀਵਾਈਸ ਚੁਣੋ"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"ਕਾਸਟ"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਚਾਲੂ ਕਰੋ"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ਕੋਈ ਨੇੜਲੀਆਂ ਡਿਵਾਈਸਾਂ ਨਹੀਂ ਮਿਲੀਆਂ।"</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"ਨਾਮ"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"ਸਾਈਨ-ਇਨ ਕਰੋ"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ਵਾਈ-ਫਾਈ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ਵਾਈ-ਫਾਈ ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"ਵਾਈ‑ਫਾਈ"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕਰੋ"</string>
<string name="wifi_settings" msgid="29722149822540994">"ਵਾਈ‑ਫਾਈ"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"ਵਾਈ-ਫਾਈ ਵਰਤੋ"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"ਵਾਈ-ਫਾਈ ਸੈਟਿੰਗਾਂ"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"ਵਾਈ‑ਫਾਈ"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"ਵਾਇਰਲੈਸ ਐਕਸੈੱਸ ਪੁਆਇੰਟ ਸੈੱਟ ਅੱਪ & ਵਿਵਸਥਿਤ ਕਰੋ"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"ਪਾਸਵਰਡ"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"ਪਾਸਵਰਡ ਦਿਖਾਓ"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ਬੈਂਡ ਦੀ ਚੋਣ ਕਰੋ"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ਸਵੈਚਲਿਤ"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz ਬੈਂਡ"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz ਬੈਂਡ"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ਸੈਟਿੰਗਾਂ"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ਉਪਲਬਧ)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ਆਪਣਾ ਨੈੱਟਵਰਕ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"ਕੈਰੀਅਰ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ਰਾਹੀਂ ਕਨੈਕਟ ਕਰੋ"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> ਰਾਹੀਂ ਕਨੈਕਟ ਕਰੋ"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਅਤੇ ਹੋਰਾਂ ਮੰਤਵਾਂ ਲਈ, <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ, ਭਾਵੇਂ ਵਾਈ-ਫਾਈ ਬੰਦ ਹੋਵੇ। \n\nਕੀ ਇਸਨੂੰ ਸਾਰੀਆਂ ਐਪਾਂ ਲਈ ਆਗਿਆ ਦੇਣੀ ਹੈ ਜਿਹਨਾਂ ਨੂੰ ਸਕੈਨ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ਇਸਨੂੰ ਬੰਦ ਕਰਨ ਲਈ, ਓਵਰਫ਼ਲੋ ਮੀਨੂ ਵਿੱਚ ਵਿਕਸਿਤ ਤੇ ਜਾਓ।"</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ਆਗਿਆ ਦਿਓ"</string>
@@ -909,10 +933,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ਬੈਂਡ"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ਆਪਣੇ ਹੋਰ ਡੀਵਾਈਸਾਂ ਲਈ ਇੱਕ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਬਣਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਹੌਟਸਪੌਟ ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਵਾਉਂਦਾ ਹੈ। ਵਧੀਕ ਮੋਬਾਈਲ ਡਾਟਾ ਖਰਚੇ ਲਏ ਜਾ ਸਕਦੇ ਹਨ।"</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ਨੇੜਲੇ ਡੀਵਾਈਸ ਨਾਲ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਐਪਾਂ ਇੱਕ ਹੌਟਸਪੌਟ ਬਣਾ ਸਕਦੇ ਹਨ।"</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ਹੌਟਸਪੌਟ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬੰਦ ਕਰੋ"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"ਕਿਸੇ ਵੀ ਡੀਵਾਈਸ ਦੇ ਨਾ ਕਨੈਕਟ ਹੋਣ \'ਤੇ ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ ਬੰਦ ਹੋ ਜਾਵੇਗਾ"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"ਹੌਟਸਪੌਟ ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਚਾਲੂ ਕਰੋ"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਥਾਂ ਵਾਈ-ਫਾਈ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"ਸੰਕਟਕਾਲੀਨ ਪਤਾ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਕੀਤੀ ਜਾਣ ਵਾਲੀ ਕਿਸੇ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਵੇਲੇ ਇਹ ਪਤਾ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"ਨਿੱਜੀ DNS ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬਾਰੇ "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"ਡਿਸਪਲੇ"</string>
<string name="sound_settings" msgid="5534671337768745343">"ਧੁਨੀ"</string>
<string name="all_volume_title" msgid="4296957391257836961">"ਵੋਲਯੂਮ"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਪ੍ਰਕਾਰ"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"ਓਪਰੇਟਰ ਜਾਣਕਾਰੀ"</string>
<string name="status_data_state" msgid="5503181397066522950">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਥਿਤੀ"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"ਸੇਵਾ ਸਥਿਤੀ"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"ਸਿਗਨਲ ਸਟ੍ਰੈਂਥ"</string>
<string name="status_roaming" msgid="2638800467430913403">"ਰੋਮਿੰਗ"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ਤੁਹਾਡਾ ਨਵਾਂ <xliff:g id="NAME">^1</xliff:g> ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ। \n\nਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਫੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ, ਅਤੇ ਐਪ ਡਾਟਾ ਨੂੰ ਲੈ ਜਾਣ ਲਈ, ਸੈਟਿੰਗਾਂ ਅਤੇ ਸਟੋਰੇਜ \'ਤੇ ਜਾਓ।"</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ਨੂੰ ਮੂਵ ਕਰੋ"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ਅਤੇ ਇਸਦੇ ਡਾਟਾ ਨੂੰ <xliff:g id="NAME_0">^2</xliff:g> ਵਿੱਚ ਮੂਵ ਕਰਨਾ ਸਿਰਫ਼ ਕੁਝ ਸਮਾਂ ਲੈਂਦਾ ਹੈ। ਤੁਸੀਂ ਉਦੋਂ ਤੱਕ ਇਸ ਐਪ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ ਜਦੋਂ ਤੱਕ ਇਹ ਮੂਵ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ ਹੈ। \n\nਮੂਵ ਦੇ ਦੌਰਾਨ <xliff:g id="NAME_1">^2</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ।"</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ਡਾਟੇ ਨੂੰ ਲਿਜਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਨੂੰ ਵਰਤੋਂਕਾਰ <xliff:g id="APP">^1</xliff:g> ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ਨੂੰ ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ਮੂਵ ਦੇ ਦੌਰਾਨ <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ। \n\nਇਸ ਡੀਵਾਈਸ \'ਤੇ <xliff:g id="APP">^2</xliff:g> ਐਪ ਉਦੋਂ ਤੱਕ ਉਪਲਬਧ ਨਹੀਂ ਹੋਵੇਗੀ ਜਦੋਂ ਤੱਕ ਮੂਵ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ ਹੈ।"</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ਹਲਚਲ ਨੂੰ ਰੱਦ ਕਰੋ"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"ਨੈੱਟਵਰਕ, ਐਪਾਂ, ਜਾਂ ਡੀਵਾਈਸ ਨੂੰ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"</string>
<string name="reset_network_title" msgid="6166025966016873843">"ਵਾਈ-ਫਾਈ, ਮੋਬਾਈਲ ਅਤੇ ਬਲੂਟੁੱਥ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"ਇਹ ਨੈੱਟਵਰਕ ਦੀਆਂ ਸਾਰੀਆਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰੇਗਾ, ਜਿਸ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:\n\n"<li>"ਵਾਈ-ਫਾਈ"</li>\n<li>"ਮੋਬਾਈਲ ਡਾਟਾ"</li>\n<li>"ਬਲੂਟੁੱਥ"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"ਈ-ਸਿਮ ਵੀ ਰੀਸੈੱਟ ਕਰੋ"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"ਕੀ ਸਾਰੀਆਂ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ? ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀ ਕਰ ਸਕਦੇ!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"ਕੀ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਨੈੱਟਵਰਕ ਰੀਸੈੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"ਈ-ਸਿਮ ਰੀਸੈੱਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"ਕੋਈ ਗੜਬੜ ਹੋਣ ਕਰਕੇ ਈ-ਸਿਮ ਰੀਸੈੱਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ।"</string>
<string name="master_clear_title" msgid="3531267871084279512">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM \'ਤੇ ਕੈਰੀਅਰ"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"ਈ-ਸਿਮ"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ਇਸ ਨਾਲ ਤੁਹਾਡੀ ਮੋਬਾਈਲ ਸੇਵਾ ਯੋਜਨਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਸਾਫ਼ ਕਰਨ ਲਈ, "<b>"USB ਸਟੋਰੇਜ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਉਪਭੋਗਤਾ ਡਾਟਾ ਹਟਾਉਣ ਲਈ, "<b>"SD ਕਾਰਡ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"ਕਿਰਪਾ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
<string name="location_title" msgid="1029961368397484576">"ਮੇਰਾ ਟਿਕਾਣਾ"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਟਿਕਾਣਾ"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"ਮੋਡ"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ਉੱਚ ਸ਼ੁੱਧਤਾ"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ਬੈਟਰੀ ਦੀ ਬਚਤ"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"ਕੇਵਲ ਡੀਵਾਈਸ"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"ਟਿਕਾਣਾ ਬੰਦ"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"ਐਪ-ਪੱਧਰ ਇਜਾਜ਼ਤਾਂ"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"ਹਾਲੀਆ ਟਿਕਾਣਾ ਬੇਨਤੀਆਂ"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"ਕਿਸੇ ਐਪਸ ਨੇ ਹਾਲ ਵਿੱਚ ਹੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"ਉੱਚ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"ਘੱਟ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"ਟਿਕਾਣਾ ਮੋਡ"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS, ਵਾਈ‑ਫਾਈ, ਬਲੂਟੁੱਥ, ਜਾਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਵਰਤੋ"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ ਵਾਈ‑ਫਾਈ, ਬਲੂਟੁੱਥ, ਜਾਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਵਰਤੋ"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS ਅਤੇ ਡੀਵਾਈਸ ਸੈਂਸਰਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ਵਾਈ‑ਫਾਈ ਸਕੈਨਿੰਗ"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਸਮੇਂ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਦਾ ਪਤਾ ਲਾਉਣ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਟਿਕਾਣਾ ਸੇਵਾ ਬਿਹਤਰ ਬਣਾਓ।"</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"ਨਿਰਧਾਰਿਤ ਸਰੋਤ"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ, ਸਥਿਤੀ, ਸਾਫ਼ਟਵੇਅਰ ਵਰਜਨ ਦੇਖੋ"</string>
<string name="legal_information" msgid="5769301644270604095">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"ਸਾਰੀਆਂ <xliff:g id="COUNT">%1$d</xliff:g> ਐਪਾਂ ਦੇਖੋ"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਕਮਜ਼ੋਰ ਹੈ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡਾਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ, ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਵਿੰਨਣਸ਼ੀਲ ਹਨ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਤ ਕਰ ਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡਾਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਵਿੰਨਣਸ਼ੀਲ ਹਨ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਤ ਕਰ ਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡਾਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
<string name="advanced_settings" msgid="1777249286757067969">"ਉੱਨਤ ਸੈਟਿੰਗਾਂ"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"ਹੋਰ ਸੈਟਿੰਗਾਂ ਚੋਣਾਂ ਚਾਲੂ ਕਰੋ"</string>
<string name="application_info_label" msgid="5736524913065714880">"ਐਪ ਜਾਣਕਾਰੀ"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ਪ੍ਰਦਰਸ਼ਨ \'ਤੇ ਅਸਰ ਪਾ ਸਕਦੀ ਹੈ"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ਪੋਇੰਟਰ ਰੁਕਣ ਤੋਂ ਬਾਅਦ ਕਲਿੱਕ ਕਰੋ"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ਕਲਿੱਕ ਤੋਂ ਪਹਿਲਾਂ ਦੇਰੀ"</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_summary_state_enabled" msgid="8359913912320966304">"ਚਾਲੂ"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ਬੰਦ"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਦਿਖਾਓ"</string>
@@ -1987,7 +2015,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> ਬਾਕੀ"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"ਚਾਰਜ ਕਰਨ ਲਈ <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"ਪ੍ਰਤੀਬੰਧਿਤ"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"ਐਪ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"ਵਰਤੋਂ ਵਿੱਚ ਨਾ ਹੋਣ \'ਤੇ ਐਪ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲ ਸਕਦੀ ਹੈ"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"ਵਰਤੋਂ ਵਿੱਚ ਨਾ ਹੋਣ \'ਤੇ ਐਪ ਦੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਸੀਮਤ ਹੈ"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"ਬੈਟਰੀ ਚੰਗੀ ਹਾਲਤ ਵਿੱਚ ਹੈ"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ਐਪਾਂ ਦਾ ਵਤੀਰਾ ਆਮ ਵਾਂਗ ਹੈ"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ਘੱਟ ਬੈਟਰੀ ਸਮਰੱਥਾ"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ਬੈਟਰੀ ਜ਼ਿਆਦਾ ਦੇਰ ਤੱਕ ਨਹੀਂ ਚੱਲ ਸਕਦੀ ਹੈ"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"ਸਮਾਰਟ ਬੈਟਰੀ ਪ੍ਰਬੰਧਕ ਚਾਲੂ ਕਰੋ"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"ਬੈਟਰੀ ਵਰਤੋਂ ਨੂੰ ਸੁਯੋਗ ਬਣਾਉਣ ਲਈ ਚਾਲੂ ਕਰੋ"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"ਘੱਟ ਬੈਟਰੀ ਮੋਡ ਚਾਲੂ ਕਰੋ"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"ਆਪਣੀ ਬੈਟਰੀ ਲਾਈਫ਼ ਵਧਾਓ"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"ਘੱਟ ਬੈਟਰੀ ਮੋਡ ਚਾਲੂ ਹੈ"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸੀਮਤ ਹਨ"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਲਗਭਗ <xliff:g id="HOUR">%1$s</xliff:g> ਘੰਟੇ ਵਰਤੋਂ ਹੋਈ"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ ਅਤੇ ਇਸ ਨਾਲ ਬੈਟਰੀ ਦੀ ਕਾਫ਼ੀ ਖਪਤ ਹੋਈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਦਾ ਵਤੀਰਾ ਆਮ ਵਾਂਗ ਹੈ।\n\n ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ ਲਗਭਗ <xliff:g id="HOUR">%1$s</xliff:g> ਘੰਟੇ ਵਰਤੋਂ ਹੋਈ।\n\n ਕੁੱਲ ਵਰਤੋਂ:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ ਅਤੇ ਇਸ ਨਾਲ ਬੈਟਰੀ ਦੀ ਖਪਤ ਕਾਫ਼ੀ ਹੋਈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਦਾ ਵਤੀਰਾ ਆਮ ਵਾਂਗ ਹੈ।\n\n ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ ਲਗਭਗ <xliff:g id="HOUR">%1$s</xliff:g> ਘੰਟੇ ਵਰਤੋਂ ਹੋਈ।\n\n ਕੁੱਲ ਵਰਤੋਂ:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ ਅਤੇ ਇਸ ਨਾਲ ਬੈਟਰੀ ਦੀ ਕਾਫ਼ੀ ਖਪਤ ਹੋਈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਦਾ ਵਤੀਰਾ ਆਮ ਵਾਂਗ ਹੈ।\n\n ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਲਗਭਗ <xliff:g id="HOUR">%1$s</xliff:g> ਘੰਟੇ ਵਰਤੋਂ ਹੋਈ।\n\n ਕੁੱਲ ਵਰਤੋਂ:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"ਸਮਾਰਟ ਬੈਟਰੀ ਪ੍ਰਬੰਧਕ"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"ਸਵੈ-ਪ੍ਰਬੰਧਨ ਬੈਟਰੀ"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ ਐਪਾਂ ਦੀ ਪਾਵਰ ਖਪਤ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"ਪਾਬੰਦੀਸ਼ੁਦਾ ਐਪਾਂ"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d ਐਪ</item>
+ <item quantity="other">%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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ਐਪ ਅਨੁਕੂਲਨ"</string>
<string name="battery_saver" msgid="8172485772238572153">"ਬੈਟਰੀ ਸੇਵਰ"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"ਬੈਟਰੀ ਸੇਵਰ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ਆਪਣੇ-ਆਪ ਚਾਲੂ ਕਰੋ"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> \'ਤੇ ਬੈਟਰੀ"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"ਸਮਕਾਲੀਕਰਨ ਵਿੱਚ ਇਸ ਵੇਲੇ ਸਮੱਸਿਆਵਾਂ ਹੋ ਰਹੀਆਂ ਹਨ। ਇਹ ਜਲਦੀ ਹੀ ਠੀਕ ਹੋ ਜਾਏਗਾ।"</string>
<string name="add_account_label" msgid="7811707265834013767">"ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"ਕੰਮ ਮੋਡ"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"ਐਪਾਂ, ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਕਾਲੀਕਰਨ, ਅਤੇ ਸਬੰਧਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸ਼ਾਮਲ ਕਰਦੇ ਹੋਏ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਕੰਮ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਹਟਾਓ"</string>
<string name="background_data" msgid="5779592891375473817">"ਪਿਛੋਕੜ ਡਾਟਾ"</string>
<string name="background_data_summary" msgid="8328521479872763452">"ਐਪਸ ਕਿਸੇ ਵੀ ਸਮੇਂ ਡਾਟਾ ਸਿੰਕ ਕਰ ਸਕਦੇ ਹਨ, ਭੇਜ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹਨ"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"ਕੀ ਖਾਤਾ ਹਟਾਉਣਾ ਹੈ?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਟੈਬਲੈੱਟ ਦਾ ਹੋਰ ਡਾਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਫ਼ੋਨ ਦਾ ਹੋਰ ਡਾਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਡੀਵਾਈਸ ਤੋਂ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਹੋਰ ਡਾਟਾ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਇਸ ਤਬਦੀਲੀ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
<string name="provider_label" msgid="7724593781904508866">"Push ਸਬਸਕ੍ਰਿਪਸ਼ੰਸ"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="one">ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਦੀ ਜਾਂਚ ਕਰੋ</item>
<item quantity="other">ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਦੀ ਜਾਂਚ ਕਰੋ</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"ਵਰਤੋਂਕਾਰ"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"ਉਪਭੋਗਤਾ & ਪ੍ਰੋਫਾਈਲਾਂ"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ਵਰਤੋਂਕਾਰ ਜਾਂ ਪ੍ਰੋਫਾਈਲ ਜੋੜੋ"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ਬਲੂਟੁੱਥ, ਕਾਸਟ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ਐਪਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ਇਜਾਜ਼ਤਾਂ, ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਾਂ"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"ਵਰਤੋਂਕਾਰ ਅਤੇ ਖਾਤੇ"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ਨਾ ਕਰੋ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ, ਰੋਕੋ, ਰੁਕਾਵਟ, ਬ੍ਰੇਕ"</string>
<string name="keywords_app" msgid="6334757056536837791">"ਰੈਮ"</string>
<string name="keywords_location" msgid="6615286961552714686">"ਨੇੜਲੇ, ਟਿਕਾਣਾ, ਇਤਿਹਾਸ, ਰਿਪੋਰਟਿੰਗ"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"ਸ਼ੁੱਧਤਾ"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"ਖਾਤਾ"</string>
<string name="keywords_users" msgid="3434190133131387942">"ਪਾਬੰਦੀ, ਪਾਬੰਦੀ ਲਗਾਓ, ਪਾਬੰਦੀ ਲਗਾਈ"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ਲਿਖਤ ਸੁਧਾਈ, ਸਹੀ, ਧੁਨੀ, ਕੰਬਣਾ, ਸਵੈ, ਭਾਸ਼ਾ, ਸੰਕੇਤ, ਸੁਝਾਓ, ਸੁਝਾਅ, ਥੀਮ, ਅਪਮਾਨਜਨਕ, ਸ਼ਬਦ, ਕਿਸਮ, ਇਮੋਜੀ, ਅੰਤਰਰਾਸ਼ਟਰੀ"</string>
@@ -2872,6 +2924,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ਨਿਯਮ</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ਵਰਤਾਅ"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ਇਸ ਨੂੰ ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟਾਂ ਕਰਨ ਦਿਓ"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"ਸਵੈਚਲਿਤ ਨਿਯਮ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"ਸਵੈਚਲਿਤ ਨਿਯਮ"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨਿਯਮ ਸੈੱਟ ਕਰੋ"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ਕੁਝ ਵਿਸ਼ੇਸ਼ ਸਮਿਆਂ \'ਤੇ ਧੁਨੀ ਅਤੇ ਥਰਥਰਾਹਟਾਂ ਸੀਮਤ ਕਰੋ"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"ਪੂਰਾ ਸ਼ਾਂਤ"</string>
@@ -2890,12 +2946,15 @@
<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_add" msgid="90014394953272517">"ਸ਼ਾਮਲ ਕਰੋ"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ਹੁਣੇ ਚਾਲੂ ਕਰੋ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ਹੁਣੇ ਬੰਦ ਕਰੋ"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"ਚਾਲੂ ਕਰੋ"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ਹੁਣੇ ਚਾਲੂ ਕਰੋ"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ਹੁਣੇ ਬੰਦ ਕਰੋ"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ਤੱਕ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਚਾਲੂ ਹੈ"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕਰਦੇ ਇਹ ਚਾਲੂ ਰਹੇਗਾ"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"ਕਿਸੇ ਨਿਯਮ <xliff:g id="RULE_NAME">%s</xliff:g> ਵੱਲੋਂ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"ਕਿਸੇ ਐਪ <xliff:g id="APP_NAME">%s</xliff:g> ਵੱਲੋਂ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"ਸਿਰਫ਼ ਤਰਜੀਹੀ"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>। <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2970,7 @@
<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="recent_notifications" msgid="5660639387705060156">"ਹਾਲੀਆ ਭੇਜੀਆਂ ਗਈਆਂ"</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>
@@ -2930,7 +2990,7 @@
<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_importance_title" msgid="848692592679312666">"ਮਹੱਤਤਾ"</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="5455049524984686275">"ਕੋਈ ਧੁਨੀ ਜਾਂ ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਰੁਕਾਵਟ ਨਹੀਂ"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"ਔਸਤ ਮਹੱਤਵ"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"ਸੂਚਨਾ ਪਹੁੰਚ"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ \'ਤੇ ਪਹੁੰਚ ਨੂੰ ਬਲਾਕ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"\"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\" ਤੱਕ ਪਹੁੰਚ"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"ਕਿਸੇ ਵੀ ਸਥਾਪਤ ਐਪਾਂ ਨੇ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਪਹੁੰਚ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"ਐਪਸ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ਵੱਲੋਂ ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਰੋਕਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੀ ਇਸ ਸ਼੍ਰੇਣੀ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਰੋਕਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੇ ਇਸ ਗਰੁੱਪ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"ਤੁਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"ਤਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੀ ਇਸ ਸ਼੍ਰੇਣੀ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"ਤੁਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੇ ਇਸ ਗਰੁੱਪ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
<string name="notification_channels" msgid="5346841743182627500">"ਸ਼੍ਰੇਣੀਆਂ"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"ਹੋਰ"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\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="1793719723017395175">"ਹਾਂ"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"ਨਹੀਂ"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ਕੀ ਪਿੰਨ ਲੋੜੀਂਦਾ ਹੈ?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ਕੀ ਪੈਟਰਨ ਦੀ ਲੋੜ ਹੈ?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"ਕੀ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੈ?"</string>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"ਵਰਤਮਾਨ ਵਰਤੋਂਕਾਰ: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਵਜੋਂ ਸਾਈਨ ਇਨ ਕੀਤਾ ਗਿਆ"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਪੂਰਵ-ਨਿਰਧਾਰਤ ਹੈ"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ਚਾਲੂ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ਬੰਦ"</string>
<string name="backup_disabled" msgid="485189128759595412">"ਬੈਕ ਅੱਪ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
<string name="about_summary" msgid="924181828102801010">"ਅੱਪਡੇਟ ਕਰਕੇ Android <xliff:g id="VERSION">%1$s</xliff:g> ਕੀਤਾ ਗਿਆ"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"ਬੈਕਅੱਪ ਬੰਦ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"ਇਹ ਕਾਰਵਾਈ ਅਯੋਗ ਹੈ। ਹੋਰ ਜਾਣਨ ਲਈ, ਆਪਣੀ ਸੰਸਥਾ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"ਹੋਰ ਵੇਰਵੇ"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"ਤੁਹਾਡਾ ਪ੍ਰਸ਼ਾਸਕ ਸੈਟਿੰਗਾਂ, ਇਜਾਜ਼ਤਾਂ, ਕਾਰਪੋਰੇਟ ਪਹੁੰਚ, ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ, ਅਤੇ ਡੀਵਾਈਸ ਦੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਸਮੇਤ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨਾਲ ਸਬੰਧਿਤ ਐਪਾਂ ਅਤੇ ਡਾਟੇ ਦੀ ਨਿਗਰਾਨੀ ਅਤੇ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦਾ ਹੈ।"</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਬੰਦ ਹੈ"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"ਤੁਹਾਡੀ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨਾਲ ਸਬੰਧਿਤ ਐਪਾਂ, ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਕਾਲੀਕਰਨ, ਅਤੇ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹਨ।"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"ਰਾਤ ਦੀ ਰੋਸ਼ਨੀ ਸਬੰਧੀ ਸਮਾਂ-ਸੂਚੀ ਸੈੱਟ ਕਰੋ"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ਤੁਹਾਨੂੰ ਸੌਣ ਵਿੱਚ ਮਦਦ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਪੀਲੀ-ਸੰਤਰੀ ਭਾਹ ਦਿਓ"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"ਰਾਤਰੀ ਲਾਈਟ ਚਾਲੂ ਹੈ"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ਹੋਰ"</string>
@@ -3537,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"ਕੋਈ ਨਹੀਂ"</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>
@@ -3559,31 +3628,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ਇੱਕ ਤੋਂ ਜ਼ਿਆਦਾ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
<string name="demo_mode" msgid="2798762752209330277">"ਸਿਸਟਮ UI ਡੈਮੋ ਮੋਡ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਦੀਆਂ ਵਿਕਾਸਕਾਰ ਟਾਇਲਾਂ"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"ਅਸੀਂ ਮਦਦ ਕਰਨ ਲਈ ਉਪਲਬਧ ਹਾਂ"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ਅਸੀਂ ਤੁਹਾਡੇ ਲਈ 24/7 ਉਪਲਬਧ ਹਾਂ"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"ਅਸੀਂ ਤੁਹਾਡੇ ਲਈ 24 7 ਉਪਲਬਧ ਹਾਂ"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"ਸਾਡੀ ਸਹਾਇਤਾ ਟੀਮ ਕਿਸੇ ਵੀ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ ਉਪਲਬਧ ਹੈ"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ਸਾਡੀ ਸਹਾਇਤਾ ਟੀਮ ਹਰ ਵੇਲੇ, ਹਰ ਦਿਨ ਉਪਲਬਧ ਹੈ।"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"ਮਦਦ ਖੋਜੋ ਜਾਂ ਸਹਾਇਤਾ ਸਮੇਂ ਦੌਰਾਨ ਵਾਪਸ ਆਓ (ਸਥਾਨਕ ਸਮਾਂ):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ਫ਼ੋਨ ਰਾਹੀਂ ਸਹਾਇਤਾ ਦਾ ਸਮਾਂ (ਸਥਾਨਕ ਸਮਾਂ)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ਮਦਦ ਖੋਜੋ ਜਾਂ ਨੁਕਤਿਆਂ ਅਤੇ ਜੁਗਤਾਂ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"ਇਸ ਲਈ ਸਹਾਇਤਾ:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"ਕੀ ਵਿਦੇਸ਼ ਯਾਤਰਾ ਕਰ ਰਹੇ ਹੋ?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"ਅੰਤਰਰਾਸ਼ਟਰੀ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"ਫ਼ੋਨ ਕਰੋ"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"ਚੈਟ ਕਰੋ"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ਨੁਕਤਿਆਂ ਅਤੇ ਜੁਗਤਾਂਂ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"ਮਦਦ ਖੋਜੋ ਅਤੇ ਵਿਚਾਰ ਭੇਜੋ"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"ਸਹਾਇਤਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"ਸਾਈਨ-ਇਨ ਕਰੋ"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"ਕੀ ਸਾਈਨ-ਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"ਸਿਸਟਮ ਜਾਣਕਾਰੀ ਭੇਜੋ"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"ਇਸ ਵਜੋਂ ਬੇਨਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"ਸਿਸਟਮ ਜਾਣਕਾਰੀ"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"ਵਿੰਡੋ ਟ੍ਰੇਸ"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ਸਤ੍ਹਾ ਟ੍ਰੇਸ"</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>
@@ -3599,11 +3645,11 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ਸਕਿੰਟ</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ਸਕਿੰਟ</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> ਉਡੀਕ ਕਰੋ"</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="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>
@@ -3614,32 +3660,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ਕੈਮਰਾ ਖੋਲ੍ਹਣ ਲਈ ਪਾਵਰ ਬਟਨ ਨੂੰ ਦੋ ਵਾਰ ਦਬਾਓ"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"ਸੈਲਫ਼ੀ ਮੋਡ ਲਈ ਫ਼ੋਨ ਨੂੰ ਡਬਲ-ਟਵਿਸਟ ਕਰੋ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"ਸੈਲਫ਼ੀ ਮੋਡ ਲਈ ਟੈਬਲੈੱਟ ਨੂੰ ਡਬਲ-ਟਵਿਸਟ ਕਰੋ"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"ਸੈਲਫ਼ੀ ਮੋਡ ਲਈ ਡੀਵਾਈਸ ਨੂੰ ਡਬਲ-ਟਵਿਸਟ ਕਰੋ"</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_suggestion_summary" msgid="5987443721392571847">"ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਣ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦੇਖੋ"</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_pickup_suggestion_summary" msgid="7014700589991761035">"ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਣ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦੇਖੋ"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ, ਆਪਣੇ ਡੀਵਾਈਸ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"ਸੂਚਨਾਵਾਂ ਤੇਜ਼ੀ ਨਾਲ ਦੇਖੋ"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਥੱਲੇ ਨੂੰ ਸਵਾਈਪ ਕਰੋ"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"ਚਾਲੂ"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"ਬੰਦ"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ਬੂਟਲੋਡਰ ਪਹਿਲਾਂ ਹੀ ਅਣਲਾਕ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
@@ -3769,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"ਡਾਇਰੈਕਟਰੀ ਪਹੁੰਚ"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"ਡਾਇਰੈਕਟਰੀ ਪਹੁੰਚ"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index d72c6a1..ac2140a 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Naciśnij przycisk"</item>
<item msgid="1624323946324499595">"Kod PIN z drugiego urządzenia"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 godz."</item>
<item msgid="5198271470953124739">"Brak limitu czasu"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (domyślnie)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Słaba"</item>
<item msgid="2042505933058940139">"Słaba"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Starsze niż 60 dni"</item>
<item msgid="5692284879054004388">"Starsze niż 90 dni"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Użyj preferencji sieci"</item>
+ <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>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 431e43f..acbecb4 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -172,6 +172,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Twoje urządzenia"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sparuj nowe urządzenie"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Zezwól na parowanie urządzenia i łączenie się z urządzeniami Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Wyłącz dzwonek w kanale dźwiękowym"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Nie odtwarzaj niestandardowych dzwonków w zestawach słuchawkowych Bluetooth"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Obecnie podłą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>
@@ -334,6 +336,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Ustaw datę"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortuj alfabetycznie"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortuj według strefy czasowej"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> zaczyna się: <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Zmiana czasu na letni"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Czas standardowy"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Strefy czasowe według regionu"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Strefy czasowe ze stałym przesunięciem"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
<string name="time_picker_title" msgid="483460752287255019">"Godzina"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Blokuj automatycznie"</string>
@@ -344,6 +351,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Wiadomość przy blokadzie"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Włącz widżety"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Wyłączone przez administratora"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Brak"</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">"Np. Android Jurka."</string>
@@ -352,6 +363,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informacje o profilu"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Konta"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Lokalizacja"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Użyj lokalizacji"</string>
<string name="account_settings_title" msgid="626177544686329806">"Konta"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Lokalizacja i blokady"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Szyfrowanie i dane logowania"</string>
@@ -465,9 +477,16 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Wpisane hasło jest prawidłowe, ale Twoje dane są uszkodzone. \n\nAby móc korzystać z tabletu, musisz zresetować go do ustawień fabrycznych. Następnie podczas konfigurowania urządzenia możesz przywrócić wszystkie dane, których kopię zapasową masz na koncie Google."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Wpisane hasło jest prawidłowe, ale Twoje dane są uszkodzone. \n\nAby móc korzystać z telefonu, musisz zresetować go do ustawień fabrycznych. Następnie podczas konfigurowania urządzenia możesz przywrócić wszystkie dane, których kopię zapasową masz na koncie Google."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Przełącz metodę wprowadzania"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Ustawianie blokady ekranu"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zabezpiecz swoje urządzenie"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Użyj odcisku palca"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Odblokowywanie odciskiem palca"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Wybierz blokadę ekranu"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Wybierz blokadę pracy"</string>
@@ -713,6 +732,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon w trybie głośnika"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Dla muzyki i multimediów"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamiętaj ustawienia"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksymalna liczba podłączonych urządzeń audio Bluetooth"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Wybierz maksymalną liczbę podłączonych urządzeń audio Bluetooth"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Przesyłanie ekranu"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Wyświetlacz bezprzewodowy"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Brak urządzeń w pobliżu."</string>
@@ -727,6 +748,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nazwa"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Zaloguj się"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mb/s"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> chce włączyć Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> chce wyłączyć Wi-Fi"</string>
@@ -744,6 +766,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Włącz Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Użyj Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Ustawienia Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguruj punkty dostępowe sieci bezprzewodowej i zarządzaj nimi"</string>
@@ -838,6 +861,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Hasło"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Pokaż hasło"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wybierz pasmo punktu dostępu"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatycznie"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Pasmo 2,4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Pasmo 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Ustawienia IP"</string>
@@ -855,7 +879,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (protokół WPS dostępny)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Podaj hasło do sieci"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Sieć Wi‑Fi operatora"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Połącz przez: <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Połącz przez: <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aby zwiększyć dokładność lokalizacji (i w innych celach), <xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć skanowanie sieci – nawet gdy Wi-Fi jest wyłączone.\n\nZezwolić na to wszystkim aplikacjom, które chcą wykonywać skanowanie?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Aby wyłączyć tę opcję, w rozszerzonym menu otwórz Zaawansowane."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zezwól"</string>
@@ -933,10 +957,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pasmo punktu dostępu"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Użyj hotspotu do utworzenia sieci Wi-Fi dla innych urządzeń. Hotspot zapewnia dostęp do internetu, korzystając z komórkowego połączenia do transmisji danych. Mogą zostać naliczone dodatkowe opłaty za mobilną transmisję danych."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacje mogą utworzyć hotspot, by udostępniać treści urządzeniom w pobliżu."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Automatycznie wyłącz hotspot"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Jeśli nie ma podłączonych urządzeń, hotspot Wi‑Fi wyłączy się"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Włączanie punktu dostępu…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Wyłączam punkt dostępu…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Sieć <xliff:g id="NETWORK_SSID">%1$s</xliff:g> jest aktywna"</string>
@@ -947,7 +969,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Punkt dostępu Android"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Połączenia przez Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Włącz funkcję połączeń przez Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Używaj Wi-Fi zamiast sieci komórkowej"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Ustawienia połączeń"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Tryb połączeń przez Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Preferencje dotyczące roamingu"</string>
@@ -985,6 +1008,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Adres alarmowy"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Traktowany jako Twoja lokalizacja, gdy dzwonisz pod numer alarmowy przez Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Więcej informacji"</annotation>" o funkcjach prywatnego DNS"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
<string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Głośność"</string>
@@ -1201,6 +1225,8 @@
<string name="status_network_type" msgid="3279383550222116235">"Typ sieci komórkowej"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Informacje o operatorze"</string>
<string name="status_data_state" msgid="5503181397066522950">"Stan sieci komórkowej"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"Stan usługi"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Siła sygnału"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -1334,6 +1360,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Twój nowy nośnik (<xliff:g id="NAME">^1</xliff:g>) już działa. \n\nAby przenieść zdjęcia, pliki i dane aplikacji na to urządzenie, kliknij Ustawienia > Pamięć."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Przenieś aplikację <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Przeniesienie aplikacji <xliff:g id="APP">^1</xliff:g> i jej danych na ten nośnik (<xliff:g id="NAME_0">^2</xliff:g>) potrwa tylko chwilę. Do jego zakończenia nie będzie można korzystać z aplikacji. \n\nNie wyjmuj nośnika (<xliff:g id="NAME_1">^2</xliff:g>) w trakcie przenoszenia danych."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Aby przenieść dane, musisz odblokować użytkownika <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Przenoszę aplikację <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Nie wyjmuj nośnika (<xliff:g id="NAME">^1</xliff:g>) w trakcie przenoszenia danych. \n\nAplikacja <xliff:g id="APP">^2</xliff:g> na tym urządzeniu będzie niedostępna, dopóki przenoszenie się nie zakończy."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Anuluj przenoszenie"</string>
@@ -1386,19 +1413,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Można zresetować sieć, aplikacje lub urządzenie"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Zresetuj Wi-Fi, sieć komórkową i Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Spowoduje to usunięcie wszystkich ustawień sieciowych, w tym:\n\n"<li>"Wi‑Fi"</li>\n<li>"mobilnej transmisji danych"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Zresetuj też karty eSIM"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"Zresetuj ustawienia"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Zresetować wszystkie ustawienia sieciowe? Tego działania nie można cofnąć."</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Zresetuj ustawienia"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Zresetować?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Resetowanie sieci nie jest dostępne dla tego użytkownika"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Ustawienia sieciowe zostały zresetowane"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Nie można zresetować kart eSIM"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Nie można zresetować kart eSIM z powodu błędu."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"W tej chwili używasz kont:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Z tego urządzenia korzystają inni użytkownicy.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzyka"</li>\n<li>"Zdjęcia"</li>\n<li>"Inne dane użytkownika"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatorzy na karcie eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"Karty eSIM"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Nie spowoduje to anulowania Twojego abonamentu w sieci komórkowej."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"kartę SD"</b>"."</string>
@@ -1458,21 +1490,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Połącz się z internetem"</string>
<string name="location_title" msgid="1029961368397484576">"Moja lokalizacja"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokalizacja dla profilu do pracy"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Tryb lokalizacji"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Wysoka dokładność"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Oszczędzanie baterii"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Tylko urządzenie"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Obsługa lokalizacji wyłączona"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Uprawnienia na poziomie aplikacji"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Ostatnie prośby o lokalizację"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Żadne aplikacje nie poprosiły ostatnio o lokalizację"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Usługi lokalizacyjne"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Wysokie użycie baterii"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Niskie użycie baterii"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Tryb lokalizacji"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Ustalaj lokalizację przez GPS, Wi‑Fi, Bluetooth lub sieci komórkowe"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Ustalaj lokalizację przez Wi‑Fi, Bluetooth lub sieci komórkowe"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Określaj lokalizację, używając GPS-u i czujników urządzenia"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Skanowanie"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Skanowanie Wi‑Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Popraw dokładność lokalizacji, zezwalając aplikacjom i usługom systemowym na ciągłe wykrywanie sieci Wi-Fi."</string>
@@ -1494,6 +1517,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Źródła lokalizacji"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Informacje o tablecie"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Informacje o telefonie"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"O urządzeniu"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"O emulowanym urządzeniu"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Wyświetl informacje prawne, stan, wersję oprogramowania"</string>
<string name="legal_information" msgid="5769301644270604095">"Informacje prawne"</string>
@@ -1601,6 +1625,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Wyświetl wszystkie aplikacje (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet i dane osobiste są bardziej narażone na atak nieznanych aplikacji. Instalując aplikacje z tego źródła, przyjmujesz odpowiedzialność za wszelkie uszkodzenia telefonu bądź utratę danych, które mogą być spowodowane używaniem tych aplikacji."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon i dane osobiste są bardziej narażone na atak nieznanych aplikacji. Instalując aplikacje z tego źródła, przyjmujesz odpowiedzialność za wszelkie uszkodzenia telefonu bądź utratę danych, które mogą być spowodowane używaniem tych aplikacji."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Urządzenie i dane osobiste są bardziej narażone na atak nieznanych aplikacji. Instalując aplikacje z tego źródła, przyjmujesz odpowiedzialność za wszelkie uszkodzenia urządzenia bądź przypadki utraty danych, które mogą być spowodowane używaniem tych aplikacji."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Ustawienia zaawansowane"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Włącz więcej opcji ustawień."</string>
<string name="application_info_label" msgid="5736524913065714880">"Informacje o aplikacji"</string>
@@ -1902,6 +1927,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Może wpłynąć na wydajność"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kliknij, gdy wskaźnik się zatrzyma"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Opóźnienie przed kliknięciem"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"WŁ."</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"WYŁ."</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Pokaż w szybkich ustawieniach"</string>
@@ -2029,7 +2057,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">"Pozostało <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do naładowania"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Aktywność w tle"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Z ograniczeniem"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Pozwól aplikacji działać w tle"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Nieużywana aplikacja może działać w tle"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Aktywność nieużywanej aplikacji w tle jest ograniczona"</string>
@@ -2072,14 +2100,33 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Bateria jest w dobrym stanie"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikacje działają normalnie"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Niski poziom naładowania baterii"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateria nie zapewnia długiego czasu pracy"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Włącz inteligentny menedżer baterii"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Włącz optymalizację wykorzystania baterii"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Włącz tryb słabej baterii"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Wydłuż czas pracy na baterii"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Włączono tryb słabej baterii"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Niektóre funkcje są ograniczone"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefon intensywnie używany"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet intensywnie używany"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Urządzenie intensywnie używane"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Używanie przez około <xliff:g id="HOUR">%1$s</xliff:g> od ostatniego pełnego naładowania"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Telefon był intensywnie używany, co spowodowało znaczne rozładowanie baterii. Bateria działa prawidłowo.\n\n Telefon był używany przez około <xliff:g id="HOUR">%1$s</xliff:g> od ostatniego pełnego naładowania.\n\n Całkowite wykorzystanie:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Tablet był intensywnie używany, co spowodowało znaczne rozładowanie baterii. Bateria działa prawidłowo.\n\nTablet był używany przez około <xliff:g id="HOUR">%1$s</xliff:g> od ostatniego pełnego naładowania.\n\n Całkowite wykorzystanie:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Urządzenie było intensywnie używane, co spowodowało znaczne rozładowanie baterii. Bateria działa prawidłowo.\n\n Urządzenie było używane przez około <xliff:g id="HOUR">%1$s</xliff:g> od ostatniego pełnego naładowania.\n\n Całkowite wykorzystanie:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Inteligentny menedżer baterii"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Zarządzaj baterią automatycznie"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Automatycznie dostosowuj zużycie energii przez aplikacje w zależności od wykorzystania"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Aplikacje z ograniczeniami"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="few">%1$d aplikacje</item>
+ <item quantity="many">%1$d aplikacji</item>
+ <item quantity="other">%1$d aplikacji</item>
+ <item quantity="one">%1$d aplikacja</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Zatrzymać aplikację?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Twój telefon nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nie pozwala na jego uśpienie.\n\nAby spróbować rozwiązać ten problem, możesz zatrzymać aplikację.\n\nJeśli to nie pomoże, wydłużenie czasu działania na baterii może wymagać odinstalowania aplikacji."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Twój tablet nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nie pozwala na jego uśpienie.\n\nAby spróbować rozwiązać ten problem, możesz zatrzymać aplikację.\n\nJeśli to nie pomoże, wydłużenie czasu działania na baterii może wymagać odinstalowania aplikacji."</string>
@@ -2188,6 +2235,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Serwer mediów"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optymalizacja aplikacji"</string>
<string name="battery_saver" msgid="8172485772238572153">"Oszczędzanie baterii"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Użyj Oszczędzania baterii"</string>
<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>
@@ -2375,8 +2423,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"W tej chwili występują problemy z synchronizacją. Synchronizacja będzie możliwa wkrótce."</string>
<string name="add_account_label" msgid="7811707265834013767">"Dodaj konto"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Profil do pracy nie jest jeszcze dostępny"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Tryb pracy"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Włącz profil do pracy, w tym aplikacje, synchronizację w tle i inne funkcje"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Usuń profil do pracy"</string>
<string name="background_data" msgid="5779592891375473817">"Dane w tle"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Aplikacje zawsze mogą synchronizować, wysyłać i odbierać dane."</string>
@@ -2408,6 +2460,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Usunąć konto?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Usunięcie tego konta spowoduje usunięcie z tabletu wszystkich powiązanych z nim wiadomości, kontaktów i innych danych."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Usunięcie tego konta spowoduje usunięcie z telefonu wszystkich powiązanych z nim wiadomości, kontaktów i innych danych."</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Usunięcie tego konta spowoduje usunięcie z urządzenia wszystkich wiadomości, kontaktów i innych danych powiązanych z kontem."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Ta zmiana nie jest dozwolona przez administratora"</string>
<string name="provider_label" msgid="7724593781904508866">"Subskrypcje w trybie push"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2634,7 +2687,8 @@
<item quantity="other">Sprawdź certyfikaty</item>
<item quantity="one">Sprawdź certyfikat</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Użytkownicy"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Użytkownicy i profile"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodaj użytkownika lub profil"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj użytkownika"</string>
@@ -2826,7 +2880,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, przesyłanie"</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="account_dashboard_title" msgid="4936890821712178853">"Użytkownicy i konta"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2857,7 +2912,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"nie przeszkadzać, przerywać, zakłócenie, zakłócać"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"w pobliżu, lokalizacja, historia, raportowanie"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"dokładność"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
<string name="keywords_users" msgid="3434190133131387942">"ograniczenie, ogranicz, ograniczony"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"poprawianie tekstu, popraw, dźwięk, wibracje, automatycznie, język, gest, sugeruj, sugestia, motyw, obraźliwe, słowo, typ, emotikon, międzynarodowe"</string>
@@ -2926,6 +2980,7 @@
<item quantity="one">1 reguła</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Nie przeszkadzać"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Włącz tryb Nie przeszkadzać"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Działanie"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Zezwól na dźwięki i wibracje z"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Brak dźwięku"</string>
@@ -2935,8 +2990,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Włącz automatycznie"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Reguły automatyczne"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Reguła automatyczna"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Ustaw reguły Nie przeszkadzać"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ogranicz dźwięki i wibracje o pewnych porach"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Użyj reguły"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Tylko priorytetowe"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tylko alarmy"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Całkowita cisza"</string>
@@ -2944,12 +3002,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokuj wyświetlanie"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Zezwól na sygnały wizualne"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Dodaj"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"WŁĄCZ TERAZ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"WYŁĄCZ TERAZ"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Włącz"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Włącz teraz"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Wyłącz teraz"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Tryb Nie przeszkadzać jest włączony do <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Tryb Nie przeszkadzać pozostanie włączony, dopóki go nie wyłączysz"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Tryb Nie przeszkadzać został włączony automatycznie przez regułę (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Tryb Nie przeszkadzać został włączony automatycznie przez aplikację (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Tylko priorytet"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Dźwięki w profilu do pracy"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Użyj dźwięków z profilu osobistego"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Dźwięki są takie same w profilu osobistym i do pracy"</string>
@@ -2965,6 +3026,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Dzwonki"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Inne dźwięki i wibracje"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Powiadomienia"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Ostatnio wysłane"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Zaawansowane"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Powiadomienia związane z pracą"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Zezwól na plakietki z powiadomieniami"</string>
@@ -2984,7 +3046,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Powiadomienia aplikacji"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Kategoria powiadomienia"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Grupa kategorii powiadomień"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Ważność"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Działanie"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Zezwól na dźwięk"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Nigdy nie pokazuj powiadomień"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Brak dźwięku i komunikatów wizualnych"</string>
@@ -3002,6 +3064,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Średnio ważne"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Bardzo ważne"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Pilne"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Pokaż powiadomienia"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Asystent powiadomień"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Dostęp do powiadomień"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Dostęp do powiadomień profilu do pracy jest zablokowany"</string>
@@ -3034,9 +3097,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Dostęp do „Nie przeszkadzać”"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Żadne zainstalowane aplikacje nie prosiły o dostęp do funkcji „Nie przeszkadzać”."</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokuje powiadomienia z tej aplikacji na urządzeniu"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokuje tę kategorię powiadomień na urządzeniu"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokuje tę grupę powiadomień na urządzeniu"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Android na żądanie blokuje powiadomienia z tej aplikacji na urządzeniu"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Android na żądanie blokuje tę kategorię powiadomień na urządzeniu"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Android na żądanie blokuje tę grupę powiadomień na urządzeniu"</string>
<string name="notification_channels" msgid="5346841743182627500">"Kategorie"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Inne"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3191,6 +3254,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Jeśli korzystasz z funkcji odblokowywania odciskiem palca, dla większego bezpieczeństwa możesz wymagać podania hasła przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Tak"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Nie"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Tak"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Nie"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Wymagać kodu PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Wymagać wzoru?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Wymagać hasła?"</string>
@@ -3296,9 +3361,9 @@
<string name="system_default_app" msgid="3091113402349739037">"(Domyślna aplikacja systemu)"</string>
<string name="apps_storage" msgid="4353308027210435513">"Magazyn aplikacji"</string>
<string name="usage_access" msgid="5479504953931038165">"Dostęp do danych o użyciu"</string>
- <string name="permit_usage_access" msgid="4012876269445832300">"Zezwól na dostęp do użytkowania"</string>
+ <string name="permit_usage_access" msgid="4012876269445832300">"Zezwól na dostęp do danych o użyciu"</string>
<string name="app_usage_preference" msgid="7065701732733134991">"Ustawienia użycia aplikacji"</string>
- <string name="usage_access_description" msgid="1352111094596416795">"Dostęp do użytkowania umożliwia aplikacji śledzenie tego, jakich innych aplikacji i jak często używasz, oraz odczytywanie m.in. informacji o operatorze i ustawień językowych."</string>
+ <string name="usage_access_description" msgid="1352111094596416795">"Dostęp do danych o użyciu umożliwia aplikacji śledzenie tego, jakich innych aplikacji używasz i jak często, oraz odczytywanie m.in. informacji o operatorze i ustawień językowych."</string>
<string name="memory_settings_title" msgid="7490541005204254222">"Pamięć RAM"</string>
<string name="memory_details_title" msgid="8542565326053693320">"Informacje dotyczące pamięci"</string>
<string name="always_running" msgid="6042448320077429656">"Zawsze aktywna (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3332,8 +3397,8 @@
<string name="high_power_off" msgid="3393904131961263278">"Ma włączoną optymalizację baterii"</string>
<string name="high_power_system" msgid="7362862974428225301">"Optymalizacja baterii niedostępna"</string>
<string name="high_power_desc" msgid="6283926163708585760">"Nie stosuj optymalizacji baterii. Może powodować szybsze wyczerpywanie się baterii."</string>
- <string name="high_power_prompt_title" msgid="6358673688590282655">"Pozwolić aplikacji cały czas działać w tle?"</string>
- <string name="high_power_prompt_body" msgid="1031422980602565049">"Zezwolenie aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> na ciągłe działanie w tle może skrócić czas pracy na baterii. \n\nMożesz zmienić to ustawienie później, wybierając Ustawienia > Aplikacje i powiadomienia."</string>
+ <string name="high_power_prompt_title" msgid="6358673688590282655">"Pozwolić aplikacji cały czas działać w tle?"</string>
+ <string name="high_power_prompt_body" msgid="1031422980602565049">"Zezwolenie aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> na ciągłe działanie w tle może skrócić czas pracy na baterii. \n\nMożesz zmienić to ustawienie później, wybierając Ustawienia > Aplikacje i powiadomienia."</string>
<string name="battery_summary" msgid="8044042095190688654">"Użycie od ostatniego pełnego naładowania: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="battery_power_management" msgid="5571519699679107523">"Zarządzanie zasilaniem"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"Brak użycia baterii od ostatniego pełnego naładowania"</string>
@@ -3479,7 +3544,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Bieżący użytkownik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Jesteś zalogowany jako <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"Domyślna aplikacja to <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"WŁ. / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"WYŁ."</string>
<string name="backup_disabled" msgid="485189128759595412">"Kopia zapasowa wyłączona"</string>
<string name="about_summary" msgid="924181828102801010">"Zaktualizowano do Androida <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3489,6 +3555,7 @@
<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="6346948990624612516">"Nie można wyłączyć kopii zapasowych"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"To działanie jest wyłączone. Aby dowiedzieć się więcej, skontaktuj się z administratorem organizacji."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Więcej szczegółów"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Administrator może monitorować aplikacje i dane powiązane z Twoim profilem do pracy (w tym ustawienia, uprawnienia, firmowe uprawnienia dostępu, aktywność w sieci i informacje o lokalizacji urządzenia) oraz nimi zarządzać."</string>
@@ -3512,9 +3579,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"Profil do pracy jest wyłączony"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Aplikacje, synchronizacja w tle i inne funkcje związane z profilem do pracy są wyłączone."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Ustal harmonogram Podświetlenia nocnego"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Ociepla barwy, by ułatwić Ci zaśnięcie"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"Podświetlenie nocne jest włączone"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran ma pomarańczowy odcień. Może to ułatwić zaśnięcie."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Proponowane dla Ciebie"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Sugestie"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"Jeszcze <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3627,6 +3696,8 @@
<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_none" msgid="5144174674654097316">"Brak"</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>
@@ -3651,31 +3722,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Kafelki szybkich ustawień dla programisty"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Chętnie Ci pomożemy"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Pomożemy Ci każdego dnia o dowolnej porze"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Pomożemy Ci każdego dnia o dowolnej porze"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Nasz zespół pomocy postara się rozwiązać każdy problem"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nasz zespół pomocy jest dostępny codziennie przez całą dobę"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Przeszukaj pomoc lub skorzystaj z pomocy telefonicznej w tych godzinach (czasu lokalnego):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Pomoc telefoniczna jest dostępna w tych godzinach (czasu lokalnego)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Szukaj pomocy lub przeglądaj wskazówki i porady"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Kraj obsługi klienta:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Wybierasz się za granicę?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Mogą zostać naliczone opłaty za połączenia międzynarodowe"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Czat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Zobacz porady i wskazówki"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Przeszukaj pomoc i prześlij opinię"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Kontakt z pomocą"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Zaloguj się"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Nie możesz się zalogować?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Wyślij informacje o systemie"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Nie pokazuj ponownie"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Wysyłasz jako"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Dodaj konto"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Informacje o systemie"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Monitorowanie okien"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Śledzenie powierzchni"</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>
@@ -3697,11 +3745,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekundy</item>
<item quantity="one">1 sekunda</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Czas oczekiwania: około <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Zarządzanie pamięcią"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Aby pomóc zwolnić miejsce, Menedżer miejsca usuwa z urządzenia kopie zapasowe zdjęć i filmów."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Usuń zdjęcia i filmy"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Menedżer miejsca"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Użyj Menedżera miejsca"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatyczne"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Instrukcja"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Zwolnij miejsce teraz"</string>
@@ -3712,32 +3760,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Uruchamianie aparatu"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Aby szybko uruchomić aparat, naciśnij dwukrotnie przycisk zasilania. Możesz to zrobić na dowolnym ekranie."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Szybkie uruchamianie aparatu"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Naciśnij dwukrotnie przycisk zasilania, by otworzyć aparat"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Obrót aparatu"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Szybsze robienie selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Dwukrotnie obróć telefon, by uruchomić tryb selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Dwukrotnie obróć tablet, by uruchomić tryb selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Dwukrotnie obróć urządzenie, by uruchomić tryb selfie"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Sprawdzaj powiadomienia przy wyłączonym ekranie"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Sprawdzaj powiadomienia przy wyłączonym ekranie"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Aby sprawdzić powiadomienia, przesuń palcem w dół na czytniku linii papilarnych z tyłu tabletu."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Aby sprawdzić powiadomienia, przesuń palcem w dół na czytniku linii papilarnych z tyłu urządzenia."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Szybkie wyświetlanie powiadomień"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Przesuń palcem w dół po czytniku linii papilarnych"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Włączone"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Wyłączone"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Program rozruchowy jest już odblokowany"</string>
@@ -3881,8 +3922,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Dostęp do katalogu"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"dostęp do katalogu"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 3c5a7ca..0368567 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Pressione o botão"</item>
<item msgid="1624323946324499595">"PIN do dispositivo pareado"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"Uma hora"</item>
<item msgid="5198271470953124739">"Nunca definir tempo limite"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (padrão)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Ruim"</item>
<item msgid="2042505933058940139">"Fraca"</item>
@@ -386,7 +402,7 @@
</string-array>
<string-array name="captioning_font_size_selector_titles">
<item msgid="4800919809575254054">"Muito pequeno"</item>
- <item msgid="6781094565687692782">"Pequena"</item>
+ <item msgid="6781094565687692782">"Pequeno"</item>
<item msgid="8222123259497646551">"Normal"</item>
<item msgid="5813217276778560466">"Grande"</item>
<item msgid="9044232017390975191">"Muito grande"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Com mais de 60 dias"</item>
<item msgid="5692284879054004388">"Com mais de 90 dias"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Usar preferência de rede"</item>
+ <item msgid="8745603368609022803">"Tratar como limitada"</item>
+ <item msgid="2266114985518865625">"Tratar como ilimitada"</item>
+ </string-array>
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 9c2a2f7..855d5a8 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permitir que o dispositivo pareie e se conecte a dispositivos Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Desativar o toque em banda"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Não reproduzir toques de telefone personalizados em fones de ouvido Bluetooth"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Classificar em ordem alfabética"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Classificar por fuso horário"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"O <xliff:g id="TIME_TYPE">%1$s</xliff:g> começa em: <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Horário de verão"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Horário padrão"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Fuso horário por região"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fusos horários com diferença fixa"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
<string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Mensagem na tela de bloqueio"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Ativar widgets"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desativada pelo administrador"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Mostrar opção de bloqueio total"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Exibe a opção do botão liga/desliga que desativa a extensão de acesso e o desbloqueio com impressão digital."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Nenhuma"</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">"por exemplo, Android do João."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Usar local"</string>
<string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Segurança e local"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
@@ -459,9 +469,11 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"A senha digitada está correta, mas os dados estão corrompidos. \n\nPara retomar o uso do seu tablet, é necessário redefinir para as configurações originais. Quando você configurar seu tablet após a redefinição, poderá restaurar todos os dados que foram salvos em backup na sua Conta do Google."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"A senha digitada está correta, mas os dados estão corrompidos. \n\nPara retomar o uso do seu smartphone, é necessário redefinir para as configurações originais. Quando você configurar seu smartphone após a redefinição, poderá restaurar todos os dados que foram salvos em backup na sua Conta do Google."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Alterar o método de entrada"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Configurar o bloqueio de tela"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Proteger seu dispositivo"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Usar impressão digital"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Defin. bloq. de tela por segurança"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Impede que outras pessoas usem seu tablet"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Impede que outras pessoas usem seu dispositivo"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Impede que outras pessoas usem seu smartphone"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Desbloqueio com impressão digital"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear com sua impressão digital"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloqueio de tela"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Escolher bloq de trab."</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e mídia"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Número máximo de dispositivos de áudio Bluetooth conectados"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecione o número máximo de dispositivos de áudio Bluetooth conectados"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmitir"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar tela sem fio"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo próximo encontrado."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Fazer login"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> quer ativar o Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> quer desativar o Wi-Fi"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar o Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Usar Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Configurações de Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerenciar pontos de acesso sem fio"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Senha"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar senha"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecionar banda de AP"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Configurações de IP"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi‑Fi de operadora"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado.\n\nPermitir isto para todos os apps que quiserem verificar?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar esta opção, vá para \"Avançado\" no menu flutuante."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -909,10 +926,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de AP"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Use o ponto de acesso para criar uma rede Wi‑Fi para outros dispositivos. O ponto de acesso fornece Internet usando sua conexão de dados móveis. Pode haver cobrança adicional para dados móveis."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Os apps podem criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Desativar ponto de acesso automaticamente"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"O ponto de acesso Wi‑Fi será desativado se nenhum dispositivo for conectado"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Ativando o ponto de acesso..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Desativando o ponto de acesso..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"A rede <xliff:g id="NETWORK_SSID">%1$s</xliff:g> está ativa"</string>
@@ -923,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Ponto de acesso Android"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Chamadas por Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Ativar chamada no Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Usar o Wi-Fi em vez da rede móvel"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Amplie a cobertura fazendo uma chamada com o Wi-Fi"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferência de chamadas"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de chamada por Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Preferências de roaming"</string>
@@ -961,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Endereço de emergência"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Usado como seu local quando você faz uma chamada de emergência usando o Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saiba mais"</annotation>" sobre recursos de DNS particular"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
<string name="sound_settings" msgid="5534671337768745343">"Som"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1175,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Tipo de rede móvel"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Informações da operadora"</string>
<string name="status_data_state" msgid="5503181397066522950">"Estado da rede móvel"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Estado do serviço"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Potência do sinal"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -1308,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Seu novo <xliff:g id="NAME">^1</xliff:g> está funcionando. \n\nPara mover fotos, arquivos e dados de apps para este dispositivo, vá para \"Config.\" > \"Armazenamento\"."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"A transferência de <xliff:g id="APP">^1</xliff:g> e seus dados para <xliff:g id="NAME_0">^2</xliff:g> levará apenas alguns momentos. Você não conseguirá usar o app até que a transferência seja concluída. \n\nNão remova o <xliff:g id="NAME_1">^2</xliff:g> durante a transferência."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Para mover os dados é necessário desbloquear o usuário <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Movendo <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Não remova o <xliff:g id="NAME">^1</xliff:g> durante a transferência. \n\nO app <xliff:g id="APP">^2</xliff:g> deste dispositivo não ficará disponível até a conclusão da transferência."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferência"</string>
@@ -1360,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"A rede, os apps ou o dispositivo podem ser redefinidos"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Redefinir Wi-Fi, rede móvel e Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Isso redefinirá todas as configurações de rede, inclusive:\n\n"<li>"Wi‑Fi"</li>\n<li>"dados móveis"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Também redefinir eSIMs"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Limpa todos os eSIMs no smartphone. Você precisará entrar em contato com a operadora para fazer o download deles novamente. Essa opção não cancela seu plano de serviços móveis."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Redefinir configurações"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Redefinir todas as configurações de rede? Não é possível desfazer esta ação."</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Redefinir configurações"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Redefinir?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"A redefinição da rede não está disponível para esse usuário"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"As configurações de rede foram redefinidas"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Não é possível redefinir os eSIMs"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Não é possível redefinir os eSIMs devido a um erro."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Limpar todos os dados (redefinição para configuração original)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadoras no eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMs"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Essa ação não cancelará seu plano de serviços móveis."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
@@ -1432,21 +1454,12 @@
<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>
- <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economia de bateria"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Somente no dispositivo"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Local desativado"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Permissões no nível do app"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitações recentes"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhum app solicitou a localização recentemente"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Serviços de localização"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Uso da bateria elevado"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Uso da bateria reduzido"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usar GPS, Wi‑Fi, Bluetooth ou redes móveis para determinar a localização"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usar Wi-Fi, Bluetooth ou redes móveis para determinar a localização"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Usar GPS e sensores do dispositivo para determinar a localização"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Verificação"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Verificação de Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Melhore a localização permitindo que apps e serviços do sistema detectem redes Wi-Fi a qualquer momento."</string>
@@ -1468,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Fontes de localização"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Sobre o tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Sobre o dispositivo"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Sobre o dispositivo"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Sobre o dispositivo emulado"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Ver informações legais, status, versão do software"</string>
<string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
@@ -1575,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Ver todos os <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Seu tablet e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu tablet ou pela perda de dados que possa resultar do uso desses apps."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Seu smartphone e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu smartphone ou pela perda de dados que possa resultar do uso desses apps."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Seus dados pessoais e do seu dispositivo são mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu dispositivo ou pela perda de dados que possa resultar do uso desses apps."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Ativa mais opções de configuração"</string>
<string name="application_info_label" msgid="5736524913065714880">"Informações do app"</string>
@@ -1874,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar após parada do ponteiro"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes do clique"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ATIVAR"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVAR"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar em \"Configurações rápidas\""</string>
@@ -1987,7 +2005,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> restantes"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> até carregar"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Atividade em segundo plano"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Restrito"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Permitir que o app seja executado em segundo plano"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"O app pode ser executado em segundo plano quando não está em uso"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"A atividade em segundo plano do app é limitada quando ele não está em uso"</string>
@@ -2030,14 +2048,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"A bateria está em boas condições"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Os apps estão se comportando normalmente"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Baixa capacidade de bateria"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"A bateria não pode oferecer uma boa duração"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Ativar o gerenciador de bateria inteligente"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Ative para otimizar o uso da bateria"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Ativar o modo Bateria fraca"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Aumentar a duração da bateria"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"O modo Bateria fraca está ativado"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Alguns recursos são limitados"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"O smartphone foi muito usado"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"O tablet foi muito usado"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"O dispositivo foi muito usado"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Cerca de <xliff:g id="HOUR">%1$s</xliff:g> de uso desde a última carga completa"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Seu smartphone foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O smartphone foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Seu tablet foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O tablet foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Seu dispositivo foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O dispositivo foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gerenciador de bateria inteligente"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Gerenciar bateria automaticamente"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Ajuste automaticamente o consumo de energia de apps com base no uso"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Apps restritos"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d app</item>
+ <item quantity="other">%1$d apps</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Parar o app?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Não é possível gerenciar a bateria do smartphone normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Não é possível gerenciar a bateria do tablet normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
@@ -2146,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de mídia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Otimização do app"</string>
<string name="battery_saver" msgid="8172485772238572153">"Economia de bateria"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Usar a Economia de bateria"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ativar automaticamente"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"com <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
@@ -2333,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"A sincronização está enfrentando problemas no momento. Ela retornará em breve."</string>
<string name="add_account_label" msgid="7811707265834013767">"Adicionar conta"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Perfil de trabalho ainda indisponível"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Modo trabalho"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Permitir que o perfil de trabalho funcione, incluindo apps, sincronização em segundo plano e recursos relacionados"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Perfil de trabalho"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Gerenciados pela sua organização"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Os apps e as notificações estão desativados"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Remover perfil de trabalho"</string>
<string name="background_data" msgid="5779592891375473817">"Dados de segundo plano"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Aplicat. sincronizam, enviam e recebem dados a qualquer hora"</string>
@@ -2366,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Remover conta?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"A remoção desta conta excluirá todas as suas mensagens, contatos e outros dados do tablet."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"A remoção desta conta excluirá todas as suas mensagens, contatos e outros dados do telefone!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"A remoção desta conta excluirá do dispositivo todas as mensagens, os contatos e outros dados dela."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Esta alteração não é permitida pelo administrador"</string>
<string name="provider_label" msgid="7724593781904508866">"Enviar inscrições"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2622,8 @@
<item quantity="one">Verificar certificados</item>
<item quantity="other">Verificar certificados</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Usuários"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Usuários e perfis"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adicionar usuário ou perfil"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar usuário"</string>
@@ -2774,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, transmissão"</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="account_dashboard_title" msgid="4936890821712178853">"Usuários e contas"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Apps padrão"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, horário, backup e atualizações"</string>
<string name="search_results_title" msgid="1796252422574886932">"Configurações"</string>
@@ -2805,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"não perturbe, interromper, interrupção"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"proximidades, local, histórico, relatório"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"precisão"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
<string name="keywords_users" msgid="3434190133131387942">"restrição, restringir, restrito"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"correção de texto, corrigir, som, vibrar, automático, idioma, gesto, sugerir, sugestão, tema, ofensivo, palavra, digitar, emoticons, internacional"</string>
@@ -2872,6 +2911,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regras</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Não perturbe"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Ativar o \"Não perturbe\""</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportamento"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permitir sons e vibrações de"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Sem som"</string>
@@ -2881,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Ativar automaticamente"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Regras automáticas"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Regra automática"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir regras de Não perturbe"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitar som e vibrar eventualmente"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Silenciar smartphone em horários específicos"</string>
+ <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"Definir regras do modo \"Não perturbe\""</string>
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Usar regra"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Somente prioridade"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Somente alarmes"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silêncio total"</string>
@@ -2890,12 +2931,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear perturbações visuais"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Adicionar"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ATIVAR AGORA"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESATIVAR AGORA"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Ativar"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Ativar agora"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desativar agora"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"O modo \"Não perturbe\" fica ativado até <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"O modo \"Não perturbe\" ficará ativado até que você o desative"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"O modo \"Não perturbe\" foi ativado automaticamente por uma regra (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"O modo \"Não perturbe\" foi ativado automaticamente por um app (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Somente prioridade"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de trabalho"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Usar sons do perfil pessoal"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Os sons são os mesmos para os perfis pessoal e de trabalho"</string>
@@ -2911,6 +2955,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Toques"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Outros sons e vibrações"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Enviadas recentemente"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avançadas"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Permitir pontos de notificação"</string>
@@ -2930,7 +2975,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Categoria da notificação"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoria de notificações"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Comportamento"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Sem som ou interrupção visual"</string>
@@ -2948,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância elevada"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Importância urgente"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Mostrar notificações"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificação"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
@@ -2978,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"O Android está impedindo que esse grupo de notificações seja exibido neste dispositivo"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Conforme sua solicitação, o Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Conforme sua solicitação, o Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Conforme sua solicitação, o Android está impedindo que esse grupo de notificações seja exibido neste dispositivo"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Outros"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo sua senha antes da inicialização. O dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes, até que ele seja iniciado.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar senha para iniciar o dispositivo?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sim"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Não"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Sim"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Não"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exigir PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Exigir padrão?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Exigir senha?"</string>
@@ -3397,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Usuário atual: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Conectado como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> é padrão"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ATIVADA / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"DESATIVADA"</string>
<string name="backup_disabled" msgid="485189128759595412">"Backup desativado"</string>
<string name="about_summary" msgid="924181828102801010">"Atualizado para o Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3407,6 +3456,7 @@
<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="6346948990624612516">"Não é possível desativar os backups"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Essa ação foi desativada. Para saber mais, entre em contato com o administrador. da sua organização."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Mais detalhes"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Seu administrador pode monitorar e gerenciar apps e dados associados ao seu perfil de trabalho, incluindo configurações, permissões, acesso corporativo, atividade de rede e informações de local do dispositivo."</string>
@@ -3430,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabalho desativado"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Os apps, a sincronização em segundo plano e outros recursos relacionados com seu perfil de trabalho estão desativados."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Definir programação do Modo noturno"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tingir tela de âmbar p/ ajudar você a pegar no sono"</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>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Sugestões para você"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Sugestões"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"Mais <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3537,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"Nenhum"</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>
@@ -3559,31 +3612,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Blocos de desenvolvedor para configurações rápidas"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos aqui para ajudar você 24 horas por dia, 7 dias por semana"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos aqui para ajudar você 24 horas por dia, 7 dias por semana"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Nossa equipe de suporte está aqui para ajudar a resolver qualquer problema"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nossa equipe de suporte está disponível o dia todo, todos os dias"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Procure ajuda ou volte durante o horário de suporte (hora local):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Horário do suporte por telefone (hora local)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Procure ajuda ou explore dicas e truques"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Suporte para:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Está no exterior?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Tarifas internacionais podem ser aplicadas"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefone"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Bate-papo"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Conferir dicas e truques"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Procurar ajuda e enviar feedback"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Entre em contato com o suporte"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Fazer login"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Não consegue fazer login?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar informações do sistema"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Não mostrar novamente"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Solicitando como"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Adicionar conta"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Informações do sistema"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Rastros da janela"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Rastros de superfície"</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>
@@ -3599,11 +3629,11 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo aproximado de espera: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gerenciar armazenamento"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para ajudar a liberar espaço de armazenamento, o gerenciador de armazenamento remove fotos e vídeos do seu dispositivo salvos em backup."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remover fotos e vídeos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gerenciador de armazenamento"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Usar gerenciador de armazenamento"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Modo automático"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Modo manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espaço agora"</string>
@@ -3614,32 +3644,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Ir para a câmera"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir a câmera rapidamente, pressione o botão liga/desliga duas vezes. O recurso funciona em qualquer tela."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Abrir a câmera rapidamente"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Pressione o botão liga/desliga duas vezes p/ abrir a câmera"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Virar câmera"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Tirar selfies com mais rapidez"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Girar duas vezes o smartphone para abrir o modo selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Girar duas vezes o tablet para abrir o modo selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Girar duas vezes o dispositivo para abrir o modo selfie"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Verificar as notificações quando a tela estiver desligada"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Verificar as notificações quando a tela estiver desligada"</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">"Deslizar imp. 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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do tablet."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do dispositivo."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ver notificações rapidamente"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Deslize para baixo no sensor de impressão digital"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Ativado"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Desativado"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O bootloader já está desbloqueado"</string>
@@ -3769,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Acesso ao diretório"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"acesso ao diretório"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"Meu smartphone"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"Meu tablet"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"Meu dispositivo"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Conta"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nome do dispositivo"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar Bluetooth ao dirigir"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Ativar Bluetooth automaticamente ao dirigir"</string>
</resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 9df255c..1240ebe 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"1 hora"</item>
<item msgid="5198271470953124739">"Nunca exceder tempo limite"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (predefinição)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Fraco"</item>
<item msgid="2042505933058940139">"Fraca"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"Mais de 60 dias"</item>
<item msgid="5692284879054004388">"Mais de 90 dias"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Utilizar preferência da rede"</item>
+ <item msgid="8745603368609022803">"Tratar como acesso limitado"</item>
+ <item msgid="2266114985518865625">"Tratar como acesso ilimitado"</item>
+ </string-array>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d9546f1..d469602 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os seus dispositivos"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar o novo dispositivo"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permitir que o dispositivo estabeleça ligação a dispositivos Bluetooth e fique sincronizado com os mesmos"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Desativar toque dentro da banda"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Não reproduza toques de telemóvel personalizados em auscultadores com microfone integrado Bluetooth."</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabeticamente"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por fuso horário"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"O horário <xliff:g id="TIME_TYPE">%1$s</xliff:g> começa a <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Mudança de hora"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Hora padrão"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Fuso horário por região"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fusos horários com desvio fixo"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
<string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
@@ -348,6 +355,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Utilizar a localização"</string>
<string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Segurança e localização"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptação e credenciais"</string>
@@ -691,6 +699,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como telefone com altifalante"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e multimédia"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorizar definições"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Máximo de dispositivos de áudio Bluetooth associados"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecione o número máximo de dispositivos de áudio Bluetooth associados."</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmitir"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar display sem fios"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo nas proximidades."</string>
@@ -705,6 +715,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Iniciar sessão"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> pretende ativar o Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> pretende desativar o Wi-Fi"</string>
@@ -722,6 +733,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Utilizar o Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Definições de Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerir pontos de acesso sem fios"</string>
@@ -833,7 +845,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduzir a palavra-passe da rede"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi-Fi do operador"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Ligar através de <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Ligar através de <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para melhorar a precisão da localização e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar a verificação de redes, mesmo quando o Wi-Fi está desativado.\n\nPermitir esta opção para todas as aplicações que pretenderem verificar?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar, aceda a Avançadas no menu adicional."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -959,6 +971,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Endereço de emergência"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Utilizado como a sua localização quando efetuar chamadas de emergência através de Wi‑Fi."</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saiba mais"</annotation>" acerca das funcionalidades de DNS privado."</string>
<string name="display_settings_title" msgid="1708697328627382561">"Ecrã"</string>
<string name="sound_settings" msgid="5534671337768745343">"Som"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1306,6 +1319,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"O seu novo <xliff:g id="NAME">^1</xliff:g> está a funcionar. \n\nPara mover fotos, ficheiros e dados das aplicações para este dispositivo, aceda a Definições > Armazenamento."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"A transferência da aplicação <xliff:g id="APP">^1</xliff:g> e dos respetivos dados para <xliff:g id="NAME_0">^2</xliff:g> demora apenas alguns minutos. Não é possível utilizar a aplicação até a ação terminar. \n\nNão remova o <xliff:g id="NAME_1">^2</xliff:g> no decorrer da mesma."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Para mover os dados, tem de desbloquear o utilizador <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"A mover <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Não remova o <xliff:g id="NAME">^1</xliff:g> durante a transferência. \n\nA aplicação <xliff:g id="APP">^2</xliff:g> neste dispositivo não está disponível até terminar a transferência."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferência"</string>
@@ -1466,6 +1480,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Origens da localização"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca do tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Acerca do telefone"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Acerca do dispositivo"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Acerca do dispositivo emulado"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Ver informações jurídicas, estado, versão de software"</string>
<string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
@@ -1573,6 +1588,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Ver as <xliff:g id="COUNT">%1$d</xliff:g> aplicações"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"O seu tablet e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no tablet ou perdas de dados que possam resultar da utilização do mesmo."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"O seu telemóvel e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no telemóvel ou perdas de dados que possam resultar da utilização do mesmo."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"O dispositivo e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no dispositivo ou perdas de dados que possam resultar da utilização do mesmo."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Definições avançadas"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Ativar mais opções de definições"</string>
<string name="application_info_label" msgid="5736524913065714880">"Informações da aplicação"</string>
@@ -1872,6 +1888,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar depois de o ponteiro parar de se mover"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes de clicar"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ATIVADO"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVADO"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar nas Definições rápidas"</string>
@@ -2030,10 +2049,33 @@
<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="7060523369832289878">"A bateria não apresenta problemas"</string>
<string name="battery_tip_summary_summary" msgid="7832491466325707487">"As aplicações estão a apresentar um comportamento normal."</string>
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Bateria fraca"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateria com baixa autonomia"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Ativar o gestor de bateria inteligente"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Ative para otimizar a utilização da bateria."</string>
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+ <skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telemóvel submetido a uma utilização intensa"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet submetido a uma utilização intensa"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Dispositivo submetido a uma utilização intensa"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Cerca de <xliff:g id="HOUR">%1$s</xliff:g> de utilização desde o último carregamento completo."</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"O seu telemóvel foi submetido a uma utilização intensa, o que consumiu muita bateria. A bateria apresenta um comportamento normal.\n\n O telemóvel foi utilizado durante cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde o último carregamento completo.\n\n Utilização total:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"O seu tablet foi submetido a uma utilização intensa, o que consumiu muita bateria. A bateria apresenta um comportamento normal.\n\n O tablet foi utilizado durante cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde o último carregamento completo.\n\n Utilização total:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"O seu dispositivo foi submetido a uma utilização intensa, o que consumiu muita bateria. A bateria apresenta um comportamento normal.\n\n O dispositivo foi utilizado durante cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde o último carregamento completo.\n\n Utilização total:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gestor de bateria inteligente"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Gerir automaticamente a bateria"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Ajuste automaticamente o consumo de energia das aplicações com base na utilização."</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Aplicações restritas"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d aplicações</item>
+ <item quantity="one">%1$d aplicação</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Parar a aplicação?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"O telemóvel não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> mantém-no constantemente ativo.\n\nPara tentar resolver este problema, pode parar a aplicação.\n\nSe isto continuar a acontecer, pode ser necessário desinstalar a aplicação para melhorar o desempenho da bateria."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"O tablet não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> mantém-no constantemente ativo.\n\nPara tentar resolver este problema, pode parar a aplicação.\n\nSe isto continuar a acontecer, pode ser necessário desinstalar a aplicação para melhorar o desempenho da bateria."</string>
@@ -2142,6 +2184,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Otimização de aplicações"</string>
<string name="battery_saver" msgid="8172485772238572153">"Poupança de bateria"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Utilizar a Poupança de bateria"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ligar automaticamente"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"ao alcançar <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
@@ -2362,6 +2405,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Pretende remover a conta?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"A remoção desta conta elimina todas as mensagens, contactos e outros dados do tablet!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"A remoção desta conta elimina todas as mensagens, contactos e outros dados do telemóvel!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"A remoção desta conta elimina todas as mensagens, os contactos e outros dados do dispositivo."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"O gestor não permite esta alteração"</string>
<string name="provider_label" msgid="7724593781904508866">"Subscrições de emissão"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2886,8 +2930,8 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear perturbações visuais"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Adicionar"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ATIVAR AGORA"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESATIVAR AGORA"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Ativar agora"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desativar agora"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"O modo Não incomodar está ativado até à(s) <xliff:g id="FORMATTED_TIME">%s</xliff:g>."</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"O modo Não incomodar continua ativo até o desativar."</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"O modo Não incomodar foi ativado automaticamente por uma regra (<xliff:g id="RULE_NAME">%s</xliff:g>)."</string>
@@ -2926,7 +2970,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Notificações de aplicações"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Categoria de notificações"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoria de notificações"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Comportamento"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Sem interrupção sonora ou visual"</string>
@@ -2944,6 +2988,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância alta"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Importância máxima"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Mostrar notificações"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificações"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
@@ -2974,9 +3019,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso Não incomodar"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhuma aplicação instalada solicitou acesso Não incomodar"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está a bloquear a apresentação das notificações desta aplicação neste dispositivo"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está a bloquear a apresentação desta categoria de notificações neste dispositivo"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"O Android está a bloquear a apresentação deste grupo de notificações neste dispositivo."</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"A seu pedido, o Android está a bloquear a apresentação das notificações desta aplicação neste dispositivo."</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"A seu pedido, o Android está a bloquear a apresentação desta categoria de notificações neste dispositivo."</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"A seu pedido, o Android está a bloquear a apresentação deste grupo de notificações neste dispositivo."</string>
<string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Outra"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3555,31 +3600,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos de definições rápidas do programador"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos disponíveis 24 horas por dia, 7 dias por semana"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos disponíveis 24 horas por dia, 7 dias por semana"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"A nossa equipa de apoio técnico está disponível para ajudar a resolver qualquer problema"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"A nossa equipa de apoio técnico está disponível o dia todo, todos os dias"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Pesquise na ajuda ou contacte-nos mais tarde, durante o horário de funcionamento do apoio técnico (hora local):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Horário de atendimento telefónico (hora local)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Procure ajuda ou explore sugestões e truques"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Compatibilidade para:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Vai viajar para o estrangeiro?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Podem aplicar-se custos internacionais"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telemóvel"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Mensagem de chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorar sugestões e dicas"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Procurar ajuda e enviar comentários"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contactar o apoio técnico"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Iniciar sessão"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Não consegue iniciar sessão?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar informações do sistema"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Não mostrar novamente"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"A solicitar como"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Adicionar conta"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Informações do sistema"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Window Trace"</string>
+ <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Layer Trace"</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>
@@ -3595,11 +3617,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
<item quantity="one">1 segundo</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo de espera de ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gerir o armazenamento"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para ajudar a libertar espaço de armazenamento, o gestor de armazenamento remove cópias de segurança de fotos e vídeos do dispositivo."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remover fotos e vídeos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestor de armazenamento"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Utilizar o Gestor de armazenamento"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libertar espaço agora"</string>
@@ -3765,8 +3787,8 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
- <skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <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="storage_access" msgid="8905018810338984531">"Acesso ao armazenamento"</string>
+ <string name="keywords_storage_access" msgid="3708874088152933579">"acesso ao armazenamento diretório limitado"</string>
</resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 3c5a7ca..0368567 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Pressione o botão"</item>
<item msgid="1624323946324499595">"PIN do dispositivo pareado"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"Uma hora"</item>
<item msgid="5198271470953124739">"Nunca definir tempo limite"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (padrão)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Ruim"</item>
<item msgid="2042505933058940139">"Fraca"</item>
@@ -386,7 +402,7 @@
</string-array>
<string-array name="captioning_font_size_selector_titles">
<item msgid="4800919809575254054">"Muito pequeno"</item>
- <item msgid="6781094565687692782">"Pequena"</item>
+ <item msgid="6781094565687692782">"Pequeno"</item>
<item msgid="8222123259497646551">"Normal"</item>
<item msgid="5813217276778560466">"Grande"</item>
<item msgid="9044232017390975191">"Muito grande"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Com mais de 60 dias"</item>
<item msgid="5692284879054004388">"Com mais de 90 dias"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Usar preferência de rede"</item>
+ <item msgid="8745603368609022803">"Tratar como limitada"</item>
+ <item msgid="2266114985518865625">"Tratar como ilimitada"</item>
+ </string-array>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9c2a2f7..855d5a8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permitir que o dispositivo pareie e se conecte a dispositivos Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Desativar o toque em banda"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Não reproduzir toques de telefone personalizados em fones de ouvido Bluetooth"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Classificar em ordem alfabética"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Classificar por fuso horário"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"O <xliff:g id="TIME_TYPE">%1$s</xliff:g> começa em: <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Horário de verão"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Horário padrão"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Fuso horário por região"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fusos horários com diferença fixa"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
<string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Mensagem na tela de bloqueio"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Ativar widgets"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desativada pelo administrador"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Mostrar opção de bloqueio total"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Exibe a opção do botão liga/desliga que desativa a extensão de acesso e o desbloqueio com impressão digital."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Nenhuma"</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">"por exemplo, Android do João."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Usar local"</string>
<string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Segurança e local"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
@@ -459,9 +469,11 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"A senha digitada está correta, mas os dados estão corrompidos. \n\nPara retomar o uso do seu tablet, é necessário redefinir para as configurações originais. Quando você configurar seu tablet após a redefinição, poderá restaurar todos os dados que foram salvos em backup na sua Conta do Google."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"A senha digitada está correta, mas os dados estão corrompidos. \n\nPara retomar o uso do seu smartphone, é necessário redefinir para as configurações originais. Quando você configurar seu smartphone após a redefinição, poderá restaurar todos os dados que foram salvos em backup na sua Conta do Google."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Alterar o método de entrada"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Configurar o bloqueio de tela"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Proteger seu dispositivo"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Usar impressão digital"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Defin. bloq. de tela por segurança"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Impede que outras pessoas usem seu tablet"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Impede que outras pessoas usem seu dispositivo"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Impede que outras pessoas usem seu smartphone"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Desbloqueio com impressão digital"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear com sua impressão digital"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloqueio de tela"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Escolher bloq de trab."</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e mídia"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Número máximo de dispositivos de áudio Bluetooth conectados"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecione o número máximo de dispositivos de áudio Bluetooth conectados"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmitir"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar tela sem fio"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo próximo encontrado."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Fazer login"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> quer ativar o Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> quer desativar o Wi-Fi"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar o Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Usar Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Configurações de Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerenciar pontos de acesso sem fio"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Senha"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar senha"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecionar banda de AP"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Configurações de IP"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi‑Fi de operadora"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado.\n\nPermitir isto para todos os apps que quiserem verificar?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar esta opção, vá para \"Avançado\" no menu flutuante."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -909,10 +926,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de AP"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Use o ponto de acesso para criar uma rede Wi‑Fi para outros dispositivos. O ponto de acesso fornece Internet usando sua conexão de dados móveis. Pode haver cobrança adicional para dados móveis."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Os apps podem criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Desativar ponto de acesso automaticamente"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"O ponto de acesso Wi‑Fi será desativado se nenhum dispositivo for conectado"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Ativando o ponto de acesso..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Desativando o ponto de acesso..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"A rede <xliff:g id="NETWORK_SSID">%1$s</xliff:g> está ativa"</string>
@@ -923,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Ponto de acesso Android"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Chamadas por Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Ativar chamada no Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Usar o Wi-Fi em vez da rede móvel"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Amplie a cobertura fazendo uma chamada com o Wi-Fi"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferência de chamadas"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de chamada por Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Preferências de roaming"</string>
@@ -961,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Endereço de emergência"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Usado como seu local quando você faz uma chamada de emergência usando o Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saiba mais"</annotation>" sobre recursos de DNS particular"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
<string name="sound_settings" msgid="5534671337768745343">"Som"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1175,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Tipo de rede móvel"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Informações da operadora"</string>
<string name="status_data_state" msgid="5503181397066522950">"Estado da rede móvel"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Estado do serviço"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Potência do sinal"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -1308,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Seu novo <xliff:g id="NAME">^1</xliff:g> está funcionando. \n\nPara mover fotos, arquivos e dados de apps para este dispositivo, vá para \"Config.\" > \"Armazenamento\"."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"A transferência de <xliff:g id="APP">^1</xliff:g> e seus dados para <xliff:g id="NAME_0">^2</xliff:g> levará apenas alguns momentos. Você não conseguirá usar o app até que a transferência seja concluída. \n\nNão remova o <xliff:g id="NAME_1">^2</xliff:g> durante a transferência."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Para mover os dados é necessário desbloquear o usuário <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Movendo <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Não remova o <xliff:g id="NAME">^1</xliff:g> durante a transferência. \n\nO app <xliff:g id="APP">^2</xliff:g> deste dispositivo não ficará disponível até a conclusão da transferência."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferência"</string>
@@ -1360,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"A rede, os apps ou o dispositivo podem ser redefinidos"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Redefinir Wi-Fi, rede móvel e Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Isso redefinirá todas as configurações de rede, inclusive:\n\n"<li>"Wi‑Fi"</li>\n<li>"dados móveis"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Também redefinir eSIMs"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Limpa todos os eSIMs no smartphone. Você precisará entrar em contato com a operadora para fazer o download deles novamente. Essa opção não cancela seu plano de serviços móveis."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Redefinir configurações"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Redefinir todas as configurações de rede? Não é possível desfazer esta ação."</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Redefinir configurações"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Redefinir?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"A redefinição da rede não está disponível para esse usuário"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"As configurações de rede foram redefinidas"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Não é possível redefinir os eSIMs"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Não é possível redefinir os eSIMs devido a um erro."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Limpar todos os dados (redefinição para configuração original)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadoras no eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMs"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Essa ação não cancelará seu plano de serviços móveis."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
@@ -1432,21 +1454,12 @@
<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>
- <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economia de bateria"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Somente no dispositivo"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Local desativado"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Permissões no nível do app"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitações recentes"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhum app solicitou a localização recentemente"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Serviços de localização"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Uso da bateria elevado"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Uso da bateria reduzido"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usar GPS, Wi‑Fi, Bluetooth ou redes móveis para determinar a localização"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usar Wi-Fi, Bluetooth ou redes móveis para determinar a localização"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Usar GPS e sensores do dispositivo para determinar a localização"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Verificação"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Verificação de Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Melhore a localização permitindo que apps e serviços do sistema detectem redes Wi-Fi a qualquer momento."</string>
@@ -1468,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Fontes de localização"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Sobre o tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Sobre o dispositivo"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Sobre o dispositivo"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Sobre o dispositivo emulado"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Ver informações legais, status, versão do software"</string>
<string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
@@ -1575,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Ver todos os <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Seu tablet e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu tablet ou pela perda de dados que possa resultar do uso desses apps."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Seu smartphone e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu smartphone ou pela perda de dados que possa resultar do uso desses apps."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Seus dados pessoais e do seu dispositivo são mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu dispositivo ou pela perda de dados que possa resultar do uso desses apps."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Ativa mais opções de configuração"</string>
<string name="application_info_label" msgid="5736524913065714880">"Informações do app"</string>
@@ -1874,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar após parada do ponteiro"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes do clique"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"ATIVAR"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVAR"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar em \"Configurações rápidas\""</string>
@@ -1987,7 +2005,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> restantes"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> até carregar"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Atividade em segundo plano"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Restrito"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Permitir que o app seja executado em segundo plano"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"O app pode ser executado em segundo plano quando não está em uso"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"A atividade em segundo plano do app é limitada quando ele não está em uso"</string>
@@ -2030,14 +2048,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"A bateria está em boas condições"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Os apps estão se comportando normalmente"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Baixa capacidade de bateria"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"A bateria não pode oferecer uma boa duração"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Ativar o gerenciador de bateria inteligente"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Ative para otimizar o uso da bateria"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Ativar o modo Bateria fraca"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Aumentar a duração da bateria"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"O modo Bateria fraca está ativado"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Alguns recursos são limitados"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"O smartphone foi muito usado"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"O tablet foi muito usado"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"O dispositivo foi muito usado"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Cerca de <xliff:g id="HOUR">%1$s</xliff:g> de uso desde a última carga completa"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Seu smartphone foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O smartphone foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Seu tablet foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O tablet foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Seu dispositivo foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O dispositivo foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gerenciador de bateria inteligente"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Gerenciar bateria automaticamente"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Ajuste automaticamente o consumo de energia de apps com base no uso"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Apps restritos"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d app</item>
+ <item quantity="other">%1$d apps</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Parar o app?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Não é possível gerenciar a bateria do smartphone normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Não é possível gerenciar a bateria do tablet normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
@@ -2146,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de mídia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Otimização do app"</string>
<string name="battery_saver" msgid="8172485772238572153">"Economia de bateria"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Usar a Economia de bateria"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ativar automaticamente"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"com <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
@@ -2333,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"A sincronização está enfrentando problemas no momento. Ela retornará em breve."</string>
<string name="add_account_label" msgid="7811707265834013767">"Adicionar conta"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Perfil de trabalho ainda indisponível"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Modo trabalho"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Permitir que o perfil de trabalho funcione, incluindo apps, sincronização em segundo plano e recursos relacionados"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Perfil de trabalho"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Gerenciados pela sua organização"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Os apps e as notificações estão desativados"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Remover perfil de trabalho"</string>
<string name="background_data" msgid="5779592891375473817">"Dados de segundo plano"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Aplicat. sincronizam, enviam e recebem dados a qualquer hora"</string>
@@ -2366,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Remover conta?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"A remoção desta conta excluirá todas as suas mensagens, contatos e outros dados do tablet."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"A remoção desta conta excluirá todas as suas mensagens, contatos e outros dados do telefone!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"A remoção desta conta excluirá do dispositivo todas as mensagens, os contatos e outros dados dela."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Esta alteração não é permitida pelo administrador"</string>
<string name="provider_label" msgid="7724593781904508866">"Enviar inscrições"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2622,8 @@
<item quantity="one">Verificar certificados</item>
<item quantity="other">Verificar certificados</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Usuários"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Usuários e perfis"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adicionar usuário ou perfil"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar usuário"</string>
@@ -2774,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, transmissão"</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="account_dashboard_title" msgid="4936890821712178853">"Usuários e contas"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Apps padrão"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, horário, backup e atualizações"</string>
<string name="search_results_title" msgid="1796252422574886932">"Configurações"</string>
@@ -2805,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"não perturbe, interromper, interrupção"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"proximidades, local, histórico, relatório"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"precisão"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
<string name="keywords_users" msgid="3434190133131387942">"restrição, restringir, restrito"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"correção de texto, corrigir, som, vibrar, automático, idioma, gesto, sugerir, sugestão, tema, ofensivo, palavra, digitar, emoticons, internacional"</string>
@@ -2872,6 +2911,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regras</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Não perturbe"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Ativar o \"Não perturbe\""</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportamento"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permitir sons e vibrações de"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Sem som"</string>
@@ -2881,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Ativar automaticamente"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Regras automáticas"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Regra automática"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir regras de Não perturbe"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitar som e vibrar eventualmente"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Silenciar smartphone em horários específicos"</string>
+ <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"Definir regras do modo \"Não perturbe\""</string>
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Usar regra"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Somente prioridade"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Somente alarmes"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silêncio total"</string>
@@ -2890,12 +2931,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear perturbações visuais"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Adicionar"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ATIVAR AGORA"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESATIVAR AGORA"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Ativar"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Ativar agora"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desativar agora"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"O modo \"Não perturbe\" fica ativado até <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"O modo \"Não perturbe\" ficará ativado até que você o desative"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"O modo \"Não perturbe\" foi ativado automaticamente por uma regra (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"O modo \"Não perturbe\" foi ativado automaticamente por um app (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Somente prioridade"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de trabalho"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Usar sons do perfil pessoal"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Os sons são os mesmos para os perfis pessoal e de trabalho"</string>
@@ -2911,6 +2955,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Toques"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Outros sons e vibrações"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Enviadas recentemente"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avançadas"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Permitir pontos de notificação"</string>
@@ -2930,7 +2975,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Categoria da notificação"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoria de notificações"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Comportamento"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Sem som ou interrupção visual"</string>
@@ -2948,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância elevada"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Importância urgente"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Mostrar notificações"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificação"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
@@ -2978,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"O Android está impedindo que esse grupo de notificações seja exibido neste dispositivo"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Conforme sua solicitação, o Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Conforme sua solicitação, o Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Conforme sua solicitação, o Android está impedindo que esse grupo de notificações seja exibido neste dispositivo"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Outros"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo sua senha antes da inicialização. O dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes, até que ele seja iniciado.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar senha para iniciar o dispositivo?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sim"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Não"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Sim"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Não"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exigir PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Exigir padrão?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Exigir senha?"</string>
@@ -3397,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Usuário atual: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Conectado como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> é padrão"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ATIVADA / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"DESATIVADA"</string>
<string name="backup_disabled" msgid="485189128759595412">"Backup desativado"</string>
<string name="about_summary" msgid="924181828102801010">"Atualizado para o Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3407,6 +3456,7 @@
<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="6346948990624612516">"Não é possível desativar os backups"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Essa ação foi desativada. Para saber mais, entre em contato com o administrador. da sua organização."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Mais detalhes"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Seu administrador pode monitorar e gerenciar apps e dados associados ao seu perfil de trabalho, incluindo configurações, permissões, acesso corporativo, atividade de rede e informações de local do dispositivo."</string>
@@ -3430,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabalho desativado"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Os apps, a sincronização em segundo plano e outros recursos relacionados com seu perfil de trabalho estão desativados."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Definir programação do Modo noturno"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tingir tela de âmbar p/ ajudar você a pegar no sono"</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>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Sugestões para você"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Sugestões"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"Mais <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3537,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"Nenhum"</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>
@@ -3559,31 +3612,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Blocos de desenvolvedor para configurações rápidas"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos aqui para ajudar você 24 horas por dia, 7 dias por semana"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos aqui para ajudar você 24 horas por dia, 7 dias por semana"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Nossa equipe de suporte está aqui para ajudar a resolver qualquer problema"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nossa equipe de suporte está disponível o dia todo, todos os dias"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Procure ajuda ou volte durante o horário de suporte (hora local):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Horário do suporte por telefone (hora local)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Procure ajuda ou explore dicas e truques"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Suporte para:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Está no exterior?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Tarifas internacionais podem ser aplicadas"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefone"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Bate-papo"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Conferir dicas e truques"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Procurar ajuda e enviar feedback"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Entre em contato com o suporte"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Fazer login"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Não consegue fazer login?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar informações do sistema"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Não mostrar novamente"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Solicitando como"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Adicionar conta"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Informações do sistema"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Rastros da janela"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Rastros de superfície"</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>
@@ -3599,11 +3629,11 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo aproximado de espera: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gerenciar armazenamento"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para ajudar a liberar espaço de armazenamento, o gerenciador de armazenamento remove fotos e vídeos do seu dispositivo salvos em backup."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remover fotos e vídeos"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gerenciador de armazenamento"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Usar gerenciador de armazenamento"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Modo automático"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Modo manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espaço agora"</string>
@@ -3614,32 +3644,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Ir para a câmera"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir a câmera rapidamente, pressione o botão liga/desliga duas vezes. O recurso funciona em qualquer tela."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Abrir a câmera rapidamente"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Pressione o botão liga/desliga duas vezes p/ abrir a câmera"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Virar câmera"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Tirar selfies com mais rapidez"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Girar duas vezes o smartphone para abrir o modo selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Girar duas vezes o tablet para abrir o modo selfie"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Girar duas vezes o dispositivo para abrir o modo selfie"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Verificar as notificações quando a tela estiver desligada"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Verificar as notificações quando a tela estiver desligada"</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">"Deslizar imp. 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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do tablet."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do dispositivo."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ver notificações rapidamente"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Deslize para baixo no sensor de impressão digital"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Ativado"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Desativado"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O bootloader já está desbloqueado"</string>
@@ -3769,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Acesso ao diretório"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"acesso ao diretório"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"Meu smartphone"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"Meu tablet"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"Meu dispositivo"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Conta"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nome do dispositivo"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar Bluetooth ao dirigir"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Ativar Bluetooth automaticamente ao dirigir"</string>
</resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index d091d83..9ab2548 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Buton WPS"</item>
<item msgid="1624323946324499595">"Codul PIN de la disp. pereche"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 oră"</item>
<item msgid="5198271470953124739">"Fără timp limită"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (prestabilit)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Slab"</item>
<item msgid="2042505933058940139">"Slab"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Vechi de peste 60 de zile"</item>
<item msgid="5692284879054004388">"Vechi de peste 90 de zile"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Folosiți preferința de rețea"</item>
+ <item msgid="8745603368609022803">"Tratați ca fiind contorizată"</item>
+ <item msgid="2266114985518865625">"Tratați ca fiind necontorizată"</item>
+ </string-array>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1a8fbd4..749d832 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -171,6 +171,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dispozitivele dvs."</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Asociați un nou dispozitiv"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permiteți dispozitivului să se asocieze și să se conecteze la dispozitive Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Dezactivați soneria în căști"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Nu redați tonurile de sonerie personalizate ale telefonului prin căștile Bluetooth"</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>
@@ -332,6 +334,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Setați data"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortați în ordine alfabetică"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortați după fusul orar"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> începe pe <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Ora de vară"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Ora standard"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Fusul orar după regiune"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fusuri orare cu decalaj fix"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
<string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Blocare automată"</string>
@@ -342,6 +349,8 @@
<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_summary" msgid="8678086272188880615">"Afișați opțiunea butonului de pornire care oprește accesul extins și deblocarea cu amprentă."</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>
<string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"De ex., dispozitivul Android al lui Andrei."</string>
@@ -350,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informații de profil"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Conturi"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Locație"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Utilizați locația"</string>
<string name="account_settings_title" msgid="626177544686329806">"Conturi"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Securitate și locație"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptare și date de conectare"</string>
@@ -462,9 +472,11 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea tabletei, trebuie să reveniți la setările din fabrică. Când vă configurați tableta după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea telefonului, trebuie să reveniți la setările din fabrică. Când vă configurați telefonul după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Comutați metoda de introducere"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Configurați blocarea ecranului"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protejați dispozitivul"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Folosiți amprenta"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Setați blocarea ecranului"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Împiedicați alte persoane să vă folosească tableta"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Împiedicați alte persoane să vă folosească dispozitivul"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Împiedicați alte persoane să vă folosească telefonul"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Deblocați cu amprenta"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Deblocați folosind amprenta"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeți blocarea ecranului"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Alegeți blocarea pentru serviciu"</string>
@@ -702,6 +714,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ca difuzor"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pentru muzică și fișiere media"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Rețineți setările"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Numărul maxim de dispozitive audio Bluetooth conectate"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selectați numărul maxim de dispozitive audio Bluetooth conectate"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Proiectare"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activați ecranul wireless"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nu s-au găsit dispozitive în apropiere."</string>
@@ -716,6 +730,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nume"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Conectați-vă"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> încearcă să activeze Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> încearcă să dezactiveze Wi-Fi"</string>
@@ -733,6 +748,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activați conexiunea Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Utilizați Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Setări Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Configurați și gestionați punctele de acces wireless"</string>
@@ -827,6 +843,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Parolă"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Afișați parola"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selectați banda AP"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automat"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Setări IP"</string>
@@ -844,7 +861,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibil)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduceți parola de rețea"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Rețeaua Wi‑Fi a operatorului"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectați-vă prin <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectați-vă prin <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pentru a îmbunătăți precizia locației, precum și pentru alte scopuri, <xliff:g id="APP_NAME">%1$s</xliff:g> solicită permisiunea să activeze scanarea rețelelor, chiar și atunci când rețeaua Wi-Fi este dezactivată.\n\nPermiteți acest lucru pentru toate aplicațiile care solicită scanarea?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Pentru a dezactiva, accesați Avansat din meniul suplimentar."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permiteți"</string>
@@ -921,10 +938,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Folosiți hotspotul pentru a crea o rețea Wi-Fi pentru celelalte dispozitive. Hotspotul oferă o conexiune de internet folosind conexiunea dvs. de date mobile. Este posibil să se aplice taxe suplimentare pentru datele mobile."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplicațiile pot crea un hotspot pentru a trimite conținut dispozitivelor din apropiere."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Dezactivați automat hotspotul"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Hotspotul Wi-Fi se va dezactiva dacă nu se conectează niciun dispozitiv"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Se activează hotspotul..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Se dezactivează hotspotul..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> este activ"</string>
@@ -935,7 +950,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Apelare prin Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activați Apelarea prin Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Folosiți rețeaua Wi-Fi în loc de rețeaua mobilă"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Extindeți acoperirea apelând prin Wi-Fi"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferință pentru apelare"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modul Apelare prin Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Preferințe privind roamingul"</string>
@@ -973,6 +988,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Adresă de urgență"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Folosită ca locație când efectuați un apel de urgență prin Wi-Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Aflați mai multe"</annotation>" despre funcțiile DNS-ului privat"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Afișaj"</string>
<string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -1188,6 +1204,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Tip de rețea mobilă"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Informații operator"</string>
<string name="status_data_state" msgid="5503181397066522950">"Starea rețelei mobile"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Starea acoperirii"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Putere semnal"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -1321,6 +1338,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Noul <xliff:g id="NAME">^1</xliff:g> funcționează. \n\nPentru a muta fotografii, fișiere și datele aplicațiilor pe acest dispozitiv, accesați Setări > Stocare."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mutați <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Va dura doar câteva momente să mutați <xliff:g id="APP">^1</xliff:g> și datele acesteia pe <xliff:g id="NAME_0">^2</xliff:g>. Nu veți putea folosi aplicația până când mutarea nu este finalizată. \n\nNu scoateți <xliff:g id="NAME_1">^2</xliff:g> în timpul procesului de mutare."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Pentru a muta datele, trebuie să deblocați utilizatorul <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Se mută <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Nu scoateți <xliff:g id="NAME">^1</xliff:g> în timpul procesului de mutare. \n\nAplicația <xliff:g id="APP">^2</xliff:g> de pe acest dispozitiv nu va fi disponibilă până când mutarea nu este finalizată."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Anulați mutarea"</string>
@@ -1373,19 +1391,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Rețeaua, aplicațiile sau dispozitivul pot fi resetate"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Resetați conexiunea Wi-Fi, conexiunea mobilă și prin Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Astfel, toate setările pentru rețea vor fi reinițializate, inclusiv:\n\n"<li>"Wi‑Fi,"</li>\n<li>"date mobile,"</li>\n<li>"Bluetooth."</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"De asemenea, resetați cardurile eSIM"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Ștergeți toate cardurile eSIM de pe telefon. Va trebui să contactați operatorul pentru a descărca din nou cardurile eSIM. Prin această acțiune nu vă veți anula planul de servicii mobile."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Resetați setările"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Reinițializați toate setările pentru rețea? Nu puteți anula această acțiune!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Resetați setările"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetați?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Resetarea rețelei nu este disponibilă pentru acest utilizator"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Setările pentru rețea au fost reinițializate"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Cardurile eSIM nu se pot reseta"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Cardurile eSIM nu pot fi resetate din cauza unei erori."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Ștergeți toate datele (reveniți la setările din fabrică)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a tabletei dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele și setările sistemului și ale aplicațiilor;"</li>\n<li>"aplicațiile descărcate;"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele și setările sistemului și ale aplicațiilor;"</li>\n<li>"aplicațiile descărcate;"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteți conectat(ă) la următoarele conturi:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Pe acest dispozitiv sunt prezenți și alți utilizatori.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică;"</li>\n<li>"Fotografii;"</li>\n<li>"Alte date ale utilizatorului."</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatori pe eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"Carduri eSIM"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Planul dvs. de servicii mobile nu va fi anulat astfel."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ștearsă."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie șters."</string>
@@ -1445,21 +1467,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conectați-vă la internet"</string>
<string name="location_title" msgid="1029961368397484576">"Locația mea"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Locație pt. profil de serviciu"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Precizie ridicată"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economisirea bateriei"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Numai cu dispozitivul"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Locație dezactivată"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Permisiuni la nivel de aplic."</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitări recente ale locației"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Nicio aplicație nu a solicitat locația recent"</string>
<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_mode_screen_title" msgid="4528716772270246542">"Mod de localizare"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utilizați GPS, Wi-Fi, Bluetooth sau rețelele mobile pentru determinarea locației"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utilizați Wi-Fi, Bluetooth sau rețelele mobile pentru determinarea locației"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Folosiți GPS-ul și senzorii dispozitivului pentru a determina locația"</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_wifi_always_scanning_description" msgid="8036382029606868081">"Îmbunătățiți localizarea permițând aplicațiilor și serviciilor de sistem să detecteze rețelele Wi-Fi oricând."</string>
@@ -1481,6 +1494,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Surse de locații"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Despre tabletă"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Despre telefon"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Despre dispozitiv"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Despre dispozitivul emulat"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Afișați informații legale, starea și versiunea programului software"</string>
<string name="legal_information" msgid="5769301644270604095">"Informații de ordin juridic"</string>
@@ -1588,6 +1602,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Afișați toate cele <xliff:g id="COUNT">%1$d</xliff:g> aplicații"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tableta și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor necunoscute. Dacă instalați aplicații din această sursă, acceptați că sunteți singura persoană responsabilă pentru deteriorarea tabletei sau pentru pierderea datelor, care pot avea loc în urma utilizării acestor aplicații."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonul și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor necunoscute. Dacă instalați aplicații din această sursă, acceptați că sunteți singura persoană responsabilă pentru deteriorarea telefonului sau pentru pierderea datelor, care pot avea loc în urma utilizării acestor aplicații."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Dispozitivul și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor necunoscute. Dacă instalați aplicații din această sursă, acceptați că sunteți singura persoană responsabilă pentru deteriorarea dispozitivului sau pentru pierderea datelor, care pot avea loc în urma utilizării acestor aplicații."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Setări avansate"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Activați mai multe opțiuni pentru setări"</string>
<string name="application_info_label" msgid="5736524913065714880">"Informații despre aplicație"</string>
@@ -1888,6 +1903,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Poate afecta performanța"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic după ce cursorul a încetat să se mai miște"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Întârziere înainte de clic"</string>
+ <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ția de culoare"</string>
+ <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilizați subtitrările"</string>
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVAT"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DEZACTIVAT"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Afișați în Setări rapide"</string>
@@ -2008,7 +2026,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">"Timp rămas: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> până la finalizarea încărcării"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Activitate de fundal"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Restricționat"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Permiteți aplicației să ruleze în fundal"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Aplicația poate rula în fundal când nu este folosită"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Activitatea de fundal a aplicației este limitată când aceasta nu este folosită"</string>
@@ -2051,14 +2069,32 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Bateria este în stare bună"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplicațiile au un comportament normal"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Capacitate redusă a bateriei"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateria nu poate asigura o autonomie bună"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Activați gestionarea inteligentă a bateriei"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Activați pentru a optimiza utilizarea bateriei"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Activați modul Baterie descărcată"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Prelungiți durata de viață a bateriei"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Modul Baterie descărcată este pornit"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Unele funcții sunt limitate"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefonul a fost utilizat intens"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tableta a fost utilizată intens"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Dispozitivul a fost utilizat intens"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"A fost folosit timp de aproximativ <xliff:g id="HOUR">%1$s</xliff:g> de la ultima încărcare completă"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Din cauza utilizării intense a telefonului, s-a consumat multă baterie. Bateria are un comportament normal.\n\n Telefonul a fost folosit timp de aproximativ <xliff:g id="HOUR">%1$s</xliff:g> de la ultima încărcare completă.\n\n Utilizare totală:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Din cauza utilizării intense a tabletei, s-a consumat multă baterie. Bateria are un comportament normal.\n\n Tableta a fost folosită timp de aproximativ <xliff:g id="HOUR">%1$s</xliff:g> de la ultima încărcare completă.\n\n Utilizare totală:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Din cauza utilizării intense a dispozitivului, s-a consumat multă baterie. Bateria are un comportament normal.\n\n Dispozitivul a fost folosit timp de aproximativ <xliff:g id="HOUR">%1$s</xliff:g> de la ultima încărcare completă.\n\n Utilizare totală:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gestionare inteligentă a bateriei"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Gestionare automată a bateriei"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Ajustați automat consumul de energie al aplicațiilor în funcție de utilizare"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Aplicații restricționate"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="few">%1$d aplicații</item>
+ <item quantity="other">%1$d de aplicații</item>
+ <item quantity="one">%1$d aplicație</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Opriți aplicația?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefonul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> păstrează telefonul activ.\n\nCa să remediați problema, puteți să opriți aplicația.\n\nDacă problema persistă, poate fi necesar să dezinstalați aplicația pentru a îmbunătăți performanța bateriei."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tableta dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> păstrează tableta activă.\n\nCa să remediați problema, puteți să opriți aplicația.\n\nDacă problema persistă, poate fi necesar să dezinstalați aplicația pentru a îmbunătăți performanța bateriei."</string>
@@ -2167,6 +2203,7 @@
<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_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_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>
@@ -2354,8 +2391,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Sincronizarea se confruntă în prezent cu probleme. Aceasta va fi funcțională în curând."</string>
<string name="add_account_label" msgid="7811707265834013767">"Adăugați un cont"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Profilul de serviciu nu este încă disponibil"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Modul de serviciu"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Permiteți profilului de serviciu să funcționeze, inclusiv aplicațiile, sincronizarea în fundal și funcțiile asociate"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Profil de serviciu"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Gestionat de organizația dvs."</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Aplicațiile și notificările sunt dezactivate"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Eliminați profilul de serviciu"</string>
<string name="background_data" msgid="5779592891375473817">"Date de fundal"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Aplicațiile pot oricând sincroniza, trimite și primi date"</string>
@@ -2387,6 +2425,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Eliminați contul?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Prin eliminarea acestui cont, se vor șterge toate mesajele și persoanele din agendă pe care le conține, precum și alte date de pe tabletă!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Prin eliminarea acestui cont, se vor șterge toate mesajele și persoanele din agendă pe care le conține, precum și alte date de pe telefon!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Prin eliminarea acestui cont, se vor șterge toate mesajele și persoanele de contact pe care le conține, precum și alte date de pe dispozitiv!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Această modificare nu este permisă de administratorul dvs."</string>
<string name="provider_label" msgid="7724593781904508866">"Abonamente de tip push"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2609,7 +2648,8 @@
<item quantity="other">Verificați certificatele</item>
<item quantity="one">Verificați certificatul</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Utilizatori"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Utilizatori și profiluri"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adăugați un utilizator/un profil"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Adăugați un utilizator"</string>
@@ -2800,7 +2840,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</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="account_dashboard_title" msgid="4936890821712178853">"Utilizatori și conturi"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2831,7 +2872,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"nu deranja, întrerupe, întrerupere, pauză"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"în apropiere, locație, istoric, raportare"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"precizie"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"cont"</string>
<string name="keywords_users" msgid="3434190133131387942">"restricție, restricționare, restricționat"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"corectarea textului, corectați, sunet, vibrații, automat, limbă, gest, sugerați, sugestie, temă, cuvânt, ofensator, introducere text, emoji, internațional"</string>
@@ -2899,6 +2939,7 @@
<item quantity="one">O regulă</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Nu deranja"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Activați Nu deranja"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportament"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permiteți sunete și vibrații de la"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Fără sunet"</string>
@@ -2908,8 +2949,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Activați automat"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Reguli automate"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Regulă automată"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Setați regulile pentru Nu deranja"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitați sunetele și vibrațiile uneori"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Dezactivați sunetul uneori"</string>
+ <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"Setați regulile pentru Nu deranja"</string>
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Folosiți regula"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Numai cu prioritate"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Numai alarme"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Niciun sunet"</string>
@@ -2917,12 +2959,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blocați întreruperile vizuale"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permiteți semnale vizuale"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Adăugați"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ACTIVAȚI ACUM"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DEZACTIVAȚI ACUM"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Activați"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Activați acum"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Dezactivați acum"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Funcția Nu deranja este activată până la <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Funcția Nu deranja rămâne activă până când o dezactivați"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Funcția Nu deranja a fost activată automat de o regulă (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Funcția Nu deranja a fost activată automat de o aplicație (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Numai cu prioritate"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Sunetele profilului de serviciu"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Folosiți sunetele profilului personal"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sunetele profilului de serviciu sunt aceleași ca la profilul personal"</string>
@@ -2938,6 +2983,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Tonuri de sonerie"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Alte sunete și vibrații"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificări"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Trimise recent"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avansate"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificări profil de serviciu"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Permiteți puncte de notificare"</string>
@@ -2957,7 +3003,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Notificări din aplicații"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Categoria notificării"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Grupul categoriei de notificări"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Importanță"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Comportament"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Permiteți sunetul"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Nu afișați niciodată notificările"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Fără sunet sau întrerupere vizuală"</string>
@@ -2975,6 +3021,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Importanță medie"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Importanță ridicată"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Importanță urgentă"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Afișați notificările"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Asistent pentru notificări"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Acces la notificări"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Accesul la notificările privind profilul de serviciu este blocat"</string>
@@ -3006,9 +3053,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Acces la funcția Nu deranja"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Nicio aplicație instalată nu a solicitat accesul Nu deranja"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blochează notificările acestei aplicații pe acest dispozitiv"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blochează această categorie de notificări pe acest dispozitiv"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blochează acest grup de notificări pe dispozitiv"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"La solicitarea dvs., Android blochează notificările acestei aplicații pe dispozitiv"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"La solicitarea dvs., Android blochează această categorie de notificări pe dispozitiv"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"La solicitarea dvs., Android blochează acest grup de notificări pe dispozitiv"</string>
<string name="notification_channels" msgid="5346841743182627500">"Categorii"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Altele"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3158,6 +3205,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"În plus față de folosirea amprentei pentru deblocarea dispozitivului, puteți să protejați și mai bine dispozitivul setând solicitarea parolei înainte de pornire. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări, inclusiv alarme, înainte ca acesta să pornească.\n\nAstfel, datele sunt protejate pe dispozitivele pierdute sau furate. Doriți să se solicite o parolă pentru pornirea dispozitivului?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Nu"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Da"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Nu"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Solicitați codul PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Solicitați modelul?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Solicitați parola?"</string>
@@ -3438,7 +3487,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Utilizator actual: <xliff:g id="USER_NAME">%1$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>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> este prestabilită"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ACTIVATĂ/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"DEZACTIVATĂ"</string>
<string name="backup_disabled" msgid="485189128759595412">"Backupul este dezactivat"</string>
<string name="about_summary" msgid="924181828102801010">"Actualizat la Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3448,6 +3498,7 @@
<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="6346948990624612516">"Nu se pot dezactiva backupurile"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Această acțiune este dezactivată. Pentru a afla mai multe, contactați administratorul organizației dvs."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Mai multe detalii"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Administratorul poate să monitorizeze și să gestioneze aplicațiile și datele asociate profilului de serviciu, inclusiv setările, permisiunile, accesul la nivelul companiei, activitatea în rețea și informațiile despre locația dispozitivului."</string>
@@ -3471,9 +3522,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Profil de serviciu dezactivat"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Aplicațiile, sincronizarea în fundal și alte funcții asociate profilului de serviciu sunt dezactivate."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Setați programul pe Lumină de noapte"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Colorați ecranul chihlimbar pentru a adormi mai ușor"</string>
+ <string name="night_display_suggestion_summary" msgid="228346372178218442">"Setați colorarea automată a ecranului în fiecare seară"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"Lumina de noapte este activată"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Ecranul are o tentă de chihlimbar. Acest lucru vă poate ajuta să adormiți."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Sugerate pentru dvs."</string>
<string name="suggestions_title" msgid="7280792342273268377">"Sugestii"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+ încă <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3582,6 +3634,8 @@
<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_none" msgid="5144174674654097316">"Niciuna"</string>
<string name="special_access" msgid="3458780842491881155">"Acces special pentru 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>
@@ -3605,31 +3659,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Casete dezvoltator pentru setări rapide"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Suntem aici pentru a vă ajuta"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Vă stăm la dispoziție non-stop"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Vă stăm la dispoziție non-stop"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Echipa de asistență vă stă la dispoziție pentru a se ocupa de orice problemă"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Echipa de asistență este disponibilă non-stop"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Căutați ajutor sau reveniți în timpul programului de lucru al echipei de asistență (ora locală):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Programul de lucru pentru asistența telefonică (ora locală)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Căutați în secțiunea de ajutor sau explorați sfaturi și trucuri"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Asistență pentru:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Călătoriți în străinătate?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Se pot aplica taxe internaționale"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorați sfaturi și trucuri"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Căutați ajutor și trimiteți feedback"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contactați asistența"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Conectați-vă"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Nu vă puteți conecta?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Trimiteți informațiile despre sistem"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Nu mai afișa"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Solicitarea se trimite din contul"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Adăugați un cont"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Informații de sistem"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Urmărirea ferestrei"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Trasarea suprafeței"</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>
@@ -3648,11 +3679,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> de secunde</item>
<item quantity="one">O secundă</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Așteptare: aproximativ <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gestionați spațiul de stocare"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Pentru a elibera spațiu de stocare, managerul spațiului de stocare elimină de pe dispozitiv fotografiile și videoclipurile cărora le-ați făcut backup."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Eliminați fotografii și videoclipuri"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Managerul spațiului de stocare"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Utilizați Managerul spațiului de stocare"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automat"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuale"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Eliberați spațiu acum"</string>
@@ -3663,32 +3694,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accesați camera foto"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pentru a deschide rapid camera foto, apăsați de două ori butonul de pornire. Funcționează de pe orice ecran."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Deschideți rapid camera foto"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Deschideți camera foto apăsând butonul de pornire de 2 ori"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Comutați camera foto"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Faceți autoportrete mai rapid"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Răsuciți de două ori telefonul pentru modul autoportret"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Răsuciți de două ori tableta pentru modul autoportret"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Răsuciți de două ori dispozitivul pentru modul autoportret"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Verificați notificările când ecranul este inactiv"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Verificați notificările când ecranul este inactiv"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Pentru a verifica notificările, glisați în jos pe senzorul de amprentă de pe spatele tabletei."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Pentru a verifica notificările, glisați în jos pe senzorul de amprentă de pe spatele dispozitivului."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Vedeți notificările rapid"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Glisați în jos pe senzorul de amprentă"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Activat"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Dezactivat"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloaderul este deja deblocat"</string>
@@ -3825,8 +3849,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Acces la director"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"acces la director"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"Telefonul meu"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"Tableta mea"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"Dispozitivul meu"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Cont"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Numele dispozitivului"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utilizați Bluetooth când conduceți"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Setați ca Bluetooth să se activeze automat când conduceți"</string>
</resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index fb0c577..7f3e5e8 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"ඔබන බොත්තම"</item>
<item msgid="1624323946324499595">"සමයන්ගේ උපාංග වෙතින් PIN"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"පැය 1"</item>
<item msgid="5198271470953124739">"කිසිවිටෙක කල් ඉකුත් නොවන්න"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (පෙරනිමි)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"දුර්වල"</item>
<item msgid="2042505933058940139">"දුර්වල"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"දින 60කට වඩා පැරණි"</item>
<item msgid="5692284879054004388">"දින 90කට වඩා පැරණි"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"ජාල මනාප භාවිත කරන්න"</item>
+ <item msgid="8745603368609022803">"මනින ලද ලෙස සලකන්න"</item>
+ <item msgid="2266114985518865625">"නොමනින ලද ලෙස සලකන්න"</item>
+ </string-array>
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 2783621..d16076c 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ඔබගේ උපාංග"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"නව උපාංගය යුගල කරන්න"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"බ්ලූටූත් උපාංගවලට සම්බන්ධ වීමට උපාංගයට ඉඩ දෙන්න"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"කලාපය තුළ නාද වීම අබල කරන්න"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"බ්ලූටූත් හෙඩ්සෙට්වල අභිරුචි දුරකථන නාද රිද්ම වාදනය නොකරන්න"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"දිනය සකසන්න"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"අකුරු අනුපිළිවෙලට සකසන්න"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"වේලා කලාපය අනුව පෙළගස්වන්න"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> ආරම්භ වේ."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"දිවා ආලෝක සුරැකුම් වේලාව"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"සම්මත වේලාව"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"කලාපය අනුව වේලා කලාපය"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"ස්ථාවර ඕෆ්සෙට් වේලා කලාප"</string>
<string name="date_picker_title" msgid="1338210036394128512">"දිනය"</string>
<string name="time_picker_title" msgid="483460752287255019">"කාලය"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"ස්වයංක්රියව අගුලු දමන්න"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"අගුලු තිර පණිවිඩය"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"විජට් සබල කරන්න"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ඔබගේ පරිපාලක විසින් අබල කර ඇත"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"අගුලු හැරීමේ විකල්පය පෙන්වන්න"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"විස්තාරිත ප්රවේශය සහ ඇඟිලි සලකුණු අගුලු හැරීම සඳහා වන සංදර්ශක බල සැපයුම් බොත්තම් විකල්පය."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"කිසිවක් නැත"</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">"උදා., ජෝගේ Android."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"පැතිකඩ තොරතුරු"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"ගිණුම්"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"සංකේතනය සහ අක්තපත්ර"</string>
@@ -459,9 +469,11 @@
<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="8971630898700461034">"තිර අගුල සැකසීම"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ඔබගේ උපාංගය ආරක්ෂා කර ගන්න"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"ඇඟිලි සලකුණ භාවිත කිරීම"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"ආරක්ෂාව සඳහා තිර අගුල සකසන්න"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"අන් අය ඔබගේ ටැබ්ලට් පරිගණකය භාවිත කිරීමෙන් වළක්වන්න"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"අන් අය ඔබගේ උපාංගය භාවිත කිරීමෙන් වළක්වන්න"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"අන් අය ඔබගේ දුරකථනය භාවිත කිරීමෙන් වළක්වන්න"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"ඇඟිලි සලකුණින් අගුළු හරින්න"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ඔබගේ ඇඟිලි සලකුණ සමගින් අනවහිර කරන්න"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"තිර අගුල තෝරාගන්න"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"කාර්යාල අගුල තෝරන්න"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"නාදක දුරකථනයක් ලෙස"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"සංගීතය සහ මාධ්යය සඳහා"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"සැකසීම් මතක තබාගන්න"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"උපරිම සම්බන්ධිත බ්ලූටූත් ශ්රව්ය උපාංග"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"සම්බන්ධිත බ්ලූටූත් ශ්රව්ය උපාංග උපරිම ගණන තෝරන්න"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"රැහැන් රහිත දර්ශනය සබල කරන්න"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"කිසිඳු උපාංගයක් අවටින් සොයාගත්තේ නැත."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"නම"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"පුරන්න"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> හට Wi-Fi ක්රියාත්මක කිරීමට අවශ්යය"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> හට Wi-Fi ක්රියාවිරහිත කිරීමට අවශ්යය"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi සක්රිය කරන්න"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fi භාවිත කරන්න"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi සැකසුම්"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"රැහැන් රහිත ප්රවේශ තැන් සකසන්න සහ කළමනාකරණය කරන්න"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"මුරපදය"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"මුරපදය පෙන්වන්න"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP කලාපය තෝරන්න"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ස්වයං"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz කලාපය"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz කලාපය"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP සැකසීම්"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS පවතී)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ඔබගේ ජාල මුරපදය ඇතුළත් කරන්න"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"වාහක Wi-Fi ජාලය"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> හරහා සම්බන්ධ කරන්න"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> හරහා සම්බන්ධ කරන්න"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ස්ථාන නිරවද්යතාවය වැඩි කිරීමට සහ වෙනත් අරමුණු සඳහා, Wi-Fi අක්රිය වුවද <xliff:g id="APP_NAME">%1$s</xliff:g> හට ජාල පරිලෝකනය සක්රිය කිරීමට අවශ්යය. \n\nපරිලෝකනය අවශ්ය සියලු යෙදුම් සඳහා මෙයට අවසර දෙන්නේ ද?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"මෙය අක්රිය කිරීමට, ඉතිරී ගිය මෙනුව තුළ උසස් වෙත යන්න."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"අවසර දෙන්න"</string>
@@ -909,10 +926,8 @@
<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_local_only" msgid="857988412470694109">"යෙදුම් අවට උපාංග සමග අන්තර්ගතය බෙදා ගැනීමට හොට්ස්පොට් එකක් සෑදිය හැකිය."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ස්වයංක්රියව හොට්ස්පොට් ක්රියාවිරහිත කරන්න"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"උපාග සම්බන්ධ කර නැතිනම් Wi‑Fi හොට්ස්පොට් ක්රියාවිරහිත වනු ඇත"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"හොට්ස්පොට් සක්රිය කරමින්..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"හොට්ස්පොට් අක්රිය කරමින්…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> සක්රීයයි"</string>
@@ -923,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi ඇමතීම"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi ඇමතුම ක්රියාත්මක කරන්න"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"ජංගම ජාලය වෙනුවට Wi-Fi භාවිත කරන්න"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"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_roaming_mode_title" msgid="1565039047187685115">"රෝමිං මනාප"</string>
@@ -961,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"හදිසි අවස්ථා ලිපිනය"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ඔබ Wi-Fi හරහා හදිසි ඇමතුමක් ලබා ගන්නා විට ඔබගේ ස්ථානය ලෙස භාවිතා වේ"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"පුද්ගලික DNS විශේෂාංග ගැන "<annotation id="url">"තව දැන ගන්න"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"සංදර්ශකය"</string>
<string name="sound_settings" msgid="5534671337768745343">"ශබ්ද"</string>
<string name="all_volume_title" msgid="4296957391257836961">"ශබ්ද තීව්රතා"</string>
@@ -1175,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"ජංගම ජාල වර්ගය"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"ක්රියාකාරී තොරතුරු"</string>
<string name="status_data_state" msgid="5503181397066522950">"ජංගම ජාල තත්වය"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"සේවා තත්වය"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"සංඥා ප්රබලතාව"</string>
<string name="status_roaming" msgid="2638800467430913403">"රෝමිං"</string>
@@ -1308,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ඔබගේ නව <xliff:g id="NAME">^1</xliff:g> වැඩ කරයි. \n\n මෙම උපාංගයට ඡායාරූප, ගොනු, සහ යෙදුම් දත්ත ගෙන යාමට, සැකසීම් > ආචයනය වෙත යන්න."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ගෙන යාම"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> යෙදුම සහ එහි දත්ත <xliff:g id="NAME_0">^2</xliff:g> වෙත ගෙනයාමට ගතවන්න පොඩි වේලාවක් පමණි. ගෙන යාම සම්පූර්ණ වන තුරු යෙදුම ඔබට භාවිතා කළ නොහැකි වේ.\n\nගෙන යාම අතරතුර <xliff:g id="NAME_1">^2</xliff:g> ඉවත් කරන්න එපා."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"දත්ත ගෙන යාමට ඔබ පරිශීලක <xliff:g id="APP">^1</xliff:g> අගුලු හැරීම අවශ්යයි."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ගෙන යමින්…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ගෙන යාම අතරතුර <xliff:g id="NAME">^1</xliff:g> ඉවත් කරන්න එපා. \n\nගෙන යාම සම්පූර්ණ වන තුරු මෙම උපාංගයේ <xliff:g id="APP">^2</xliff:g> යෙදුම ලබාගත නොහැකි වනු ඇත."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ගෙන යාම අවලංගු කරන්න"</string>
@@ -1360,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"ජාල, යෙදුම්, හෝ උපාංගය යළි සැකසිය හැකිය"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, ජංගම, බ්ලූටූත් යළි සක."</string>
<string name="reset_network_desc" msgid="5547979398298881406">"මෙය, පහත ඒවා ඇතුළුව සියලු ජාල සැකසීම් යළි සකසනු ඇත:\n\n"<li>"Wi‑Fi"</li>\n<li>"ජංගම දත්ත"</li>\n<li>"බ්ලූටූත්"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"eSIM ද නැවත සකසයි"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"දුරකථනයෙහි සියලු eSIM මකන්න. ඔබේ eSIM නැවත බාගැනීමට ඔබට ඔබේ වාහකය ඇමතීමට සිදු වනු ඇත. මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"සැකසීම් යළි පිහිටුවන ලදි"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"සියලු ජාල සැකසීම් යළි පිහිටුවන්නද? ඔබට මෙම ක්රියාව ආපසු හැරවිය නොහැකිය!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"සැකසීම් යළි පිහිටුවන්න"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"යළි පිහිටුවන්නද?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"මෙම පරිශීලකයා වෙත ජාලය යළි පිහිටුවීමේ හැකියාව නැත"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"ජාල සැකසීම් යළි පිහිටුවන ලදි"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM නැවත සැකසිය නොහැකිය"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"දෝෂයක් හේතුවෙන් මෙම eSIM නැවත සැකසිය නොහැකිය."</string>
<string name="master_clear_title" msgid="3531267871084279512">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM හි ගෙන යයි"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMs"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"සංගීත, පින්තූර, සහ වෙනත් පරිශීලක දත්ත මැකීමට, "<b>"USB ආචයනය"</b>" මැකීමට අවශ්යය."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"සංගීතය, පින්තූර, සහ වෙනත් පරිශීලක දත්ත ඉවත් කිරීමට, "<b>"SD කාඩ් පත"</b>" මැකිය යුතුවේ."</string>
@@ -1432,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"කරුණාකර අන්තර්ජාලය වෙත සම්බන්ධ වන්න"</string>
<string name="location_title" msgid="1029961368397484576">"මගේ ස්ථානය"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"කාර්යාල පැතිකඩ සඳහා ස්ථානය"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"ආකාරය"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ඉහළ නිරවද්යතාවය"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"බැටරි සුරැකීම"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"උපාංගය පමණි"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"ස්ථානය අක්රියයි"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"යෙදුම මට්ටමේ අවසර"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"මෑත කාලීන ස්ථාන ඉල්ලීම්"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"මෑතකදී යෙදුම් කිසිවක් ස්ථානය ඉල්ලා නැත"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"ස්ථානීය සේවා"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"ඉහළ බැටරි භාවිතය"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"අඩු බැටරි භාවිතය"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"ස්ථාන ආකාරය"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ස්ථානය නිර්ණය කිරීමට GPS, Wi-Fi, බ්ලූටූත්, හෝ ජංගම ජාල භාවිත කරන්න"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ස්ථානය නිර්ණය කිරීමට Wi-Fi, බ්ලූටූත්, හෝ ජංගම ජාල භාවිත කරන්න"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ඔබේ ස්ථානය නිර්ණය කිරීමට GPS සහ උපාංග සංවේදක භාවිත කරන්න"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"පරිලෝකනය කිරීම"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi පරිලෝකනය"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ඕනෑම අවස්ථාවකදී පද්ධති යෙදුම් සහ සේවා වෙත Wi‑Fi ජාල නිර්ණය කිරීමට ඉඩ දීමෙන් ස්ථානය වැඩි දියුණු කරන්න."</string>
@@ -1468,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"පිහිටීම් මූලාශ්ර"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"නීතිමය තොරතුරු, තත්වය, මෘදුකාංග අනුවාදය පෙන්වන්න"</string>
<string name="legal_information" msgid="5769301644270604095">"නීතිමය තොරතුරු"</string>
@@ -1575,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"සියලු යෙදුම් <xliff:g id="COUNT">%1$d</xliff:g> බලන්න"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ඔබගේ ටැබ්ලටය සහ පෞද්ගලික දත්ත නොදන්නා යෙදුම් මඟින් තර්ජන එල්ල කිරීමේ හැකියාව වැඩිය. මෙම මුලාශ්රය මඟින් ලැබෙන යෙදුම් ස්ථාපනයෙන් සහ භාවිතයෙන් ඔබේ දුරකතනයට හෝ ඔබේ දත්ත වලට සිදුවන හානිය පිලිබඳ වගකීම ඔබ ලබා ගන්නා බවට එකඟ වේ."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"ඔබගේ දුරකථනය සහ පෞද්ගලික දත්ත නොදන්නා යෙදුම් මඟින් තර්ජන එල්ල කිරීමේ හැකියාව වැඩිය. මෙම මුලාශ්රය මඟින් ලැබෙන යෙදුම් ස්ථාපනයෙන් සහ භාවිතයෙන් ඔබේ දුරකතනයට හෝ ඔබේ දත්ත වලට සිදුවන හානිය පිලිබඳ වගකීම ඔබ ලබා ගන්නා බවට එකඟ වේ."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"ඔබේ උපාංගය සහ පෞද්ගලික දත්ත නොදන්නා යෙදුම් මඟින් කරන ප්රහාරවලට නිරාවරණය වීමේ හැකියාව වඩාත් වැඩිය. මෙම මුලාශ්රයෙන් ලැබෙන යෙදුම් ස්ථාපනය කිරීමෙන් , ඔබ ඒවායේ භාවිතයෙන් හට ගත හැකි ඔබේ උපාංගයට වන ඕනෑම හානියකට හෝ දත්ත අහිමි වීමකට ඔබ වග කිය යුතු බවට ඔබ එකඟ වේ."</string>
<string name="advanced_settings" msgid="1777249286757067969">"උසස් සැකසුම්"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"තවත් සැකසුම් විකල්ප සබල කරන්න"</string>
<string name="application_info_label" msgid="5736524913065714880">"යෙදුම් තොරතුරු"</string>
@@ -1874,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ඇතැම් විට ක්රියාකාරිත්වයට බලපෑ හැක"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"දර්ශකය චලනය නැවතුණ පසු ක්ලික් කිරීම"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ක්ලික් කිරීමට පෙර පමාව"</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_summary_state_enabled" msgid="8359913912320966304">"ක්රියාත්මකයි"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ක්රියාවිරහිතයි"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"ඉක්මන් සැකසීම් තුළ පෙන්වන්න"</string>
@@ -1987,7 +2005,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> ක් ඉතිරියි"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> වෙත වෙනස් කරන්න"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"පසුබිම් ක්රියාකාරිත්වය"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"සීමා කළ"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"පසුබිමේ ධාවනය කිරීමට යෙදුමට අවසර දෙන්න"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"භාවිතයේ නොමැති විට යෙදුමට පසුබිමේ ධාවනය කළ හැක"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"යෙදුම භාවිතයේ නොමැති විට එහි පසුබිම් ක්රියාකාරිත්වය සීමා සහිතයි"</string>
@@ -2030,14 +2048,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"බැටරිය හැඩයෙන් හොඳ තත්ත්වයේ පවතී"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"යෙදුම් සාමාන්ය ලෙස හැසිරේ"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"අඩු බැටරි ධාරිතාව"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"බැටරියට හොඳ බැටරි ආයු කාලයක් ලබා දිය නොහැකිය"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"ස්මාර්ට් බැටරි කළමනාකරු ක්රියාත්මක කරන්න"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"බැටරි භාවිතය ප්රශස්ත කිරීමට ක්රියාත්මක කරන්න"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"අඩු බැටරි ප්රකාරය ක්රියාත්මක කරන්න"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"ඔබේ බැටරි ආයු කාලය දිගු කරන්න"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"අඩු බැටරි ප්රකාරය ක්රියාත්මකයි"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"සමහර විශේෂාංග සීමිත වේ"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"දුරකථනය දැඩි ලෙස භාවිත වේ"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ටැබ්ලට් උපාංගය දැඩි ලෙස භාවිත වේ"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"උපාංගය දැඩි ලෙස භාවිත වේ"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"පසුගිය පූර්ණ ආරෝපණයෙන් පසුව <xliff:g id="HOUR">%1$s</xliff:g> පමණ"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"ඔබගේ දුරකථනය දැඩි ලෙස භාවිත කරන අතර මෙය බැටරිය විශාල ප්රමාණයක් පරිභෝජනය කරයි. ඔබගේ බැටරිය සාමාන්ය පරිදි හැසිරේ.\n\n පසුගිය පූර්ණ ආරෝපණයෙන් පසුව ඔබගේ දුරකථනය <xliff:g id="HOUR">%1$s</xliff:g> පමණ භාවිත කර ඇත.\n\n මුළු භාවිතය:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"ඔබගේ ටැබ්ලට් උපාංගය දැඩි ලෙස භාවිත කරන අතර මෙය බැටරිය විශාල ප්රමාණයක් පරිභෝජනය කරයි. ඔබගේ බැටරිය සාමාන්ය පරිදි හැසිරේ.\n\n පසුගිය පූර්ණ ආරෝපණයෙන් පසුව ඔබගේ ටැබ්ලට් උපාංගය <xliff:g id="HOUR">%1$s</xliff:g> පමණ භාවිත කර ඇත.\n\n මුළු භාවිතය:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"ඔබගේ උපාංගය දැඩි ලෙස භාවිත කරන අතර මෙය බැටරිය විශාල ප්රමාණයක් පරිභෝජනය කරයි. ඔබගේ බැටරිය සාමාන්ය පරිදි හැසිරේ.\n\n පසුගිය පූර්ණ ආරෝපණයෙන් පසුව ඔබගේ උපාංගය <xliff:g id="HOUR">%1$s</xliff:g> පමණ භාවිත කර ඇත.\n\n මුළු භාවිතය:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"ස්මාර්ට් බැටරි කළමනාකරු"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"බැටරි ස්වයංක්රියව කළමනාකරණය කරන්න"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"භාවිතය මත පදනම්ව යෙදුම මඟින් බලශක්තිය භාවිතය ස්වයංක්රියව සීරුමාරු කරන්න"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"සීමා කළ යෙදුම්"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">යෙදුම් %1$d</item>
+ <item quantity="other">යෙදුම් %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>
@@ -2146,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"මාධ්යසේවාදායකය"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"යෙදුම් ප්රශස්තකරණය"</string>
<string name="battery_saver" msgid="8172485772238572153">"බැටරි සුරැකුම"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"බැටරි සුරැකුම භාවිත කරන්න"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ස්වයන්ක්රියව ක්රියාත්මක කරන්න"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"කවදාවත් නෑ"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"බැටරිය <xliff:g id="PERCENT">%1$s</xliff:g> හි"</string>
@@ -2333,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"සමමුහුර්තය දැනට ගැටළුවලට මුහුණපා ඇත. එය සුළු මොහොතකින් ආපසු පැමිණෙනු ඇත."</string>
<string name="add_account_label" msgid="7811707265834013767">"ගිණුමක් එක් කරන්න"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"වැඩ පැතිකඩ තවම නොපවතියි"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"කාර්යාල ප්රකාරය"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"යෙදුම්, පසුබිම සමමුහුර්ත කිරීම, සහ සම්බන්ධිත විශේෂාංග ඇතුළුව ක්රියා කිරීමට කාර්යාල පැතිකඩට ඉඩ දෙන්න"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"කාර්යාල පැතිකඩ"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"ඔබේ සංවිධානය විසින් කළමනාකරණය කරනු ලැබේ"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"යෙදුම් සහ දැනුම්දීම් ක්රියාවිරහිතයි"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"වැඩ පැතිකඩ ඉවත් කරන්න"</string>
<string name="background_data" msgid="5779592891375473817">"පසුබිම් දත්ත"</string>
<string name="background_data_summary" msgid="8328521479872763452">"යෙදුම්වලට ඕනෑම වෙලාවක දත්ත සමමුහුර්ත කිරීමට, යැවීමට, සහ ලබාගැනීමට හැකිය"</string>
@@ -2366,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"ගිණුම ඉවත් කරන්නද?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"මෙම ගිණුම මැකීමෙන් ටැබ්ලටයෙන් එහි සියලු පණිවිඩ, සම්බන්ධතා, සහ වෙනත් දත්ත මැකී යයි!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"මෙම ගිණුම මැකීමෙන් දුරකථනයෙන් එහි සියලු පණිවිඩ, සම්බන්ධතා, සහ වෙනත් දත්ත මකා දමනු ඇත!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"මෙම ගිණුම ඉවත් කිරීම උපාංගය වෙතින් එහි සියලු පණිවිඩ, සම්බන්ධතා, සහ වෙනත් දත්ත මකනු ඇත!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"ඔබගේ පරිපාලක විසින් මෙම වෙනස් කිරීමට ඉඩ නොදේ"</string>
<string name="provider_label" msgid="7724593781904508866">"එබුම් දායකත්ව"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2622,8 @@
<item quantity="one">සහතික පරීක්ෂා කරන්න</item>
<item quantity="other">සහතික පරීක්ෂා කරන්න</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"පරිශීලකයින්"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"පරිශීලකයින් සහ පැතිකඩ"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"පරිශීලයෙකු හෝ ගිණුමක් එක් කරන්න"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"පරිශීලකයෙක් එක් කරන්න"</string>
@@ -2774,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"බ්ලුටූත්, Cast"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"යෙදුම් සහ දැනුම්දීම්"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"අවසර, පෙරනිමි යෙදුම්"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"පරිශීලකයන් සහ ගිණුම්"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"බාධා නොකරන්න එපා, බාධා කිරීම, බාධාව, බිඳීම"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"අවට, ස්ථානය, ඉතිහාසය, වාර්තාකරණය"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"නිරවද්යතාවය"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"ගිණුම"</string>
<string name="keywords_users" msgid="3434190133131387942">"සීමා කිරීම, සීමා කරන්න, සීමා කරන ලදී"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"පෙළ නිවැරදි කිරීම, නිවැරදි, ශබ්දය, කම්පනය, ස්වයං, භාෂාව, අභිනය, යෝජනා කිරීම, යෝජනාව, තේමාව, අහිතකර, වචනය, වර්ගය, ඉමොජි ජාත්යන්තර"</string>
@@ -2872,6 +2911,7 @@
<item quantity="other">රීති <xliff:g id="ON_COUNT">%d</xliff:g></item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"බාධා නොකරන්න"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"බාධා නොකරන්න ක්රියාත්මක කරන්න"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"හැසිරීම"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ශබ්ද සහ කම්පනවලට ඉඩ දෙන්න"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ශබ්ද නැත"</string>
@@ -2881,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"ස්වයංක්රියව ක්රියාත්මක කරන්න"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"ස්වයංක්රීය රීති"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"ස්වයංක්රීය රීතිය"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"බාධා නොකරන්න රීති සැකසීම"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ශබ්ද සහ කම්පන ඇතැම් වේලා වල සීමා කරන්න"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"නිශ්චිත වේලාවලදී දුරකථනය නිහඬ කරන්න"</string>
+ <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_no_interruptions" msgid="8107126344850276878">"සම්පූර්ණ නිහඬතාව"</string>
@@ -2890,12 +2931,15 @@
<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_add" msgid="90014394953272517">"එක් කරන්න"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"දැන් ක්රියාත්මක කරන්න"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"දැන් ක්රියාවිරහිත කරන්න"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"ක්රියාත්මක කරන්න"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"දැන් ක්රියාත්මක කරන්න"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"දැන් ක්රියාවිරහිත කරන්න"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> දක්වා බාධා නොකරන්න ක්රියාත්මකයි"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"බාධා නොකරන්න එය ඔබ ක්රියාවිරහිත කරන තෙක් ක්රියාත්මකව පවතී"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"<xliff:g id="RULE_NAME">%s</xliff:g> රීතියක් මගින් බාධා නොකරන්න ස්වයංක්රියව ක්රියාත්මක කරන ලදී"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"<xliff:g id="APP_NAME">%s</xliff:g> යෙදුමක් මගින් බාධා නොකරන්න ස්වයංක්රියව ක්රියාත්මක කරන ලදී"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"ප්රමුඛතා පමණි"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2955,7 @@
<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="recent_notifications" msgid="5660639387705060156">"මෑතකදී එවන ලද"</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>
@@ -2930,7 +2975,7 @@
<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_importance_title" msgid="848692592679312666">"වැදගත්කම"</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="5455049524984686275">"ශබ්ද හෝ දෘශ්ය බාධා නැත"</string>
@@ -2948,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"මධ්යම වැදගත්කම"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"දැනුම්දීම් ප්රවේශනය"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"කාර්යාල පැතිකඩ දැනුම් දීම්වලට පිවිසීම අවහිර කර ඇත"</string>
@@ -2978,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"ප්රවේශය බාධා නොකරන්න"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"ස්ථාපිත යෙදුම් කිසිවක් ප්රවේශය බාධා නොකරන්න ඉල්ලා නැත"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"යෙදුම් පූරණය වේ..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android මෙම යෙදුමෙහි දැනුම්දීම් මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android දැනුම්දීම්වල මෙම ප්රවර්ගය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"දැනුම්දීම් සමූහයක් මෙම උපාංගය මත දිස් වීම Android අවහිර කරමින් ඇත"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"ඔබගේ ඉල්ලීම මත, Android මෙම යෙදුමෙහි දැනුම්දීම් මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"ඔබගේ ඉල්ලීම මත, Android මෙම දැනුම්දීම් ප්රවර්ගය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"ඔබගේ ඉල්ලීම මත, Android මෙම දැනුම්දීම් සමූහය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
<string name="notification_channels" msgid="5346841743182627500">"ප්රවර්ග"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"වෙනත්"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ මුරපදය අවශ්ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\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="1793719723017395175">"ඔව්"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"නැත"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN එක අවශ්යද?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"රටාව අවශ්යද?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"මුරපදය අවශ්යද?"</string>
@@ -3397,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"දැනට සිටින පරිශීලකයා: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> ලෙස පුරන ලදී"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> පෙරනිමි වේ"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ක්රියාත්මකයි / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ක්රියාවිරහිතයි"</string>
<string name="backup_disabled" msgid="485189128759595412">"උපස්ථ කිරීම අබලයි"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> වෙත යාවත්කාලීන කරන ලදි"</string>
@@ -3407,6 +3456,7 @@
<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="6346948990624612516">"උපස්ථ ක්රියාවිරහිත කළ නොහැකිය"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"මෙම ක්රියාව අබල කර ඇත. තව දැන ගැනීමට ඔබේ සංවිධානයේ පරිපාලක අමතන්න."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"වැඩි විස්තර"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"සැකසීම්, අවසර, සංස්ථාපිත ප්රවේශය, ජාල ක්රියාකාරකම, සහ උපාංගයේ ස්ථාන තොරතුරු ඇතුළුව, ඔබේ කාර්යාල පැතිකඩ සමඟ සම්බන්ධිත යෙදුම් සහ දත්ත නිරීක්ෂණය කිරීමට සහ කළමනාකරණය කිරීමට ඔබේ පරිපාලකට හැකිය."</string>
@@ -3430,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"කාර්යාල පැතිකඩ අක්රියයි"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"යෙදුම්, පසුබිම් සමමුහුර්ත කිරීම, සහ ඔබේ වැඩ පැතිකඩ හා සම්බන්ධ අනෙකුත් විශේෂාංග ක්රියාවිරහිතයි."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"රාත්රී ආලෝක කාලසටහන සකසන්න"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ඇම්බර් වර්ණ තිරය මඟින් ඔබට නිදාගැනීමට උදව් කරයි"</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="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>
<string name="suggestions_more_title" msgid="8223690393059519879">"තවත් +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3537,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"කිසිවක් නැත"</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>
@@ -3559,31 +3612,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"උපාංග කිහිපයකට සම්බන්ධිතයි"</string>
<string name="demo_mode" msgid="2798762752209330277">"පද්ධති UI ආදර්ශන ප්රකාරය"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ඉක්මන් සැකසීම් සංවර්ධක ටයිල්"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"උදවු කිරීමට අප මෙතැනය"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"අප දින 7 පැය 24 පුරා ඔබ වෙනුවෙන් මෙතැනය"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"අප දින 7 පැය 24 පුරා ඔබ වෙනුවෙන් මෙතැනය"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"ඕනෑම ගැටලුවක් විසඳීමට උදවු කිරීම සඳහා අපේ සහාය කණ්ඩායම මෙතන සිටී"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"අපගේ සහාය කණ්ඩායම සෑම දිනකම, දවස පුරා මෙහි සිටියි"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"උදවු සොයන්න නැතහොත් සහාය තිබෙන පැය තුළ ආපසු පැමිණෙන්න (දේශීය වේලාවෙන්):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"දුරකථන සහාය ඇති පැය (දේශීය වේලාව)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"උදවු සොයන්න නැතහොත් ඉඟි සහ උපක්රම ගවේෂණය කරන්න"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"මෙය සඳහා සහාය:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"පිටරට සංචාරය කරන්නේද?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"ජාත්යන්තර ගාස්තු අදාළ විය හැකිය"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"දුරකථනය"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"කතාබහ"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ඉඟි සහ උපක්රම ගවේෂණය කරන්න"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"උදවු සොයන්න සහ ප්රතිපෝෂණ යවන්න"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"සහාය අැමතීම"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"පුරන්න"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"පිරිය නොහැකිද?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"පද්ධති තොරතුරු යවන්න"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"නැවත පෙන්වන්න එපා"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"ලෙස ඉල්ලයි"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"ගිණුම එක් කරන්න"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"පද්ධති තොරතුරු"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"කවුළු හඹා යාම"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"මතුපිට හෝඩුවාව"</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>
@@ -3599,11 +3629,11 @@
<item quantity="one">තත්පර <xliff:g id="NUMBER">%s</xliff:g></item>
<item quantity="other">තත්පර <xliff:g id="NUMBER">%s</xliff:g></item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> රැඳී සිටීම"</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="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>
@@ -3614,32 +3644,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"කැමරාව විවෘත කිරීමට බල සැපයුම් බොත්තම දෙවරක් ඔබන්න"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"සෙල්ෆි ප්රකාරය සඳහා දුරකථනය දෙවරක් කරකවන්න"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"සෙල්ෆි ප්රකාරය සඳහා ටැබ්ලට් පරිගණකය දෙවරක් කරකවන්න"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"සෙල්ෆි ප්රකාරය සඳහා උපාංගය දෙවරක් කරකවන්න"</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_suggestion_summary" msgid="5987443721392571847">"තිරය ක්රියාවිරහිත විට දැනුම්දීම් පරීක්ෂා කරන්න"</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_pickup_suggestion_summary" msgid="7014700589991761035">"තිරය ක්රියාවිරහිත විට දැනුම්දීම් පරීක්ෂා කරන්න"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ඔබේ දැනුම්දීම් පරීක්ෂා කිරීමට, ඔබේ උපාංගයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය මත පහළට ස්වයිප් කරන්න."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"දැනුම්දීම් ඉක්මනින් බලන්න"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ඇඟිලි සලකුණු සංවේදකය මත පහළට ස්වයිප් කරන්න"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"ක්රියාත්මකයි"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"ක්රියාවිරහිතයි"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader දැනටමත් අගුලු හැර ඇත"</string>
@@ -3769,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"නාමාවලි ප්රවේශය"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"නාමාවලි ප්රවේශය"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"මගේ දුරකථනය"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"මගේ ටැබ්ලට් පරිගණකය"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"මගේ උපාංගය"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"ගිණුම"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"උපාංගයේ නම"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"රිය ධාවනය කරන විට බ්ලූටූත් භාවිත කරන්න"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"රිය ධාවනය කරන අතරතුර බ්ලූටූත් සහ ස්ථානය ක්රියාත්මක කරන්න"</string>
</resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index ed58a76..e7e99e1 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Pritisnite gumb"</item>
<item msgid="1624323946324499595">"PIN iz enakovredne naprave"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 ura"</item>
<item msgid="5198271470953124739">"Brez časovne omejitve"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (privzeto)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Slaba"</item>
<item msgid="2042505933058940139">"Šibko"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Starejše od 60 dni"</item>
<item msgid="5692284879054004388">"Starejše od 90 dni"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Uporabi nastavitev omrežja"</item>
+ <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>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index cab57e1..dce1b3a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -172,6 +172,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše naprave"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Seznanitev nove naprave"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Dovoli napravi seznanjanje in povezovanje z napravami Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Onemogoči zvonjenje iz telefona"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"V slušalkah z mikrofonom Bluetooth ne predvajaj tonov zvonjenj po meri"</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>
@@ -334,6 +336,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Nastavi datum"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Razvrsti po abecedi"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Razvrsti po časovnem pasu"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> se začne dne <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Poletni čas"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Standardni čas"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Časovni pas glede na območje"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Časovni pasovi glede na zamik"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
<string name="time_picker_title" msgid="483460752287255019">"Ura"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Samodejno zaklepanje"</string>
@@ -344,6 +351,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Spor. na zakl. zasl."</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Omogoči pripomočke"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Onemogočil skrbnik"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Brez"</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">"Npr. Janezov Android"</string>
@@ -352,6 +363,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Podatki za profil"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Uporaba lokacije"</string>
<string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Varnost in lokacija"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifriranje in poverilnice"</string>
@@ -465,9 +477,16 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Vnesli ste pravilno geslo, vendar so podatki poškodovani. \n\nČe želite še naprej uporabljati tablični računalnik, ga morate ponastaviti na tovarniške nastavitve. Ko boste po ponastavitvi nastavljali tablični računalnik, boste lahko obnovili morebitne podatke, ki so bili varnostno kopirani v Google Račun."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Vnesli ste pravilno geslo, vendar so podatki poškodovani. \n\nČe želite še naprej uporabljati telefon, ga morate ponastaviti na tovarniške nastavitve. Ko boste po ponastavitvi nastavljali telefon, boste lahko obnovili morebitne podatke, ki so bili varnostno kopirani v Google Račun."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Preklopite način vnosa"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Nastavitev zaklepanja zaslona"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zaščitite napravo"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Uporaba prstnega odtisa"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Odklepanje s prstnim odtisom"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Izberite zaklepanje zaslona"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Izbira zakl. del. p."</string>
@@ -713,6 +732,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kot zvočnik"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glasbo in predstavnost"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapomni si nastavitve"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Največje dovoljeno število povezanih zvočnih naprav Bluetooth"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Izberite največje dovoljeno število povezanih zvočnih naprav Bluetooth"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Predvajanje"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogočanje brezžičnega zaslona"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V bližini ni naprav."</string>
@@ -727,6 +748,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Ime"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Prijava"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mb/s"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"Aplikacija <xliff:g id="REQUESTER">%s</xliff:g> želi vklopiti Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"Aplikacija <xliff:g id="REQUESTER">%s</xliff:g> želi izklopiti Wi-Fi"</string>
@@ -744,6 +766,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Vklopi Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Uporabi Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Nastavitve za Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Nastavi in upravljaj brezžične dostopne točke"</string>
@@ -838,6 +861,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Geslo"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Pokaži geslo"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Izbira pasu dostopne točke"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Samodejno"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4-GHz pas"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5-GHz pas"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Nastavitve naslova IP"</string>
@@ -855,7 +879,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je na voljo)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Vnesite geslo za omrežje"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Omrežje Wi‑Fi operaterja"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Povezava prek omrežja <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Povezava prek omrežja <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Za izboljšanje natančnosti lokacijskih podatkov in druge namene želi <xliff:g id="APP_NAME">%1$s</xliff:g> vklopiti iskanje omrežij, tudi ko je Wi-Fi izklopljen.\n\nŽelite to dovoliti vsem aplikacijam, ki želijo iskati omrežja?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Če želite to možnost izklopiti, v meniju z dodatnimi elementi odprite »Dodatno«."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dovoli"</string>
@@ -933,10 +957,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pas dostopne točke"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Uporabite dostopno točko, da ustvarite omrežje Wi‑Fi za svoje druge naprave. Dostopna točka omogoča uporabo interneta prek mobilne podatkovne povezave, zato lahko nastanejo dodatni stroški prenosa podatkov v mobilnih omrežjih."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije lahko ustvarijo dostopno točko za skupno rabo vsebin z napravami v bližini."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Samodejni izklop dostopne točke"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Dostopna točka Wi‑Fi se bo izklopila, če ni povezana nobena naprava"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Vklop dostopne točke ..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Izklop dostopne točke ..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Povezava <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivna"</string>
@@ -947,7 +969,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Klicanje prek Wi-Fi-ja"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Vklop klicanja prek Wi-Fi-ja"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Uporaba Wi-Fi-ja namesto mobilnega omrežja"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Nastavitev klicanja"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Način klicanja prek Wi-Fi-ja"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Prednostna izbira za gostovanje"</string>
@@ -985,6 +1008,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Naslov za nujne primere"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Uporabljen je kot vaš naslov, ko opravite klic v sili prek Wi‑Fi-ja"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Preberite več"</annotation>" o funkcijah zasebnega strežnika DNS"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
<string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Glasnost"</string>
@@ -1201,6 +1225,8 @@
<string name="status_network_type" msgid="3279383550222116235">"Vrsta mobilnega omrežja"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Podatki operaterja"</string>
<string name="status_data_state" msgid="5503181397066522950">"Stanje mobilnega omrežja"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"Stanje storitve"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Moč signala"</string>
<string name="status_roaming" msgid="2638800467430913403">"Gostovanje"</string>
@@ -1334,6 +1360,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Nova shramba <xliff:g id="NAME">^1</xliff:g> deluje. \n\nČe želite premikati fotografije, datoteke in podatke aplikacij vanjo, odprite »Nastavitve« > »Shramba«."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Premik aplikacije <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Premik aplikacije <xliff:g id="APP">^1</xliff:g> in njenih podatkov v shrambo <xliff:g id="NAME_0">^2</xliff:g> bo trajal samo nekaj trenutkov. Dokler premik ne bo dokončan, aplikacije ne bo mogoče uporabljati. \n\nShrambe <xliff:g id="NAME_1">^2</xliff:g> med premikanjem ne odstranite."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Če želite premakniti podatke, morate odkleniti uporabnika <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Premikanje aplikacije <xliff:g id="APP">^1</xliff:g> …"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Shrambe <xliff:g id="NAME">^1</xliff:g> med premikanjem ne odstranite. \n\nAplikacija <xliff:g id="APP">^2</xliff:g> v tej napravi ne bo na voljo, dokler premik ne bo dokončan."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Preklic premika"</string>
@@ -1386,19 +1413,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Ponastavite lahko omrežje, aplikacije ali napravo"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Ponastavi Wi-Fi, prenos podatkov v mobilnem omrežju in Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"S tem boste ponastavili vse omrežne nastavitve, vključno s temi:\n\n"<li>"Wi‑Fi"</li>\n<li>"Prenos podatkov v mobilnih omrežjih"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Ponastavi tudi kartice e-SIM"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"Ponastavi nastavitve"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Ali želite ponastaviti vse omrežne nastavitve? Tega dejanja ni mogoče razveljaviti."</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Ponastavi nastavitve"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Želite ponastaviti?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Ponastavitev omrežnih nastavitev ni na voljo za tega uporabnika"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Omrežne nastavitve so ponastavljene"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Kartic e-SIM ni mogoče ponastaviti"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Kartic e-SIM ni mogoče ponastaviti zaradi napake."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Izbriši vse podatke (ponastavitev na tovarniške nastavitve)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"S tem boste iz "<b>"notranjega pomnilnika"</b>" tabličnega računalnika izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"V napravi so prisotni drugi uporabniki.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operaterji na digitalni kartici e-SIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"Digitalne kartice e-SIM"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"S tem ne boste prekinili naročniškega paketa za mobilno telefonijo."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
@@ -1458,21 +1490,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Vzpostavite internetno povezavo"</string>
<string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Mesto za delovni profil"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka natančnost"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Varč. z energijo akumulatorja"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Samo v napravi"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Lokacija je izklopljena"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Dovoljenja na ravni aplikacije"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedavne zahteve za lokacijo"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"V zadnjem času ni nobena aplikacija zahtevala lokacijskih podatkov"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Lokacijske storitve"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Visoka poraba akumulatorja"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Nizka poraba akumulatorja"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Način ugotavljanja lokacije"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Uporaba GPS-ja, Bluetootha, Wi-Fi-ja in mobilnih omrežij za določanje lokacije"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Uporaba Wi-Fi-ja, Bluetootha in mobilnih omrežij za določanje lokacije"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Uporaba GPS-a in tipal naprave za določanje lokacije"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Iskanje"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Iskanje omrežij Wi‑Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Izboljšajte natančnost lokacijskih podatkov, tako da sistemskim aplikacijam in storitvam omogočite, da kadar koli zaznajo omrežja Wi-Fi."</string>
@@ -1494,6 +1517,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Viri lokacije"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"O tabličnem računalniku"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"O telefonu"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"O napravi"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"O emulirani napravi"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Ogled pravnih informacij, stanja, različice programske opreme"</string>
<string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
@@ -1601,6 +1625,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Prikaži vse aplikacije (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Neznane aplikacije lažje napadejo tablični računalnik in osebne podatke v njem. Če namestite aplikacije iz tega vira, se strinjate, da ste sami odgovorni za morebitno škodo, nastalo v tabličnem računalniku, ali izgubo podatkov, ki je lahko posledica uporabe teh aplikacij."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Neznane aplikacije lažje napadejo telefon in osebne podatke v njem. Če namestite aplikacije iz tega vira, se strinjate, da ste sami odgovorni za morebitno škodo, nastalo v telefonu, ali izgubo podatkov, ki je lahko posledica uporabe teh aplikacij."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Neznane aplikacije lažje napadejo napravo in osebne podatke v njej. Če namestite aplikacije iz tega vira, se strinjate, da ste sami odgovorni za morebitno škodo, nastalo v napravi, ali izgubo podatkov zaradi uporabe teh aplikacij."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Dodatne nastavitve"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Omogoči več možnosti nastavitev."</string>
<string name="application_info_label" msgid="5736524913065714880">"Podatki o aplikaciji"</string>
@@ -1902,6 +1927,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Lahko vpliva na učinkovitost delovanja"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik, ko se kazalec ustavi"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Zakasnitev pred klikom"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"VKLOPLJENO"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IZKLOPLJENO"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži v »Hitrih nastavitvah«"</string>
@@ -2029,7 +2057,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">"Preostali čas: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do napolnjenosti"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Dejavnost v ozadju"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Omejeno"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Dovoli, da se aplikacija izvaja v ozadju"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Ko aplikacija ni v uporabi, se lahko izvaja v ozadju"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Ko aplikacija ni v uporabi, je njena dejavnost v ozadju omejena"</string>
@@ -2072,14 +2100,33 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Akumulator je v dobrem stanju"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikacije delujejo normalno"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Akumulator je skoraj prazen"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Akumulator ne more zagotoviti dolgega časa delovanja"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Vklopite pametnega upravitelja akumulatorja"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Vklopite za optimiziranje porabe akumulatorja"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Vklop načina za skoraj prazen akumulator"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Podaljšanje časa delovanja akumulatorja"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Vklopljen je način za skoraj prazen akumulator"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Nekatere funkcije so omejene"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefon ste veliko uporabljali"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablični računalnik ste veliko uporabljali"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Napravo ste veliko uporabljali"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Približno <xliff:g id="HOUR">%1$s</xliff:g> uporabe od zadnje polne napolnjenosti"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Telefon ste veliko uporabljali, s čimer ste porabili veliko energije akumulatorja. Vedenje akumulatorja je normalno.\n\n Telefon ste od zadnje polne napolnjenosti uporabljali približno <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Skupna uporaba:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Tablični računalnik ste veliko uporabljali, s čimer ste porabili veliko energije akumulatorja. Vedenje akumulatorja je normalno.\n\n Tablični računalnik ste od zadnje polne napolnjenosti uporabljali približno <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Skupna uporaba:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Napravo ste veliko uporabljali, s čimer ste porabili veliko energije akumulatorja. Vedenje akumulatorja je normalno.\n\n Napravo ste od zadnje polne napolnjenosti uporabljali približno <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Skupna uporaba:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Pametni upravitelj akumulatorja"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Samodejno upravljanje akumulatorja"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Samodejno prilagodi porabo energije po posameznih aplikacijah glede na uporabo"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Omejene aplikacije"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d aplikacija</item>
+ <item quantity="two">%1$d aplikaciji</item>
+ <item quantity="few">%1$d aplikacije</item>
+ <item quantity="other">%1$d aplikacij</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Želite ustaviti aplikacijo?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefon ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> ohranja telefon prebujen.\n\nTežavo lahko poskusite rešiti tako, da zaustavite aplikacijo.\n\nČe se težava ponovi, boste za podaljšanje časa delovanja akumulatorja morda morali aplikacijo odstraniti."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tablični računalnik ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> ohranja tablični računalnik prebujen.\n\nTežavo lahko poskusite rešiti tako, da zaustavite aplikacijo.\n\nČe se težava ponovi, boste za podaljšanje časa delovanja akumulatorja morda morali aplikacijo odstraniti."</string>
@@ -2188,6 +2235,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Predstavnostni strežnik"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizacija aplikacij"</string>
<string name="battery_saver" msgid="8172485772238572153">"Varčevanje z energijo akumulatorja"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Uporaba varčevanja z energijo akumulatorja"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Samodejni vklop"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikoli"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"pri <xliff:g id="PERCENT">%1$s</xliff:g> napolnjenosti akumulatorja"</string>
@@ -2375,8 +2423,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Težava pri sinhronizaciji. Kmalu bo spet na voljo."</string>
<string name="add_account_label" msgid="7811707265834013767">"Dodaj račun"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Delovni profil še ni na voljo"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Način za delo"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Omogočanje, da delovni profil deluje, vključno z aplikacijami, sinhronizacijo v ozadju in povezanimi funkcijami"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Odstrani delovni profil"</string>
<string name="background_data" msgid="5779592891375473817">"Podatki v ozadju"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Aplikacije lahko kadar koli sinhronizirajo, pošiljajo in prejemajo podatke"</string>
@@ -2408,6 +2460,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Želite odstraniti račun?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Z odstranitvijo računa boste iz tabličnega računalnika izbrisali vsa sporočila, stike in druge podatke v računu."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Z odstranitvijo računa boste iz telefona izbrisali vsa sporočila, stike in druge podatke v računu."</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Z odstranitvijo računa boste iz naprave izbrisali vsa sporočila, stike in druge podatke v računu."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Skrbnik ne dovoli te spremembe"</string>
<string name="provider_label" msgid="7724593781904508866">"Potisne naročnine"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2634,7 +2687,8 @@
<item quantity="few">Preveri potrdila</item>
<item quantity="other">Preveri potrdila</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Uporabniki"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Uporabniki in profili"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodajanje uporabnika ali profila"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj uporabnika"</string>
@@ -2826,7 +2880,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</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="account_dashboard_title" msgid="4936890821712178853">"Uporabniki in računi"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2857,10 +2912,9 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ne moti, prekinjaj, prekinitev, motnja"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"v bližini, lokacija, zgodovina, poročanje"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"natančnost"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"račun"</string>
<string name="keywords_users" msgid="3434190133131387942">"omejitev, omeji, omejeno"</string>
- <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"popravljanje besedila, pravilno, zvok, vibriranje, samodejno, jezik, poteza, predlaganje, predlog, tema, žaljivo, beseda, vrsta, znak emoji, mednarodno"</string>
+ <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"popravljanje besedila, pravilno, zvok, vibriranje, samodejno, jezik, poteza, predlaganje, predlog, tema, žaljivo, beseda, vrsta, emodžiji, mednarodno"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ponastavitev, nastavitve, privzeto"</string>
<string name="keywords_emergency_app" msgid="3143078441279044780">"nujni primer, ice, aplikacij, privzeto"</string>
<string name="keywords_default_phone_app" msgid="4213090563141778486">"telefon, klicalnik, privzeto"</string>
@@ -2926,6 +2980,7 @@
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> pravil</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne moti"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Vklop načina »ne moti«"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Vedenje"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Dovoli te zvoke in vibriranja:"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Brez zvoka"</string>
@@ -2935,8 +2990,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Samodejni vklop"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Samodejna pravila"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Samodejno pravilo"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Nastavi pravila za »ne moti«"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Omeji zvoke in vibriranja od določenih urah"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Uporabi pravilo"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Samo prednostno"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Popolna tišina"</string>
@@ -2944,12 +3002,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokiranje vizualnih motenj"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dovoli vizualne znake"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Dodaj"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"VKLOPI TAKOJ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"IZKLOPI TAKOJ"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Vklopi"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Vklopi zdaj"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Izklopi zdaj"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Način »ne moti« bo vklopljen do <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Način »ne moti« bo ostal vklopljen, dokler ga ne izklopite"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Način »ne moti« je bil samodejno vklopljen na podlagi pravila (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Način »ne moti« je samodejno vklopila aplikacija (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Samo prednostno"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Zvoki v delovnem profilu"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Uporaba zvokov iz os. profila"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Zvoki v delovnem in osebnem profilu so enaki"</string>
@@ -2965,6 +3026,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Melodije zvonjenja"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Drugi zvoki in vibriranja"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Obvestila"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Nedavno poslano"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Dodatno"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Obvestila za delovni profil"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Dovoli obvestilne pike"</string>
@@ -2984,7 +3046,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Obvestila aplikacij"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obvestil"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Skupina kategorij obvestil"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Pomembnost"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Vedenje"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Omogoči zvok"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Nikoli ne pokaži obvestil"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Brez zvočne ali vizualne prekinitve"</string>
@@ -3002,6 +3064,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Srednja pomembnost"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Visoka pomembnost"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Nujna pomembnost"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Pokaži obvestila"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Pomočnik za obvestila"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Dostop do obvestil"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Dostop do obvestil delovnega profila je blokiran"</string>
@@ -3034,9 +3097,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Dostop do načina »ne moti«"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Nobena nameščena aplikacija ni zahtevala dostopa do načina »ne moti«"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Prikazovanje obvestil te aplikacije je izklopljeno v tej napravi Android."</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Prikazovanje obvestil te kategorije je izklopljeno v tej napravi Android."</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Prikazovanje te skupine obvestil je blokirano v tej napravi Android"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Na vašo zahtevo je prikazovanje obvestil te aplikacije blokirano v tej napravi Android"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Na vašo zahtevo je prikazovanje te kategorije obvestil blokirano v tej napravi Android"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Na vašo zahtevo je prikazovanje te skupine obvestil blokirano v tej napravi Android"</string>
<string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Drugo"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3191,6 +3254,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Poleg tega, da napravo odklepate s prstnim odtisom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vaše geslo. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za geslo za zagon naprave?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Da"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Ne"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Zahtevanje kode PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Zahtevanje vzorca?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Zahtevanje gesla?"</string>
@@ -3332,8 +3397,8 @@
<string name="high_power_off" msgid="3393904131961263278">"Optimizacija uporabe akumulatorja"</string>
<string name="high_power_system" msgid="7362862974428225301">"Optimizacija akumulatorja ni na voljo"</string>
<string name="high_power_desc" msgid="6283926163708585760">"Ne uporabljaj optimizacije akumulatorja. Akumulator se lahko hitreje izprazni."</string>
- <string name="high_power_prompt_title" msgid="6358673688590282655">"Želite omogočiti, da se aplikacija neprekinjeno izvaja v ozadju?"</string>
- <string name="high_power_prompt_body" msgid="1031422980602565049">"Če omogočite, da se <xliff:g id="APP_NAME">%1$s</xliff:g> neprekinjeno izvaja v ozadju, to lahko skrajša čas delovanja akumulatorja. \n\nNastavitev lahko pozneje spremenite v »Nastavitve > Aplikacije in obvestila«."</string>
+ <string name="high_power_prompt_title" msgid="6358673688590282655">"Želite omogočiti stalno izvajanje aplikacije v ozadju?"</string>
+ <string name="high_power_prompt_body" msgid="1031422980602565049">"Če omogočite aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> stalno izvajanje v ozadju, lahko to skrajša čas delovanja na akumulatorsko napajanje. \n\nNastavitev lahko pozneje spremenite v »Nastavitve > Aplikacije in obvestila«."</string>
<string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> uporabe od zadnje polne napolnjenosti"</string>
<string name="battery_power_management" msgid="5571519699679107523">"Upravljanje napajanja"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"Akumulator ni bil uporabljen od zadnje polne napolnjenosti"</string>
@@ -3479,7 +3544,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Trenutni uporabnik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kot <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> je privzeta aplikacija"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"VKLOPLJENO/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"IZKLOPLJENO"</string>
<string name="backup_disabled" msgid="485189128759595412">"Varnostno kopiranje je onemogočeno"</string>
<string name="about_summary" msgid="924181828102801010">"Posodobljeno na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3489,6 +3555,7 @@
<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="6346948990624612516">"Varnostnega kopiranja ni mogoče izklopiti"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"To dejanje je onemogočeno. Če želite izvedeti več, se obrnite na skrbnika organizacije."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Več podrobnosti"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Skrbnik lahko nadzira in upravlja aplikacije ter podatke, povezane s tem delovnim profilom, vključno z nastavitvami, dovoljenji, dostopom za podjetje, omrežno dejavnostjo in podatki o lokaciji naprave."</string>
@@ -3512,9 +3579,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"Delovni profil je izklopljen"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Aplikacije, sinhronizacija v ozadju in druge funkcije, povezane z delovnim profilom, so izklopljeni."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Nastavi razpored za nočno svetlobo"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Jantarno obarvanje zaslona, da lažje zaspite"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"Nočna svetloba je vklopljena"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Zaslon ima jantarni odtenek. To vam lahko pomaga prej zaspati."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Predlagano za vas"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Predlogi"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"in še <xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"in še <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3627,6 +3696,8 @@
<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_none" msgid="5144174674654097316">"Brez"</string>
<string name="special_access" msgid="3458780842491881155">"Posebni dostop za aplikacije"</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>
@@ -3651,31 +3722,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Ploščice razvijalcev za hitre nastavitve"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Tu smo, da vam pomagamo"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Na voljo smo vam 24 ur na dan vse dni v tednu"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Na voljo smo vam 24 ur na dan vse dni v tednu."</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Skupina za podporo je na voljo, da se posveti morebitnim težavam"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Skupina za podporo je na voljo vsak dan ob vsaki uri"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Iščite po pomoči ali se vrnite med delovnim časom podpore (lokalni čas):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Delovni čas telefonske podpore (lokalni čas)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Iskanje po pomoči ali raziskovanje nasvetov in zvijač"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Podpora za:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Potujete po tujini?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Morda boste morali plačati stroške mednarodnih klicev"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Klepet"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Raziskovanje nasvetov in zvijač"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Iskanje po pomoči in pošiljanje povratnih informacij"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Stik s podporo"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prijava"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Se ne morete prijaviti?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Pošiljanje podatkov o sistemu"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne prikaži več"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Zahteva uporabnik"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Dodajanje računa"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Podatki o sistemu"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Sled okna"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Sled površinske plasti"</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>
@@ -3697,11 +3745,11 @@
<item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sekunde</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekund</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Približna čakalna doba: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Upravljanje shrambe"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Upravitelj shrambe vam pomaga sprostiti prostor za shranjevanje, tako da iz naprave odstrani varnostno kopirane fotografije in videoposnetke."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Odstranjevanje fotografij in videoposnetkov"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Upravitelj shrambe"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Uporaba upravitelja shrambe"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Samodejno"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ročno"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Sprostitev prostora"</string>
@@ -3712,32 +3760,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Preklop na fotoaparat"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Če želite hitro odpreti fotoaparat, dvakrat pritisnite gumb za vklop. Deluje na vsakem zaslonu."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Hitro odpiranje fotoaparata"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Odpiranje fotoaparata z dvakratnim pritiskom gumba za vklop"</string>
<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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Vklop načina za sebke z dvojnim zasukom telefona"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Vklop načina za sebke z dvojnim zasukom tablice"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Vklop načina za sebke z dvojnim zasukom naprave"</string>
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dvakrat se dotaknite, da preverite telefon"</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_suggestion_summary" msgid="5987443721392571847">"Preverjanje obvestil pri izklopljenem zaslonu"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Preverjanje obvestil pri izklopljenem zaslonu"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Če želite preveriti obvestila, povlecite navzdol po tipalu prstnih odtisov na hrbtni strani tabličnega računalnika."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Če želite preveriti obvestila, povlecite navzdol po tipalu prstnih odtisov na hrbtni strani naprave."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Hiter ogled obvestil"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Vlečenje navzdol po tipalu prstnih odtisov"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Vklopljeno"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Izklopljeno"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Nalagalnik zagona je že odklenjen"</string>
@@ -3881,8 +3922,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Dostop do imenika"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"dostop do imenika"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index b40152d..92e363f 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Shtyp butonin"</item>
<item msgid="1624323946324499595">"Kodi PIN nga pajisja homologe"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 orë"</item>
<item msgid="5198271470953124739">"Skadim të kohës së veprimit, asnjëherë!"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (I parazgjedhur)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"I dobët"</item>
<item msgid="2042505933058940139">"I dobët"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Mbi 60 ditë të vjetra"</item>
<item msgid="5692284879054004388">"Mbi 90 ditë të vjetra"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Përdor preferencën e rrjetit"</item>
+ <item msgid="8745603368609022803">"Trajto si me matje"</item>
+ <item msgid="2266114985518865625">"Trajto si pa matje"</item>
+ </string-array>
</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 87bfef1..80fa88f 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Pajisjet e tua"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Çifto pajisjen e re"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Lejo pajisjen të çiftohet e të lidhet me pajisjet me Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Çaktivizo zilen brenda të njëjtit brez"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Mos luaj zile telefoni të personalizuara në kufjet me Bluetooth"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Vendos datën"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Rendit alfabetikisht"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rendit sipas brezit orar"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> fillon më <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Ora verore"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Ora standarde"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Brezi orar sipas rajonit"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Brezat orarë me ndryshime fikse"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
<string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Kyçja automatike"</string>
@@ -340,6 +347,8 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Mesazhi i ekranit të kyçjes"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktivizo miniapl."</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Çaktivizuar nga administratori"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Shfaq opsionin e bllokimit"</string>
+ <string name="lockdown_settings_summary" msgid="8678086272188880615">"Shfaq opsionin e butonit të energjisë që çaktivizon qasjen e zgjeruar dhe shkyçjen me gjurmën e gishtit."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Asnjë"</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">"P.sh., pajisja Android e Admirit."</string>
@@ -348,6 +357,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Inform. i profilit"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Llogaritë"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Vendndodhja"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Përdor vendndodhjen"</string>
<string name="account_settings_title" msgid="626177544686329806">"Llogaritë"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Siguria dhe vendndodhja"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptimi dhe kredencialet"</string>
@@ -459,9 +469,11 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Fjalëkalimi që fute është i saktë, por fatkeqësisht të dhënat e tua janë të dëmtuara. \n\nPër të rifilluar përdorimin e tabletit, duhet të kryesh një vendosje në gjendje fabrike. Pas kësaj, do të kesh mundësinë për të restauruar çdo të dhënë që është rezervuar në llogarinë e Google."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Fjalëkalimi që fute është i saktë, por fatkeqësisht të dhënat e tua janë të dëmtuara. \n\nPër të rifilluar përdorimin e telefonit, duhet të kryesh një vendosje në gjendje fabrike. Pas kësaj, do të kesh mundësinë për të restauruar çdo të dhënë që është rezervuar në llogarinë e Google."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Ndërro metodën e hyrjes"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Vendos kyçjen e ekranit"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Mbroje pajisjen tënde"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Përdor gjurmën e gishtit"</string>
+ <string name="suggested_lock_settings_title" msgid="8195437597439375655">"Cakto kyçjen e ekranit për siguri"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="7915739444107426777">"Parandalo që të tjerët të mos e përdorin tabletin tënd"</string>
+ <string name="suggested_lock_settings_summary" product="device" msgid="9202820303111653610">"Parandalo që të tjerët të mos e përdorin pajisjen tënde"</string>
+ <string name="suggested_lock_settings_summary" product="default" msgid="1252628838133344781">"Parandalo që të tjerët të mos e përdorin telefonin tënd"</string>
+ <string name="suggested_fingerprint_lock_settings_title" msgid="414499342011664436">"Shkyçe me gjurmën e gishtit"</string>
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Shkyçe me gjurmën e gishtit"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Zgjidh kyçjen e ekranit"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Zgjidh kyçjen e punës"</string>
@@ -691,6 +703,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Si altoparlant"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Për muzikë dhe media"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kujto cilësimet"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Numri maksimal i pajisjeve të lidhura audio me Bluetooth"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Zgjidh numrin maksimal të pajisjeve të lidhura audio me Bluetooth"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmetimi"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivizo shfaqjen e rrjetit valor"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nuk u gjet asnjë pajisje në afërsi."</string>
@@ -705,6 +719,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Emri"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Identifikohu"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> kërkon të aktivizojë Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> kërkon të çaktivizojë Wi-Fi"</string>
@@ -722,6 +737,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Aktivizo Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Përdor Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Cilësimet e Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Cakto dhe menaxho zonat e qasjes të rrjetit me valë"</string>
@@ -816,6 +832,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Fjalëkalimi"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Shfaq fjalëkalimin"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Zgjidh bandën AP"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatik"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Bandë 2,4 GHz"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Bandë 5 GHz"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Cilësimet e IP-së"</string>
@@ -833,7 +850,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Ofrohet WPS)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Fut fjalëkalimin e rrjetit"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Rrjeti Wi-Fi i operatorit celular"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"E lidhur përmes <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"E lidhur përmes <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Për të përmirësuar saktësinë e vendndodhjes dhe për qëllime të tjera, <xliff:g id="APP_NAME">%1$s</xliff:g> dëshiron të aktivizojë skanimin e rrjetit, edhe kur Wi-Fi është joaktiv.\n\nTë lejohet kjo për të gjitha aplikacionet që dëshirojnë të skanojnë?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Për ta çaktivizuar këtë, shko te \"Të përparuara\" në menynë e tejkalimit."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Lejo"</string>
@@ -909,10 +926,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Brezi AP"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Përdor zonën e qasjes së internetit për të krijuar një rrjet Wi‑Fi për pajisjet e tua të tjera. Zona e qasjes e internetit ofron internet duke përdorur lidhjen e të dhënave celulare. Mund të zbatohen tarifa shtesë për të dhënat celulare."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacionet mund të krijojnë një zonë qasjeje të internetit për të ndarë përmbajtje me pajisjet në afërsi."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Çaktivizo automatikisht zonën e qasjes për internet"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Zona e qasjes për internet e Wi‑Fi do të çaktivizohet nëse nuk është lidhur asnjë pajisje"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Po aktivizon zonën e qasjes..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Po çaktivizon zonën e qasjes..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> është aktiv"</string>
@@ -923,7 +938,7 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Zona Android e qasjes së lirë për internet"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Telefonata me Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Aktivizo \"Telefonatën me Wi-Fi\""</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Përdor Wi-Fi në vend të rrjetit celular"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="4277772016570248405">"Zgjero mbulimin duke telefonuar nëpërmjet Wi-Fi"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferenca e telefonatës"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modaliteti i telefonatës me Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Preferenca e roaming-ut"</string>
@@ -961,6 +976,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Adresa e urgjencës"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Përdoret si vendndodhja jote kur kryen një telefonatë urgjence me Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Mëso më shumë"</annotation>" rreth funksioneve të \"DNS-së private\""</string>
<string name="display_settings_title" msgid="1708697328627382561">"Paraqitja"</string>
<string name="sound_settings" msgid="5534671337768745343">"Tingulli"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Volumet"</string>
@@ -1175,6 +1191,7 @@
<string name="status_network_type" msgid="3279383550222116235">"Lloji i rrjetit celular"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Informacioni i operatorit"</string>
<string name="status_data_state" msgid="5503181397066522950">"Gjendja e rrjetit celular"</string>
+ <string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
<string name="status_service_state" msgid="2323931627519429503">"Gjendja e shërbimit"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Fuqia e sinjalit"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -1308,6 +1325,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> po funksionon. \n\nPër të zhvendosur fotografitë, skedarët dhe të dhënat e aplikacioneve te kjo pajisje, shko te Cilësimet > Hapësira ruajtëse."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Zhvendos <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Zhvendosja e aplikacionit <xliff:g id="APP">^1</xliff:g> dhe të dhënave të tij te <xliff:g id="NAME_0">^2</xliff:g> do të zgjasë vetëm pak çaste. Nuk do të jesh në gjendje ta përdorësh aplikacionin derisa zhvendosja të përfundojë. \n\n<xliff:g id="NAME_1">^2</xliff:g> nuk duhet të hiqet gjatë zhvendosjes."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Për të hequr të dhënat të nevojitet të shkyçësh përdoruesin <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Po zhvendos <xliff:g id="APP">^1</xliff:g> ..."</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Mos e hiq kartën <xliff:g id="NAME">^1</xliff:g> gjatë zhvendosjes. \n\nAplikacioni <xliff:g id="APP">^2</xliff:g> në këtë pajisje nuk do të mund të përdoret derisa të përfundojë zhvendosja."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Anulo zhvendosjen"</string>
@@ -1360,19 +1378,23 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Rrjeti, aplikacionet ose pajisja mund të rivendosen"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Rivendos Wi-Fi, lidhjen celulare dhe Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Kjo do të rivendosë të gjitha cilësimet e rrjetit, duke përfshirë:\n\n"<li>"Wi‑Fi"</li>\n<li>"Të dhënat celulare"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Rivendos gjithashtu kartat eSIM"</string>
+ <string name="reset_esim_desc" msgid="6412324670559060446">"Spastro të gjitha kartat eSIM në telefon. Do të duhet të kontaktosh me operatorin celular për të rishkarkuar kartat e tua eSIM. Kjo nuk do të anulojë planin tënd të shërbimit celular."</string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Rivendos cilësimet"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Të rivendosen të gjitha cilësimet e rrjetit? Ky veprim nuk mund të zhbëhet!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Rivendos cilësimet"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Të rivendosen?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Rivendosja e rrjetit nuk është e disponueshme për këtë përdorues"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Cilësimet e rrjetit janë rivendosur"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Kartat eSIM nuk mund të rivendosen"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Kartat eSIM nuk mund të rivendosen për shkak të një gabimi."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" e tabletit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" e telefonit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Je i identifikuar aktualisht në llogaritë e mëposhtme:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Ka përdorues të tjerë të pranishëm në këtë pajisje.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Fotografitë"</li>\n<li>"Të dhëna të tjera të përdoruesit"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatorët celularë në eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"Kartat eSIM"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Kjo nuk do ta anulojë planin tënd të shërbimit celular."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"hapësira ruajtëse e USB-së"</b>" duhet të spastrohet."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"karta SD"</b>" duhet të spastrohet."</string>
@@ -1432,21 +1454,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Lidhu me internetin"</string>
<string name="location_title" msgid="1029961368397484576">"Vendndodhja ime"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Vend. për profilin e punës"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Modaliteti"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Saktësi e lartë"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Kursimi i baterisë"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Vetëm pajisja"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Vendndodhja është çaktivizuar"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Lejet në nivel aplikacioni"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Kërkesat e vendndodhjeve të fundit"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Asnjë aplikacion nuk ka kërkuar vendndodhje kohët e fundit"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Shërbimet e vendndodhjes"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Përdorimi i lartë i baterisë"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Përdorim i ulët baterie"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Vendndodhja"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Përdor funksionin GPS, Wi‑Fi, Bluetooth ose rrjetet celulare për të përcaktuar vendndodhjen"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Përdor funksionin Wi‑Fi, Bluetooth ose rrjetet celulare për të përcaktuar vendndodhjen"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Përdor GPS-në dhe sensorët e pajisjes për të përcaktuar vendndodhjen"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Po skanon"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Skanimi i Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Përmirëso vendndodhjen duke lejuar aplikacionet dhe shërbimet e sistemit të zbulojnë rrjetet Wi-Fi në çdo kohë."</string>
@@ -1468,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Burimet e vendndodhjes"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Rreth tabletit"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Informacion mbi telefonin"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Informacione rreth pajisjes"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Rreth emulatorit"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Shiko informacionin ligjor, statusin dhe versionin e softuerit"</string>
<string name="legal_information" msgid="5769301644270604095">"Informacioni ligjor"</string>
@@ -1575,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Shiko të <xliff:g id="COUNT">%1$d</xliff:g> aplikacionet"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tableti dhe të dhënat e tua personale janë më të cenueshme për t\'u sulmuar nga aplikacione të panjohura. Duke instaluar aplikacionet nga ky burim, ti pranon se je plotësisht përgjegjës për çdo dëm ndaj tabletit ose çdo humbje të dhënash që mund të rezultojë nga përdorimi i tyre."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefoni dhe të dhënat e tua personale janë më të cenueshme për t\'u sulmuar nga aplikacione të panjohura. Duke instaluar aplikacionet nga ky burim, ti pranon se je plotësisht përgjegjës për çdo dëm ndaj telefonit ose çdo humbje të dhënash që mund të rezultojë nga përdorimi i tyre."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Pajisja dhe të dhënat e tua personale janë më të cenueshme nga sulmet nga aplikacionet e panjohura. Duke instaluar aplikacionet nga ky burim, ti pranon se je përgjegjës për çdo dëm ndaj pajisjes tënde ose çdo humbje të të dhënave që mund të rezultojë nga përdorimi i tyre."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Cilësimet e përparuara"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Aktivizo më shumë opsione të cilësimeve"</string>
<string name="application_info_label" msgid="5736524913065714880">"Informacioni i apl."</string>
@@ -1874,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Mund të ndikojë te cilësia e funksionimit"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kliko pasi kursori të ndalojë së lëvizuri"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Vonesa përpara klikimit"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"AKTIVE"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"JOAKTIVE"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Shfaq në Cilësimet e shpejta"</string>
@@ -1987,7 +2005,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> të mbetura"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> për të ngarkuar"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Aktiviteti në sfond"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"I kufizuar"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Lejo që aplikacioni të ekzekutohet në sfond"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Aplikacioni mund të ekzekutohet në sfond kur nuk është në përdorim."</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Aktiviteti në sfond i aplikacionit është i kufizuar kur nuk është në përdorim"</string>
@@ -2030,14 +2048,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Bateria është në formë të mirë"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikacionet sillen normalisht"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Kapacitet i ulët i baterisë"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateria nuk mund të ofrojë jetëgjatësi të mirë"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Aktivizo menaxherin e baterisë inteligjente"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Aktivizoje për të optimizuar përdorimin e baterisë"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Aktivizo modalitetin e \"Baterisë së ulët\""</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Zgjat jetëgjatësinë e baterisë"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Modaliteti i \"Baterisë së ulët\" është aktiv"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Disa funksione janë të kufizuara"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefoni është përdorur shumë"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tableti është përdorur shumë"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Pajisja është përdorur shumë"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Përdorur për rreth <xliff:g id="HOUR">%1$s</xliff:g> që nga ngarkimi i fundit i plotë"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Telefoni është përdorur shumë dhe kjo gjë ka konsumuar shumë bateri. Bateria jote po sillet në mënyrë normale.\n\n Telefoni yt është përdorur për rreth <xliff:g id="HOUR">%1$s</xliff:g> që nga ngarkimi i fundit i plotë.\n\n Përdorimi në total:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Tableti është përdorur shumë dhe kjo gjë ka konsumuar shumë bateri. Bateria jote po sillet në mënyrë normale.\n\n Tableti yt është përdorur për rreth <xliff:g id="HOUR">%1$s</xliff:g> që nga ngarkimi i fundit i plotë.\n\n Përdorimi në total:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Pajisja është përdorur shumë dhe kjo gjë ka konsumuar shumë bateri. Bateria jote po sillet në mënyrë normale.\n\n Pajisja jote është përdorur për rreth <xliff:g id="HOUR">%1$s</xliff:g> që nga ngarkimi i fundit i plotë.\n\n Përdorimi në total:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Menaxheri inteligjent i baterisë"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Menaxho automatikisht baterinë"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Përshtat automatikisht përdorimin e energjisë nga aplikacionet në bazë të përdorimit"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Aplikacionet e kufizuara"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d aplikacione</item>
+ <item quantity="one">%1$d aplikacion</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Të ndalohet aplikacioni?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefoni yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> po e mban zgjuar telefonin.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh aplikacionin.\n\nNëse kjo vazhdon të ndodhë, mund të jetë e nevojshme ta çinstalosh aplikacionin për të përmirësuar cilësinë e funksionimit të baterisë."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tableti yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> po e mban zgjuar tabletin.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh aplikacionin.\n\nNëse kjo vazhdon të ndodhë, mund të jetë e nevojshme ta çinstalosh aplikacionin për të përmirësuar cilësinë e funksionimit të baterisë."</string>
@@ -2146,6 +2181,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Serveri i medias"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizimi i aplikacionit"</string>
<string name="battery_saver" msgid="8172485772238572153">"Kursyesi i baterisë"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Përdor \"Kursyesin e baterisë\""</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Aktivizim automatikisht"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Asnjëherë"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"me <xliff:g id="PERCENT">%1$s</xliff:g> bateri"</string>
@@ -2333,8 +2369,9 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Sinkronizimi ka aktualisht probleme. Do të ofrohet sërish së shpejti."</string>
<string name="add_account_label" msgid="7811707265834013767">"Shto një llogari"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Profili i punës nuk ofrohet ende"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Modaliteti i punës"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Lejoje profilin e punës të funksionojë, duke përfshirë aplikacionet, sinkronizimin në sfond dhe funksionet e lidhura"</string>
+ <string name="work_mode_label" msgid="7157582467956920750">"Profili i punës"</string>
+ <string name="work_mode_on_summary" msgid="3628349169847990263">"Menaxhohet nga organizata jote"</string>
+ <string name="work_mode_off_summary" msgid="2657138190560082508">"Aplikacionet dhe njoftimet janë joaktive"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Hiq profilin e punës"</string>
<string name="background_data" msgid="5779592891375473817">"Të dhënat në sfond"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Aplikacionet mund të sinkronizojnë, dërgojnë dhe marrin të dhëna në çdo kohë"</string>
@@ -2366,6 +2403,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Të hiqet llogaria?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Heqja e kësaj llogarie do të fshijë të gjitha mesazhet, kontaktet dhe të dhëna të tjera të saj nga tableti!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Heqja e kësaj llogarie do të fshijë nga telefoni të gjitha mesazhet dhe kontaktet e saj, si dhe të dhëna të tjera!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Heqja e kësaj llogarie do të fshijë të gjitha mesazhet, kontaktet e saj dhe të dhëna të tjera nga pajisja!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Ky ndryshim nuk lejohet nga administratori yt"</string>
<string name="provider_label" msgid="7724593781904508866">"Abonimet me shtytje"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2622,8 @@
<item quantity="other">Kontrollo certifikatat</item>
<item quantity="one">Kontrollo certifikatën</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Përdoruesit"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Përdoruesit dhe profilet"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Shto një përdorues ose një profil"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Shto përdorues"</string>
@@ -2774,7 +2813,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Transmetimi"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacionet dhe njoftimet"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Lejet, aplikacionet e parazgjedhura"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"Përdoruesit dhe llogaritë"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplikacionet 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>
@@ -2805,7 +2845,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"mos, mos shqetëso, ndërprit, ndërprerje, pushim"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"në afërsi, vendndodhje, historik, raportim"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"saktësia"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"llogaria"</string>
<string name="keywords_users" msgid="3434190133131387942">"kufizimi, kufizo, të kufizuara"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"korrigjim teksti, saktë, zë, dridhje, automatike, gjuhë, gjest, sugjero, sugjerim, temë, ofenduese, fjalë, emoji. ndërkombëtare"</string>
@@ -2872,6 +2911,7 @@
<item quantity="one">1 rregull</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Mos shqetëso"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Aktivizo \"Mos shqetëso\""</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Sjellja"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Lejo tingujt dhe dridhjet nga"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Asnjë tingull"</string>
@@ -2881,8 +2921,9 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Aktivizo automatikisht"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Rregullat automatike"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Rregulli automatik"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Cakto rregullat për \"Mos shqetëso\""</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Kufizo tingujt dhe dridhjet në kohë të caktuara"</string>
+ <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Vendose telefonin në heshtje në kohë të caktuara"</string>
+ <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"Cakto rregullat për \"Mos shqetëso\""</string>
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Përdor rregullin"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Vetëm njoftimet me prioritet"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Vetëm alarmet"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Heshtje e plotë"</string>
@@ -2890,12 +2931,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blloko shqetësimet vizuale"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Lejo sinjalet vizuale"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Shto"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"AKTIVIZO TANI"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ÇAKTIVIZO TANI"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Aktivizo"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Aktivizo tani"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Çaktivizo tani"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Modaliteti \"Mos shqetëso\" është aktiv deri në <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Modaliteti \"Mos shqetëso\" do të qëndrojë aktiv deri sa ta çaktivizosh"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Modaliteti \"Mos shqetëso\" është aktivizuar automatikisht nga një rregull <xliff:g id="RULE_NAME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Modaliteti \"Mos shqetëso\" është aktivizuar automatikisht nga një aplikacion <xliff:g id="APP_NAME">%s</xliff:g>"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Vetëm me prioritet"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Tingujt e profilit të punës"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Përdor tingujt e profilit personal"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Tingujt janë të njëjtë për profilin tënd personal dhe atë të punës"</string>
@@ -2911,6 +2955,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Zilet"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Tinguj dhe dridhje të tjera"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Njoftime"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Dërguar së fundi"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Të përparuara"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Njoftimet e punës"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Lejo pikat e njoftimeve"</string>
@@ -2930,7 +2975,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Njoftimet e apl."</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Kategoria e njoftimeve"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Grupi i kategorisë së njoftimeve"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Rëndësia"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Sjellja"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Lejo tingullin"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Mos i shfaq asnjëherë njoftimet"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Asnjë tingull apo ndërprerje vizuale"</string>
@@ -2948,6 +2993,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Rëndësi mesatare"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Rëndësi e lartë"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Rëndësi urgjente"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Shfaq njoftimet"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Asistenti i njoftimeve"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Qasja te njoftimet"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Qasja në njoftimet e profilit të punës është bllokuar"</string>
@@ -2978,9 +3024,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Qasja te \"Mos shqetëso\""</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Asnjë aplikacion i instaluar nuk ka kërkuar qasje te \"Mos shqetëso\""</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Po ngarkon aplikacionet..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android po bllokon shfaqjen e njoftimeve të këtij aplikacioni në këtë pajisje"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android po bllokon shfaqjen e kësaj kategorie njoftimesh në këtë pajisje"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android po bllokon shfaqjen e këtij grupi njoftimesh në këtë pajisje"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Me kërkesën tënde, Android po bllokon shfaqjen e njoftimeve të këtij aplikacioni në këtë pajisje"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Me kërkesën tënde, Android po bllokon shfaqjen e kësaj kategorie njoftimesh në këtë pajisje"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Me kërkesën tënde, Android po bllokon shfaqjen e këtij grupi njoftimesh në këtë pajisje"</string>
<string name="notification_channels" msgid="5346841743182627500">"Kategoritë"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Të tjera"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3171,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Përveç përdorimit të gjurmës të gishtit për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar fjalëkalimin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet fjalëkalimi për të nisur pajisjen?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Po"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Jo"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Po"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Jo"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Të kërkohet kodi PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Të kërkohet motivi?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Të kërkohet fjalëkalim?"</string>
@@ -3397,7 +3445,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Përdoruesi aktual: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Identifikuar si <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> është i parazgjedhur"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"AKTIV / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"JOAKTIV"</string>
<string name="backup_disabled" msgid="485189128759595412">"Rezervimi u çaktivizua"</string>
<string name="about_summary" msgid="924181828102801010">"Përditësuar në Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3407,6 +3456,7 @@
<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="6346948990624612516">"Nuk mund çaktivizohen rezervimet"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Ky veprim është çaktivizuar. Kontakto me administratorin e organizatës tënde për të mësuar më shumë."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Më shumë detaje"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Administratori yt mund të monitorojë dhe të menaxhojë aplikacionet dhe të dhënat e lidhura me profilin tënd të punës, duke përfshirë cilësimet, lejet, qasjen e korporatës, aktivitetin e rrjetit dhe informacionet e vendndodhjes së pajisjes."</string>
@@ -3430,9 +3480,10 @@
<string name="condition_work_title" msgid="7293722361184366648">"Profili i punës është i çaktivizuar"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Janë çaktivizuar aplikacionet, sinkronizimi në sfond dhe veçoritë e tjera që lidhen me profilin e punës."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Vendos planifikimin e \"Dritës së natës\""</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Cakto ekranin në nuancën e qelibarit për të të ndihmuar të flesh"</string>
+ <string name="night_display_suggestion_summary" msgid="228346372178218442">"Cakto automatikisht një nuancë të ekranit çdo natë"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"\"Drita e natës\" është aktive"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Ekrani është me nuancë qelibari. Kjo mund të të ndihmojë të biesh në gjumë."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Të sugjeruara për ty"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Sugjerime"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> të tjera"</string>
@@ -3537,6 +3588,8 @@
<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_none" msgid="5144174674654097316">"Asnjë"</string>
<string name="special_access" msgid="3458780842491881155">"Qasja e veçantë e aplikacionit"</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>
@@ -3559,31 +3612,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Pllakëzat e zhvilluesit të cilësimeve të shpejta"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Ne jemi këtu për të ndihmuar"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Ne jemi këtu për ty 24 orë në ditë"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Ne jemi këtu për ty 24 orë në ditë"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Ekipi ynë i mbështetjes është këtu për t\'iu përgjigjur çdo problemi"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Ekipi ynë i mbështetjes është i disponueshëm gjatë të gjithë ditës, çdo ditë"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Kërko ndihmë ose kthehu sërish gjatë orarit lokal të mbështetjes (ora lokale):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Orari i mbështetjes me telefon (ora lokale)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Kërko ndihmë ose kërko te këshillat dhe marifetet"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Mbështetje për:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Po udhëton jashtë vendit?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Mund të aplikohen tarifa ndërkombëtare"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefoni"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Biseda"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Eksploro këshillat dhe të fshehtat"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Kërko për ndihmë dhe dërgo komente"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Kontakto me ndihmën"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Identifikohu"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Nuk mund të identifikohesh?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Dërgo informacionet e sistemit"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Mos e shfaq përsëri"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Po kërkon si"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Shto llogari"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Informacioni i sistemit"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Gjurma e dritares"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Gjurmimi i sipërfaqes"</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>
@@ -3599,11 +3629,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekonda</item>
<item quantity="one">1 sekondë</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Pritja ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Menaxho hapësirën ruajtëse"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Për të ndihmuar në lirimin e hapësirës ruajtëse, menaxheri i hapësirës ruajtëse i heq fotografitë dhe videot e rezervuara nga pajisja jote."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Hiq fotografitë dhe videot"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Menaxheri i hapësirës ruajtëse"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Përdor \"Menaxherin e hapësirës ruajtëse\""</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatike"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liro hapësirën tani"</string>
@@ -3614,32 +3644,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kalo te kamera"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Për të hapur me shpejtësi kamerën, shtyp dy herë te butoni i energjisë. Funksionon nga çdo ekran."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Hap kamerën me shpejtësi"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Shtyp dy herë butonin e energjisë për të hapur kamerën"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Rrotulloje kamerën"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Bëj selfi më shpejt"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Rrotullo dy herë telefonin për modalitetin për selfi"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Rrotullo dy herë tabletin për modalitetin për selfi"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Rrotullo dy herë pajisjen për modalitetin për selfi"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Kontrollo njoftimet kur ekrani është joaktiv"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Kontrollo njoftimet kur ekrani është joaktiv"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Rrëshqit shpejt 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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Për të kontrolluar njoftimet, rrëshqit poshtë në sensorin e gjurmës së gishtit në pjesën e pasme të tabletit."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Për të kontrolluar njoftimet, rrëshqit poshtë në sensorin e gjurmës së gishtit në pjesën e pasme të pajisjes."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Shiko njoftimet me shpejtësi"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Rrëshqit shpejt poshtë mbi sensorin e gishtit"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Aktiv"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Joaktiv"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Ngarkuesi i sistemit është i shkyçur tashmë"</string>
@@ -3769,8 +3792,19 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Qasja në direktori"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"qasja në direktori"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <string name="my_device_info_title" product="default" msgid="5512426315065239032">"Telefoni im"</string>
+ <string name="my_device_info_title" product="tablet" msgid="7850936731324591758">"Tableti im"</string>
+ <string name="my_device_info_title" product="device" msgid="5512071003076176919">"Pajisja ime"</string>
+ <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Llogaria"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Emri i pajisjes"</string>
+ <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Përdor Bluetooth kur je në makinë"</string>
+ <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktivizo Bluetooth-in automatikisht gjatë drejtimit të makinës"</string>
</resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 4374d27..acaf6cb 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Kichupo cha kusukuma"</item>
<item msgid="1624323946324499595">"PIN kutoka kwa kifaa cha rika"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"Saa 1"</item>
<item msgid="5198271470953124739">"Kamwe muda usiishe"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (Chaguo-msingi)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Mbaya"</item>
<item msgid="2042505933058940139">"Dhaifu"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"Zilizokaa zaidi ya siku 60"</item>
<item msgid="5692284879054004388">"Zilizokaa zaidi ya siku 90"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Tumia mapendeleo ya mtandao"</item>
+ <item msgid="8745603368609022803">"Tumia kama mtandao unaopima data"</item>
+ <item msgid="2266114985518865625">"Tumia kama mtandao usiopima data"</item>
+ </string-array>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8b611d6..ede3f07 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vifaa vyako"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Oanisha kifaa kipya"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Ruhusu kifaa kuoanisha na kuunganisha kwenye vifaa vya Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Zima kipengele cha mlio ule ule"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Usiweke milio maalum ya simu kwenye vifaa vya sauti vya Bluetooth"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Kwa sasa imeunganishwa"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Vifaa vilivyohifadhiwa"</string>
<string name="connected_device_add_device_title" msgid="7803521577708810621">"Ongeza kifaa"</string>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Weka tarehe"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Panga kialfabeti"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Panga kulingana na saa za eneo"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> itaanza <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Kuongeza saa za mchana"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Saa za kawaida"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Saa za eneo kulingana na mahali"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Saa za eneo zenye thamani isiyobadilika"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Tarehe"</string>
<string name="time_picker_title" msgid="483460752287255019">"Saa"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Funga kiotomatiki"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Ujumbe kwenye skrini wakati imefungwa"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Washa wijeti"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Imezimwa na msimamizi"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Hamna"</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">"Mfano, Android ya Joe."</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Maelezo ya wasifu"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Akaunti"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Kutambua Eneo"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Tumia mahali"</string>
<string name="account_settings_title" msgid="626177544686329806">"Akaunti"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Mahali na usalama"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Vitambulisho na usimbaji fiche"</string>
@@ -459,9 +471,16 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Nenosiri uliloandika ni sahihi, lakini kwa bahati mbaya data yako ina hitilafu. \n\nIli uendelee kutumia kompyuta yako kibao, unahitaji kurejesha mipangilio iliyotoka nayo kiwandani. Wakati wa kuweka mipangilio mipya baada ya kurejesha ile ya kiwandani, utakuwa na nafasi ya kurejesha data yoyote ambayo nakala yake ilikuwa imehifadhiwa katika Akaunti yako ya Google."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Nenosiri uliloweka ni sahihi, lakini kwa bahati mbaya data yako ina hitilafu. \n\nIli uendelee kutumia simu yako, unahitaji kurejesha mipangilio iliyotoka nayo kiwandani. Wakati wa kuweka mipangilio kwenye simu yako baada ya kurejesha ile ya kiwandani, utakuwa na nafasi ya kurejesha data yoyote ambayo nakala yake ilikuwa imehifadhiwa katika Akaunti yako ya Google."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Kubadili mbinu ya kuingiza data"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Weka mbinu ya kufunga skrini"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Linda kifaa chako"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Tumia alama ya kidole"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Fungua ukitumia alama ya kidole chako"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Mbinu ya kufunga skrini"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Chagua mbinu ya kufunga wasifu wa kazini"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kama simu ya spika"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"lli kupata muziki na faili zingine"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kumbuka mipangilio"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Kima cha juu zaidi cha vifaa vya sauti vya Bluetooth vilivyounganishwa"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Chagua kima cha juu zaidi cha vifaa vya sauti vya Bluetooth vilivyounganishwa"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Tuma"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Washa kuonyesha skrini bila kutumia waya"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Hakuna vifaa vilivyopatikana karibu."</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Jina"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"GHz 2.4"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"GHz 5"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Ingia katika akaunti"</string>
<string name="link_speed" msgid="8896664974117585555">"Mbps %1$d"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> inataka kuwasha Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> inataka kuzima Wi-Fi"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Washa Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Tumia Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Mipangilio ya Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Weka na udhibiti vituo vya kufikia mitandao-hewa"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Nenosiri"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Onyesha nenosiri"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Chagua Bendi ya AP"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Otomatiki"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Bendi ya GHz 2.4"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Bendi ya GHz 5"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Mipangilio ya IP"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS inapatikana"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Weka nenosiri la mtandao wako"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Mtandao wa mtoa huduma wa Wi‑Fi"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Unganisha kupitia <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Unganisha kupitia <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ili kuboresha usahihi wa mahali na kwa madhumuni mengine, <xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha ukaguaji mitandao, hata wakati Wi-Fi imezimwa.\n\nJe, ungependa kuruhusu programu zote ambazo zingependa kukagua ziweza kufanya hivyo?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ili uzime hii, nenda kwenye Mahiri katika menyu ya vipengee vya ziada."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruhusu"</string>
@@ -909,10 +933,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bendi ya AP"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Tumia kipengele cha mtandao pepe kuunda mtandao wa Wi-Fi kwa ajili ya vifaa vyako vingine. Mtandao pepe hutoa huduma ya intaneti ikitumia muunganisho wa data kwa simu za mkononi. Huenda ukalipia ada za kutumia data ya mtandao wa simu."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programu zinaweza kuunda mtandao-hewa ili kushiriki maudhui na vifaa vilivyo karibu."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Zima mtandao-hewa kiotomatiki"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Mtandao-hewa wa Wi-Fi utazimwa ikiwa hakuna vifaa vilivyounganishwa"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Inawezesha mtandao-hewa…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Inazima intaneti..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> inatumika"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Upigaji simu kwa Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Washa kipengele cha Kupiga Simu Kupitia Wi-Fi"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Tumia mtandao wa Wi-Fi badala ya mtandao wa simu"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Mapendeleo ya kupiga simu"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Hali ya upigaji simu kwa Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Mapendeleo ya matumizi ya mitandao mingine"</string>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Anwani ya Dharura"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Inatumika kama anwani ya mahali ulipo ikiwa utapiga simu ukitumia Wi‑Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Pata maelezo zaidi"</annotation>" kuhusu vipengele vya DNS ya Faragha"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
<string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Sauti"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"Aina ya mtandao wa simu ya mkononi"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Maelezo ya mtoa huduma"</string>
<string name="status_data_state" msgid="5503181397066522950">"Hali ya mtandao wa simu ya mkononi"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"Hali ya huduma"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Nguvu za mawimbi"</string>
<string name="status_roaming" msgid="2638800467430913403">"Uko nje ya mtandao wako wa kawaida"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> yako mpya inafanya kazi. \n\nKuhamishia picha, faili na data ya programu kwenye kifaa hiki, nenda kwenye Mipangilio > Hifadhi."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Hamisha <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Kuhamisha <xliff:g id="APP">^1</xliff:g> na data yake kwenda <xliff:g id="NAME_0">^2</xliff:g> kutachukua dakika chache tu. Hutaweza kutumia programu hadi ukamilishe kuhamisha. \n\nUsiondoe <xliff:g id="NAME_1">^2</xliff:g> wakati wa kuhamisha."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Ili kuhamisha data, unahitaji kufungua <xliff:g id="APP">^1</xliff:g> ya mtumiaji."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Inahamisha <xliff:g id="APP">^1</xliff:g>..."</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Usionde <xliff:g id="NAME">^1</xliff:g> wakati wa kuhamisha. \n\nProgramu ya <xliff:g id="APP">^2</xliff:g> haitapatikana kwenye kifaa hiki hadi ukamilishe kuhamisha."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Ghairi kuhamisha"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Unaweza kubadilisha mipangilio ya mtandao, programu au kifaa"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Badilisha mipangilio ya Wi-Fi, data ya simu na Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Hatua itabadilisha mipangilio yote ya mtandao ikiwa ni pamoja:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data ya simu"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Futa pia data ya eSIM"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"Badilisha mipangilio"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Ungependa kuweka upya mipangilio yote ya mtandao? Huwezi kutendua kitendo hiki."</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Badilisha mipangilio"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Iwekwe upya?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Kuweka upya mtandao hakupatikani kwa mtumiaji huyu"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Mipangilio ya mtandao imewekwa upya"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Imeshindwa kufuta data ya eSIM"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"Hitilafu imetokea wakati wa kufuta data ya eSIM."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Futa data yote (rejesha mipangilio ambayo kifaa kilitoka nayo kiwandani)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya kompyuta kibao"</b>", pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya simu"</b>", pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Kuna watumiaji wengine waliopo kwenye kifaa hiki.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Vipengee vilivyo kwenye eSIM"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Hatua hii haitaghairi mpango wako wa huduma ya simu ya mkononi."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>" hifadhi ya "</b>" inahitaji kufutwa."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ili kufuta muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya"</b>" inahitaji kufutwa."</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Tafadhali unganisha kwenye Intaneti"</string>
<string name="location_title" msgid="1029961368397484576">"Mahali pangu"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Eneo la wasifu wa kazini"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Hali"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Usahihi wa hali ya juu"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Hali inayookoa betri"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Kifaa tu"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Kitambua eneo kimezimwa"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Ruhusa za kiwango cha programu"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Maombi ya hivi karibuni ya kutambua eneo"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Hakuna programu iliyotaka kutambua eneo hivi karibuni"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Huduma za kutambua eneo"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Matumizi ya betri ya hali ya juu"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Huwa haitumii chaji nyingi"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Hali ya eneo"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Tumia GPS, Wi‑Fi, Bluetooth au mitandao ya simu ili kutambua mahali"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Tumia Wi-Fi, Bluetooth au mitandao ya simu ili kutambua mahali"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Tumia GPS na vitambuzi vya vifaa ili kutambua mahali kifaa kilipo"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Kuchanganua"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Kuchanganua Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Boresha utambuzi wa mahali kwa kuruhusu programu na huduma za mifumo zitambue mitandao ya Wi-Fi wakati wowote."</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Vyanzo vya eneo"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Kuhusu kompyuta kibao"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Kuhusu simu"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Kuhusu kifaa"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Kuhusu kifaa kinachoigwa"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Angalia maelezo ya kisheria, hadhi, toleo la programu"</string>
<string name="legal_information" msgid="5769301644270604095">"Maelezo ya kisheria"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Angalia programu zote <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Data yako ya binafsi na ya kompyuta kibao yako zinaweza kuathiriwa na programu ambazo hazijulikani. Kwa kusakinisha programu kutoka chanzo hiki, unakubali kuwajibika kila wakati kutokana na uharibifu wowote kwenye simu yako au kupotea kwa data kutokana na matumizi yake."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Data yako ya binafsi na ya simu yako zinaweza kuathiriwa na programu ambazo hazijulikani. Kwa kusakinisha programu kutoka chanzo hiki, unakubali kuwajibika kila wakati kutokana na uharibifu wowote kwenye simu yako au kupotea kwa data kutokana na matumizi yake."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Data yako ya binafsi na ya kifaa chako inaweza kuathiriwa na programu ambazo hazijulikani. Kwa kusakinisha programu kutoka chanzo hiki, unakubali kuwajibikia uharibifu wowote kwenye kifaa chako au kupotea kwa data kutokana na matumizi ya programu hizo."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Mipangilio ya kina"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Wezesha chaguo zaidi ya mipangilio."</string>
<string name="application_info_label" msgid="5736524913065714880">"Maelezo ya programu"</string>
@@ -1596,7 +1621,7 @@
<string name="total_size_label" msgid="1048676419552557254">"Jumla"</string>
<string name="application_size_label" msgid="7376689739076506885">"Ukubwa wa programu"</string>
<string name="external_code_size_label" msgid="3459343140355961335">"Programu ya hifadhi ya USB"</string>
- <string name="data_size_label" msgid="6117971066063850416">"Data ya watumiaji"</string>
+ <string name="data_size_label" msgid="6117971066063850416">"Data ya mtumiaji"</string>
<string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Hifadhi data ya USB"</string>
<string name="external_data_size_label" product="default" msgid="626414192825329708">"Kadi ya SD"</string>
<string name="uninstall_text" msgid="3644892466144802466">"Ondoa"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Huenda ikaathiri utendaji"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Bofya kiashiria kikiacha kusonga"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Muda wa kusubiri kabla ya kubofya"</string>
+ <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Tumia huduma"</string>
+ <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Tumia masahihisho ya rangi"</string>
+ <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Tumia manukuu"</string>
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"IMEWASHWA"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IMEZIMWA"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Onyesha katika Mipangilio ya Haraka"</string>
@@ -1987,7 +2015,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">"Imesalia <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> chaji ijae"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Shughuli za chini chini"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Zilizozuiwa"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Iruhusu programu kutumika chini chini"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Programu inaweza kutumika chini chini wakati huitumii"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Shughuli za programu kutumika chini chini ni chache wakati huitumii"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Betri iko katika hali nzuri"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Programu zinafanya kazi kama kawaida"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Uwezo wa chini wa betri"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Muda wa matumizi ya betri ni mfupi"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Washa kidhibiti mahiri cha betri"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Washa ili uboreshe matumizi ya betri"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Washa Hali ya Chaji ya Betri Imepungua"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Ongeza muda wa matumizi ya betri yako"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Hali ya Chaji ya Betri Imepungua imewashwa"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Baadhi ya vipengele vinadhibitiwa"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Simu imetumiwa kwa muda mrefu"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Kompyuta kibao imetumiwa kwa muda mrefu"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Kifaa kimetumiwa kwa muda mrefu"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Imetumika kwa takriban saa <xliff:g id="HOUR">%1$s</xliff:g> tangu ijazwe chaji mara ya mwisho"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Simu yako ilitumiwa kwa muda mrefu na hali hii ilitumia betri sana. Betri yako inatumika kama kawaida.\n\nSimu yako ilitumiwa kwa angalau saa <xliff:g id="HOUR">%1$s</xliff:g> tangu ijazwe chaji mara ya mwisho.\n\n Jumla ya matumizi:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Kompyuta yako kibao ilitumiwa kwa muda mrefu na hali hii ilitumia betri sana. Betri yako inatumika kama kawaida.\n\n Kompyuta yako kibao ilitumiwa kwa angalau saa <xliff:g id="HOUR">%1$s</xliff:g> tangu ijazwe chaji mara ya mwisho.\n\n Jumla ya matumizi:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Kifaa chako kilitumiwa kwa muda mrefu na hali hii ilitumia betri sana. Betri yako inatumika kama kawaida.\n\n Kifaa chako kilitumiwa kwa angalau saa<xliff:g id="HOUR">%1$s</xliff:g> tangu kijazwe chaji mara ya mwisho\n\n Jumla ya matumizi:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Kidhibiti mahiri cha betri"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Dhibiti betri kiotomatiki"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Badilisha kiotomatiki jinsi programu zinavyotumia chaji kulingana na matumizi ya betri"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Programu zilizodhibitiwa"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">Programu %1$d</item>
+ <item quantity="one">Programu %1$d</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Unataka kusimamisha programu?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Simu yako haiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inazuia skrini ya simu kuzimika.\n\nIli kujaribu kurekebisha tatizo hili, unaweza kuzima programu.\n\nIkiwa tatizo hili litaendelea, huenda ukahitaji kuondoa programu hii ili kuboresha utendaji wa betri."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Kompyuta kibao yako haiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inazuia skrini ya kompyuta kibao kuzimika.\n\nIli kujaribu kurekebisha tatizo hili, unaweza kuzima programu.\n\nIkiwa tatizo hili litaendelea, huenda ukahitaji kuondoa programu hii ili kuboresha utendaji wa betri."</string>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Seva ya media"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Uboreshaji wa programu"</string>
<string name="battery_saver" msgid="8172485772238572153">"Kiokoa Betri"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Tumia Kiokoa Betri"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Kujiwasha kiotomatiki"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Kisiwahi kujiwasha"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"chaji ya betri ikiwa <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Kwa sasa usawazishaji una tatizo. Utarudi baada ya muda mfupi."</string>
<string name="add_account_label" msgid="7811707265834013767">"Ongeza akaunti"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Wasifu wa kazini bado haupatikani"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Hali ya kazini"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Ruhusu wasifu wa kazini utumike, ikiwa ni pamoja na usawazishaji wa chini chini, programu na vipengele vinavyohusiana"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Ondoa wasifu wa kazi"</string>
<string name="background_data" msgid="5779592891375473817">"Data ya maandhari nyuma"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Programu inaweza kusawazisha, kutuma, na kupokea data wakati wowote"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Je, ungependa kuondoa akaunti?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Kuondoa hii akaunti kutafuta mazungumzo yako yote, anwani, na data zingine kutoka kwa kompyuta kibao!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Kuondoa hii akaunti hii kutafuta mazungumzo yako yote, anwani, na data zingine kutoka kwa simu!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Kuondoa akaunti hii kutasabibisha kufutwa kwa ujumbe, anwani na data nyingine kwenye kifaa!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Mabadiliko haya hayaruhusiwi na msimamizi wako"</string>
<string name="provider_label" msgid="7724593781904508866">"Usajili wa Push"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="other">Angalia vyeti</item>
<item quantity="one">Angalia cheti</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Watumiaji"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Watumiaji na wasifu"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ongeza mtumiaji au wasifu"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Ongeza mtumiaji"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</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 chaguo msingi"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"Akaunti na watumiaji"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Programu chaguo-msingi"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Lugha, wakati, hifadhi rudufu, masasisho"</string>
<string name="search_results_title" msgid="1796252422574886932">"Mipangilio"</string>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"usinisumbue, katiza, kukatiza, katiza"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"karibu, mahali, historia, kuripoti"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"usahihi"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"akaunti"</string>
<string name="keywords_users" msgid="3434190133131387942">"vikwazo, weka vikwazo, imewekewa vikwazo"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"kusahihisha maandishi, sahihisha, sauti, tetema, otomatiki, lugha, ishara, pendekeza, pendekezo, mandhari, ya kukera, neno, andika, emoji, ya kimataifa"</string>
@@ -2872,6 +2924,7 @@
<item quantity="one">Amri 1</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Usisumbue"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Washa kipengele cha Usinisumbue"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Tabia"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Ruhusu sauti na mitetemo kutoka"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Hakuna sauti"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Washa kiotomatiki"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Sheria otomatiki"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Amri ya kiotomatiki"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Weka sheria za Usinisumbue"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Dhibiti sauti na mitetemo wakati fulani"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Tumia sheria"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Kipaumbele tu"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Kengele pekee"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Kimya kabisa"</string>
@@ -2890,12 +2946,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Zuia ukatizaji wa maonyesho"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Ruhusu ishara zinazoonekena"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Ongeza"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"WASHA SASA"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ZIMA SASA"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Washa"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Iwashe sasa"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Izime sasa"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Kipengele cha Usinisumbue kitaendelea kutumika hadi <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Kipengele cha Usinisumbue kitaendelea kutumika hadi utakapokizima"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Kipengele cha Usinisumbue kimewashwa kiotomatiki na amri ya (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Kipengele cha Usinisumbue kimewashwa kiotomatiki na programu ya (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Kipaumbele tu"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Sauti za wasifu wa kazi"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Tumia sauti za wasifu wako binafsi"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sauti za wasifu wa binafsi na wa kazini ni sawa"</string>
@@ -2911,6 +2970,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Milio ya simu"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Mitetemo na sauti zingine"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Arifa"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Zilizotumwa hivi majuzi"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Mipangilio ya kina"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Arifa za kazini"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Ruhusu vitone vya arifa"</string>
@@ -2930,7 +2990,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Arifa za programu"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Aina ya arifa"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Kikundi cha aina za arifa"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Umuhimu"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Utendaji"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Ruhusu sauti"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Usawahi kuonyesha arifa"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Hakuna kukatizwa kwa sauti au maonyesho"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Umuhimu wa wastani"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Umuhimu wa kiwango cha juu"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Umuhimu wa hali ya dharura"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Onyesha arifa"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Mratibu wa arifa"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Kufikia arifa"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ufikiaji kwenye arifa za wasifu wa kazi umezuiwa"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Kufikia kipengele cha Usinisumbue"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Hakuna programu zilizosakinishwa ambazo zimeomba kufikia kipengele cha Usinisumbue"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android inazuia arifa za programu hii ili zisionekane kwenye kifaa hiki"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android inazuia aina hizi za arifa ili zisionekane kwenye kifaa hiki"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android inazuia kikundi hiki cha arifa ili zisionekane kwenye kifaa hiki"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Kutokana na ombi lako, Android inazuia arifa za programu hii ili zisionekane kwenye kifaa hiki"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Kutokana na ombi lako, Android inazuia aina hizi za arifa ili zisionekane kwenye kifaa hiki"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Kutokana na ombi lako, Android inazuia kikundi hiki cha arifa ili zisionekane kwenye kifaa hiki"</string>
<string name="notification_channels" msgid="5346841743182627500">"Aina"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Nyingine"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Mbali na kutumia alama ya kidole chako kufungua kifaa, unaweza kulinda kifaa hiki zaidi kwa kuweka nenosiri lako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe nenosiri kabla ya kuanza kukitumia?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ndiyo"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Hapana"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Ndiyo"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Hapana"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Je, inahitaji PIN?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Je, inahitaji mchoro?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Je, inahitaji nenosiri?"</string>
@@ -3254,7 +3317,7 @@
<string name="high_power_off" msgid="3393904131961263278">"Kuboresha matumizi ya betri"</string>
<string name="high_power_system" msgid="7362862974428225301">"Chaguo la kuboresha matumizi ya betri halipo"</string>
<string name="high_power_desc" msgid="6283926163708585760">"Usitumie kipengele cha kuboresha matumizi ya betri. Kinaweza kumaliza chaji ya betri yako haraka zaidi."</string>
- <string name="high_power_prompt_title" msgid="6358673688590282655">"Ungependa kuruhusu programu itumike chini chini kila wakati?"</string>
+ <string name="high_power_prompt_title" msgid="6358673688590282655">"Ungependa kuruhusu programu itumike chinichini kila wakati?"</string>
<string name="high_power_prompt_body" msgid="1031422980602565049">"Ukiruhusu <xliff:g id="APP_NAME">%1$s</xliff:g> kutumika chini chini, unaweza kupunguza muda wa matumizi ya betri. \n\nUnaweza kubadilisha hali hii baadaye katika Mipangilio > Programu na arifa."</string>
<string name="battery_summary" msgid="8044042095190688654">"Imetumia <xliff:g id="PERCENTAGE">%1$s</xliff:g> tangu mwisho ilipojazwa chaji"</string>
<string name="battery_power_management" msgid="5571519699679107523">"Udhibiti wa betri"</string>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Mtumiaji wa sasa: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Umeingia katika akaunti ukitumia <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ni chaguo-msingi"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"WASHA / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"IMEZIMWA"</string>
<string name="backup_disabled" msgid="485189128759595412">"Kipengee cha kuhifadhi nakala kimezimwa"</string>
<string name="about_summary" msgid="924181828102801010">"Umesasishwa na sasa unatumia Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"Huwezi kuzima huduma ya kuhifadhi nakala"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Huduma hii imazimwa. Wasiliana na msimamizi wa shirika lako ili upate maelezo zaidi."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Maelezo zaidi"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Msimamizi wako anaweza kufuatilia na kudhibiti programu na data zinazohusiana na wasifu wako wa kazini, ikiwa ni pamoja na mipangilio, ruhusa, ufikiaji wa shirika, shughuli za mtandao na maelezo ya mahali kilipo kifaa."</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"Wasifu wa kazini umezimwa"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Usawazishaji wa chini chini, programu na vipengele vingine vinavyohusiana na wasifu wako wa kazini vimezimwa."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Weka ratiba ya Mwanga wa Usiku"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Badilisha rangi ya skrini kuwa manjano ili uweze kulala"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"Mwanga wa Usiku umewashwa"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Skrini imewekewa rangi ya manjano. Hii inaweza kukusaidia kulala kwa urahisi."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Unayopendekezewa"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Mapendekezo"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> zaidi"</string>
@@ -3537,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"Hamna"</string>
<string name="special_access" msgid="3458780842491881155">"Idhini maalum ya kufikia 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>
@@ -3559,31 +3628,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Vigae vya msanidi programu vya mipangilio ya haraka"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Tuko hapa kukuhudumia"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Tuko tayari kukuhudumia wakati wowote kila siku"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Tuko tayari kukuhudumia wakati wowote kila siku"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Timu yetu ya usaidizi iko tayari kushughulikia tatizo lolote"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Timu yetu ya usaidizi iko tayari kukuhudumia wakati wowote, kila siku"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Tafuta usaidizi au urudi wakati wa saa za kazi (saa za nchini):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Saa za usaidizi kupitia simu (saa za nchini)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Tafuta katika sehemu ya usaidizi au ugundue vidokezo na mbinu"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Usaidizi nchini:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Je, unasafiri nje ya nchi?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Huenda ukatozwa kwa kupiga simu nje ya nchi yako"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Simu"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Gumzo"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Angalia vidokezo na mbinu"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Tafuta usaidizi na utume maoni"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Wasiliana na kituo cha usaidizi"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Ingia katika akaunti"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Imeshindwa kuingia katika akaunti?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Tuma maelezo ya mfumo"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Usionyeshe tena"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Akaunti inayotumika"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Ongeza akaunti"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Maelezo ya mfumo"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Alama ya Dirisha"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Ufuatiliaji wa Juujuu"</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>
@@ -3599,11 +3645,11 @@
<item quantity="other">Sekunde <xliff:g id="NUMBER">%s</xliff:g></item>
<item quantity="one">Sekunde 1</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Subiri kwa ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Dhibiti hifadhi"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Ili kuongeza nafasi ya hifadhi, kidhibiti cha hifadhi huondoa picha na video zilizohifadhiwa nakala kwenye kifaa chako."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Ondoa picha na video"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Kidhibiti cha hifadhi"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Tumia Kidhibiti cha hifadhi"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatiki"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Mwongozo"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Futa ili uongeze nafasi sasa"</string>
@@ -3614,32 +3660,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Nenda kwenye kamera"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Ili ufungue kamera haraka, bofya kitufe cha kuwasha/kuzima mara mbili. Hufanya kazi katika skrini yoyote."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Fungua kamera haraka"</string>
- <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Bonyeza kitufe cha kuwasha/kuzima mara mbili ili ufungue kamera"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Geuza kamera"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Jipige picha mwenyewe haraka zaidi"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Geuza simu mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Geuza kompyuta kibao mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Geuza kifaa mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
<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_suggestion_summary" msgid="5987443721392571847">"Angalia arifa wakati skrini imezimwa"</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_pickup_suggestion_summary" msgid="7014700589991761035">"Angalia arifa wakati skrini imezimwa"</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 alama ya 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>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole kilicho upande wa nyuma wa kompyuta yako kibao."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole nyuma ya kifaa chako."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Angalia arifa haraka"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Telezesha kidole chini kwenye kitambua alama ya kidole"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Imewashwa"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Imezimwa"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Tayari kipakiaji cha mfumo wa uendeshaji kimefunguliwa"</string>
@@ -3769,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Ufikiaji wa saraka"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"ufikiaji wa saraka"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml
index 35a25d8..4f13e09 100755
--- a/res/values-sw400dp/dimens.xml
+++ b/res/values-sw400dp/dimens.xml
@@ -21,4 +21,11 @@
<dimen name="support_escalation_card_padding_start">56dp</dimen>
<dimen name="support_escalation_card_padding_end">56dp</dimen>
+
+ <!-- Suggestion cards-->
+ <dimen name="suggestion_card_width_one_card">380dp</dimen>
+ <dimen name="suggestion_card_width_two_cards">184dp</dimen>
+ <dimen name="suggestion_card_width_multiple_cards">176dp</dimen>
+ <dimen name="suggestion_card_padding_bottom_one_card">22dp</dimen>
+
</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 1f78abd..8e47a62 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -57,7 +57,6 @@
<!-- SwitchBar sub settings margin start / end -->
<dimen name="switchbar_subsettings_margin_start">80dp</dimen>
- <dimen name="switchbar_subsettings_margin_end">24dp</dimen>
<dimen name="search_bar_height">64dp</dimen>
<dimen name="search_bar_half_height">32dp</dimen>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index 8115916..402375b 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"புஷ் பொத்தான்"</item>
<item msgid="1624323946324499595">"பியர் சாதனத்திலிருந்து பின்"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 மணிநேரம்"</item>
<item msgid="5198271470953124739">"காலநேரம் முடிய வேண்டாம்"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (இயல்பு)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"மோசம்"</item>
<item msgid="2042505933058940139">"மோசம்"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 நாட்களுக்கு மேல்"</item>
<item msgid="5692284879054004388">"90 நாட்களுக்கு மேல்"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"நெட்வொர்க் முன்னுரிமையைப் பயன்படுத்து"</item>
+ <item msgid="8745603368609022803">"டேட்டா அளவிடப்பட்டது"</item>
+ <item msgid="2266114985518865625">"டேட்டா அளவிடப்படாதது"</item>
+ </string-array>
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 3834073..9a1633f 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"உங்கள் சாதனங்கள்"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"புதிய சாதனத்தை இணை"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"புளூடூத் சாதனங்களுடன் ஜோடி சேரவும், இணைக்கவும் சாதனத்தை அனுமதிக்கிறது"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"இன்-பேண்ட் ஒலியை முடக்கு"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"புளூடூத் ஹெட்செட்களில் தனிப்பயன் மொபைல் ரிங்டோன்களை இயக்க வேண்டாம்"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"தேதியை அமை"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"அகர வரிசைப்படி வரிசைப்படுத்து"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"நேர மண்டலத்தின்படி வரிசைப்படுத்து"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TRANSITION_DATE">%2$s</xliff:g> அன்று <xliff:g id="TIME_TYPE">%1$s</xliff:g> தொடங்குகிறது."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"பகல் ஒளி சேமிப்பு நேரம்"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"சீர் நேரம்"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"பிராந்திய நேர மண்டலம்"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"நிலையான வித்தியாசத்தைக் கொண்ட நேர மண்டலங்கள்"</string>
<string name="date_picker_title" msgid="1338210036394128512">"தேதி"</string>
<string name="time_picker_title" msgid="483460752287255019">"நேரம்"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"தானாகவே பூட்டு"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"லாக் ஸ்கிரீன் செய்தி"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"விட்ஜெட்களை இயக்கு"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"நிர்வாகி முடக்கியுள்ளார்"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ஏதுமில்லை"</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">"எ.கா., சந்திராவின் ஆண்ட்ராய்டு."</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"சுயவிவரத் தகவல்"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"கணக்குகள்"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"என்கிரிப்ஷன் & அனுமதிச் சான்றுகள்"</string>
@@ -459,9 +471,16 @@
<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="8971630898700461034">"திரைப் பூட்டை அமைக்கவும்"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"சாதனத்தைப் பாதுகாக்கவும்"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"கைரேகையைப் பயன்படுத்தவும்"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"கைரேகை மூலம் திறக்கலாம்"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"திரைப் பூட்டைத் தேர்வுசெய்யவும்"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"பணிப் பூட்டைத் தேர்வுசெய்க"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ஸ்பீக்கர் ஃபோனாக"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"இசை மற்றும் மீடியாவிற்காக"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"அமைப்புகளை நினைவில்கொள்"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"இணைத்துள்ள புளூடூத் ஆடியோ சாதனங்களின் அதிகபட்ச எண்ணிக்கை"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"இணைத்துள்ள புளூடூத் ஆடியோ சாதனங்களின் அதிகபட்ச எண்ணிக்கையைத் தேர்ந்தெடுக்கவும்"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"வயர்லெஸ் காட்சியை இயக்கு"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"அருகில் சாதனங்கள் எதுவுமில்லை."</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"பெயர்"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"உள்நுழை"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"வைஃபையை இயக்க <xliff:g id="REQUESTER">%s</xliff:g> விரும்புகிறது"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"வைஃபையை முடக்க <xliff:g id="REQUESTER">%s</xliff:g> விரும்புகிறது"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"வைஃபை"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"வைஃபையை இயக்கு"</string>
<string name="wifi_settings" msgid="29722149822540994">"வைஃபை"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"வைஃபையைப் பயன்படுத்து"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"வைஃபை அமைப்பு"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"வைஃபை"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"வயர்லெஸ் ஆக்சஸ் பாயிண்ட்களை அமைத்து & நிர்வகிக்கவும்"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"கடவுச்சொல்"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"கடவுச்சொல்லைக் காட்டு"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP அலைவரிசையைத் தேர்ந்தெடுக்கவும்"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"தானியங்கு"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz அலைவரிசை"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz அலைவரிசை"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP அமைப்பு"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS கிடைக்கிறது)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"நெட்வொர்க் கடவுச்சொல்லை உள்ளிடவும்"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"தொலைத்தொடர்பு நிறுவன வைஃபை நெட்வொர்க்"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> மூலம் இணை"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> மூலம் இணை"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"இருப்பிடத்தைத் துல்லியமாக அறிவதற்கு மேம்படுத்த மற்றும் பிற காரணங்களுக்காக, வைஃபை முடக்கத்தில் இருக்கும்போதும் நெட்வொர்க்கை ஸ்கேன் செய்வதை இயக்கத்தில் வைக்க <xliff:g id="APP_NAME">%1$s</xliff:g> விரும்புகிறது.\n\nஸ்கேன் செய்ய விரும்பும் எல்லா பயன்பாடுகளுக்கும் இதை அனுமதிக்கவா?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"இதனை முடக்க, கூடுதல் உருப்படி மெனுவில் மேம்பட்டவை என்பதற்குச் செல்லவும்."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"அனுமதி"</string>
@@ -909,10 +933,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP அலைவரிசை"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"மற்ற சாதனங்களுக்கு வைஃபை நெட்வொர்க்கை உருவாக்க, ஹாட்ஸ்பாட்டைப் பயன்படுத்தவும். ஹாட்ஸ்பாட்டானது, மொபைல் டேட்டா இணைப்பைப் பயன்படுத்தி இண்டர்நெட்டை வழங்குகிறது. கூடுதல் மொபைல் டேட்டா பேமெண்ட்கள் விதிக்கப்படலாம்."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, பயன்பாடுகள் ஹாட்ஸ்பாட்டையும் உருவாக்கலாம்."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ஹாட்ஸ்பாட்டைத் தானாக ஆஃப் செய்"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"சாதனங்கள் எதுவும் இணைக்கப்படவில்லை எனில், வைஃபை ஹாட்ஸ்பாட் ஆஃப் செய்யப்படும்"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"ஹாட்ஸ்பாட்டை இயக்குகிறது…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"ஹாட்ஸ்பாட்டை முடக்குகிறது…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> செயலில் உள்ளது"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"வைஃபை அழைப்பு"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"வைஃபை அழைப்பை இயக்கு"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"மொபைல் நெட்வொர்க்கிற்குப் பதில் வைஃபையைப் பயன்படுத்தும்"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"அவசர முகவரி"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi-Fi மூலம் அவசர அழைப்பை மேற்கொள்ளும்போது, உங்களின் அப்போதைய இருப்பிடமே உங்கள் முகவரியாகக் கருதப்படும்"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"தனிப்பட்ட DNS அம்சங்கள் பற்றி "<annotation id="url">"மேலும் அறிக"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"திரை அமைப்பு"</string>
<string name="sound_settings" msgid="5534671337768745343">"ஒலி"</string>
<string name="all_volume_title" msgid="4296957391257836961">"ஒலியளவுகள்"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"மொபைல் நெட்வொர்க் வகை"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"ஆபரேட்டர் தகவல்"</string>
<string name="status_data_state" msgid="5503181397066522950">"மொபைல் நெட்வொர்க் நிலை"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"சேவையின் நிலை"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"சிக்னலின் வலிமை"</string>
<string name="status_roaming" msgid="2638800467430913403">"ரோமிங்"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"புதிய <xliff:g id="NAME">^1</xliff:g> வேலை செய்கிறது. \n\nசாதனத்திற்கு படங்கள், கோப்புகள், ஆப்ஸ் டேட்டாவை நகர்த்த, அமைப்புகள் > சேமிப்பகம் என்பதற்குச் செல்லவும்."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ஐ நகர்த்தவும்"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g>ஐயும் அதன் தரவையும் <xliff:g id="NAME_0">^2</xliff:g>க்கு நகர்த்த ஒருசில வினாடிகள் மட்டுமே எடுக்கும். நகர்த்தப்படும்போது பயன்பாட்டைப் பயன்படுத்த முடியாது. \n\nநகர்த்தும்போது <xliff:g id="NAME_1">^2</xliff:g>ஐ அகற்ற வேண்டாம்."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"தரவை நகர்த்துவதற்கு, பயனர் <xliff:g id="APP">^1</xliff:g> அனுமதிக்கப்பட வேண்டும்."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> நகர்த்தப்படுகிறது…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"நகர்த்தும்போது <xliff:g id="NAME">^1</xliff:g>ஐ அகற்ற வேண்டாம். \n\nநகர்த்தி முடிக்கும்வரை, சாதனத்தில் <xliff:g id="APP">^2</xliff:g> பயன்பாடு கிடைக்காது."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"நகர்த்துவதை ரத்துசெய்"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"நெட்வொர்க், ஆப்ஸ் அல்லது சாதனத்தை மீட்டமைக்கலாம்"</string>
<string name="reset_network_title" msgid="6166025966016873843">"வைஃபை, மொபைல் & புளூடூத்தை மீட்டமை"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"பின்வருபவை உட்பட, எல்லா நெட்வொர்க் அமைப்புகளையும் இது மீட்டமைக்கும்:\n\n"<li>"வைஃபை"</li>\n<li>"மொபைல் தரவு"</li>\n<li>"புளூடூத்"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"eSIMகளை மீட்டமைக்கவும்"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"அமைப்புகளை மீட்டமை"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"எல்லா நெட்வொர்க் அமைப்புகளையும் மீட்டமைக்கவா? இதைச் செயல்தவிர்க்க முடியாது!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"அமைப்புகளை மீட்டமை"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"மீட்டமைக்கவா?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"நெட்வொர்க் அமைப்புகளை மீட்டமைக்க, இந்தப் பயனருக்கு அனுமதியில்லை"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"நெட்வொர்க் அமைப்புகள் மீட்டமைக்கப்பட்டன"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIMகளை மீட்டமைக்க முடியவில்லை"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"பிழை காரணமாக eSIMகளை மீட்டமைக்க முடியாது."</string>
<string name="master_clear_title" msgid="3531267871084279512">"எல்லாத் டேட்டாவையும் அழி (ஆரம்பநிலை மீட்டமைவு)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"இ-சிம்மை ஆதரிக்கும் தொலைத்தொடர்பு நிறுவனங்கள்"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMகள்"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"இதைச் செய்வதால், உங்கள் மொபைல் சேவைத் திட்டம் ரத்துசெய்யப்படாது."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிப்பதற்கு, "<b>"USB சேமிப்பிடத்தை"</b>" அழிக்க வேண்டியிருக்கும்."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிக்க "<b>"SD கார்டு"</b>" அழிக்கப்பட வேண்டும்."</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"இணையத்துடன் இணைக்கவும்"</string>
<string name="location_title" msgid="1029961368397484576">"எனது இருப்பிடம்"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"பணி சுயவிவரத்திற்கான இருப்பிடம்"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"பயன்முறை"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"அதிக துல்லியம்"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"பேட்டரி சேமிப்பு"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"சாதனம் மட்டும்"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"இருப்பிடம் முடக்கத்தில்"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"பயன்பாட்டு நிலை அனுமதிகள்"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"சமீபத்திய இருப்பிட கோரிக்கைகள்"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"எந்தப் பயன்பாடுகளும் சமீபத்தில் இருப்பிடத்தைக் கோரவில்லை"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"இருப்பிடச் சேவைகள்"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"அதிகப் பேட்டரி பயன்பாடு"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"குறைவான பேட்டரி பயன்பாடு"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"இருப்பிடப் பயன்முறை"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"இருப்பிடத்தைக் கண்டறிய GPS, வைஃபை, புளூடூத் அல்லது மொபைல் நெட்வொர்க்குகளைப் பயன்படுத்தும்"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"இருப்பிடத்தைக் கண்டறிய வைஃபை, புளூடூத் அல்லது மொபைல் நெட்வொர்க்குகளைப் பயன்படுத்தும்"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"இருப்பிடத்தைக் கண்டறிய, GPS மற்றும் சாதன உணர்விகளைப் பயன்படுத்து"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"ஸ்கேன் செய்தல்"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"வைஃபை ஸ்கேன் செய்தல்"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"முறைமையின் பயன்பாடுகளும் சேவைகளும் எந்த நேரத்திலும் வைஃபை நெட்வொர்க்குகளைக் கண்டறிய அனுமதிப்பதன் மூலம், இருப்பிட அறிதலை மேம்படுத்தவும்."</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"இருப்பிட ஆதாரங்கள்"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"சட்டத் தகவல், நிலை மற்றும் மென்பொருள் பதிப்பைக் காட்டு"</string>
<string name="legal_information" msgid="5769301644270604095">"சட்டத் தகவல்"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகளையும் பார்க்கவும்"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"அறியப்படாத பயன்பாடுகளால் உங்கள் டேப்லெட்டும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து பயன்பாடுகளை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் டேப்லெட்டுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"அறியப்படாத பயன்பாடுககளால் உங்கள் மொபைலும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து பயன்பாடுகளை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் மொபைலுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"அறியப்படாத ஆப்ஸால் உங்கள் சாதனம் மற்றும் தனிப்பட்ட தரவு மிக எளிதாகப் பாதிப்புக்குள்ளாகும். இந்த மூலத்திலிருந்து ஆப்ஸை நிறுவி, பயன்படுத்தும்போது, உங்கள் சாதனத்திற்கு ஏதேனும் சேதம் ஏற்பட்டாலோ தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
<string name="advanced_settings" msgid="1777249286757067969">"மேம்பட்ட அமைப்பு"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"மேலும் அமைப்பு விருப்பங்களை இயக்கு"</string>
<string name="application_info_label" msgid="5736524913065714880">"ஆப்ஸ் தகவல்"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"செயல்திறனைப் பாதிக்கலாம்"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"குறிப்பான் நகர்வதை நிறுத்தியதும் கிளிக் செய்"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"கிளிக்கிற்கு முந்தைய தாமதம்"</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_summary_state_enabled" msgid="8359913912320966304">"ஆன்"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"முடக்கப்பட்டுள்ளது"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"விரைவு அமைப்புகளில் காட்டு"</string>
@@ -1987,7 +2015,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> மீதமுள்ளது"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"சார்ஜ் செய்வதற்கு <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"பின்னணிச் செயல்பாடு"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"வரம்பிட்டவை"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"பின்னணியில் இயங்குவதற்குப் பயன்பாட்டை அனுமதிக்கும்"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"பயன்பாட்டைப் பயன்படுத்தாத போது, அதைப் பின்னணியில் இயக்கலாம்"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"பயன்பாட்டைப் பயன்படுத்தாத போது, அதன் பின்னணி செயல்பாடு வரம்பிடப்படும்"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"பேட்டரி நன்றாக வேலை செய்கிறது"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ஆப்ஸ் வழக்கம்போல் இயங்குகின்றன"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"குறைந்த பேட்டரி திறன்"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"இந்த பேட்டரியால் நீண்ட நேர பேட்டரி ஆயுளை வழங்க முடியாது"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"ஸ்மார்ட் பேட்டரி நிர்வாகியை ஆன் செய்தல்"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"பேட்டரி உபயோகத்தை மேம்படுத்த, ஆன் செய்யவும்"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"குறைந்த பேட்டரிப் பயன்முறையை ஆன் செய்யவும்"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"பேட்டரியின் நிலையை நீட்டிக்கவும்"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"குறைந்த பேட்டரிப் பயன்முறை ஆன் செய்யப்பட்டுள்ளது"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"சில அம்சங்கள் வரம்பிடப்பட்டுள்ளன"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"மொபைல் மிக அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"டேப்லெட் மிக அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"சாதனம் மிக அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"கடைசியாக முழுச் சார்ஜ் செய்யப்பட்டதிலிருந்து, சுமார் <xliff:g id="HOUR">%1$s</xliff:g> மணிநேரம் பயன்படுத்தப்பட்டுள்ளது"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"உங்கள் மொபைல் மிக அதிகமாகப் பயன்படுத்தப்பட்டுள்ளதால், பேட்டரி அதிகளவில் செலவாகியுள்ளது. பேட்டரியின் செயல்பாடு இயல்பாக உள்ளது.\n\n உங்கள் மொபைல் கடைசியாக முழுச் சார்ஜ் செய்யப்பட்டதிலிருந்து, சுமார் <xliff:g id="HOUR">%1$s</xliff:g> மணிநேரம் பயன்படுத்தப்பட்டுள்ளது.\n\n மொத்த உபயோகம்:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"உங்கள் டேப்லெட் மிக அதிகமாகப் பயன்படுத்தப்பட்டுள்ளதால், பேட்டரி அதிகளவில் செலவாகியுள்ளது. பேட்டரியின் செயல்பாடு இயல்பாக உள்ளது.\n\n உங்கள் டேப்லெட் கடைசியாக முழுச் சார்ஜ் செய்யப்பட்டதிலிருந்து, சுமார் <xliff:g id="HOUR">%1$s</xliff:g> மணிநேரம் பயன்படுத்தப்பட்டுள்ளது.\n\n மொத்த உபயோகம்:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"உங்கள் சாதனம் மிக அதிகமாகப் பயன்படுத்தப்பட்டுள்ளதால், பேட்டரி அதிகளவில் செலவாகியுள்ளது. பேட்டரியின் செயல்பாடு இயல்பாக உள்ளது.\n\n உங்கள் சாதனம் கடைசியாக முழுச் சார்ஜ் செய்யப்பட்டதிலிருந்து, சுமார் <xliff:g id="HOUR">%1$s</xliff:g> மணிநேரம் பயன்படுத்தப்பட்டுள்ளது.\n\n மொத்த உபயோகம்:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"ஸ்மார்ட் பேட்டரி நிர்வாகி"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"பேட்டரியைத் தானாகவே நிர்வகி"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"உபயோகத்தின் அடிப்படையில், ஆப்ஸின் பவர் உபயோகத்தைத் தானாகவே மாற்றியமைத்துக் கொள்ளும்"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"தடைசெய்யப்பட்ட ஆப்ஸ்"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d ஆப்ஸ்</item>
+ <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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"மீடியாசர்வர்"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"பயன்பாட்டிற்கான மேம்படுத்தல்"</string>
<string name="battery_saver" msgid="8172485772238572153">"பேட்டரி சேமிப்பான்"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"பேட்டரி சேமிப்பானைப் பயன்படுத்து"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"தானாகவே இயக்கு"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ஒருபோதும் வேண்டாம்"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> பேட்டரி இருக்கும் போது"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"ஒத்திசைவில் தற்போது சிக்கல்களை எதிர்கொள்கிறோம். விரைவில் இது சரிசெய்யப்படும்."</string>
<string name="add_account_label" msgid="7811707265834013767">"கணக்கைச் சேர்"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"இன்னும் பணி சுயவிவரம் கிடைக்கவில்லை"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"பணிப் பயன்முறை"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"செயல்பட, பணி சுயவிவரத்தை அனுமதி. இதில் பயன்பாடுகள், பின்புல ஒத்திசைவு மற்றும் தொடர்புடைய அம்சங்கள் அடங்கும்"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"பணி சுயவிவரத்தை அகற்று"</string>
<string name="background_data" msgid="5779592891375473817">"பின்புலத் தரவு"</string>
<string name="background_data_summary" msgid="8328521479872763452">"பயன்பாடுகளால் எந்நேரத்திலும் தரவை ஒத்திசைக்கவும், அனுப்பவும் பெறவும் முடியும்"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"கணக்கை அகற்றவா?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"கணக்கை அகற்றுவது அதிலுள்ள செய்திகள், தொடர்புகள் மற்றும் டேப்லெட்டில் உள்ள பிற தகவல்களையும் நீக்கும்!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"இந்தக் கணக்கை அகற்றுவது, அதிலுள்ள செய்திகள், தொடர்புகள் மற்றும் மொபைலில் உள்ள பிற தகவல்களையும் நீக்கும்!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"இந்தக் கணக்கை அகற்றினால், சாதனத்தில் உள்ள தொடர்புகள், செய்திகள் மற்றும் பிற தரவு ஆகியவை நீக்கப்படும்!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"உங்கள் நிர்வாகி இந்த மாற்றத்தை அனுமதிக்கவில்லை"</string>
<string name="provider_label" msgid="7724593781904508866">"சந்தாக்களை உறுதிப்படுத்து"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="other">சான்றிதழ்களைச் சரிபார்</item>
<item quantity="one">சான்றிதழைச் சரிபார்</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"பயனர்கள்"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"பயனர்கள் & சுயவிவரங்கள்"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"பயனர் அல்லது சுயவிவரத்தைச் சேர்"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"பயனரைச் சேர்"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"புளூடூத், அனுப்புதல்"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ஆப்ஸ் & அறிவிப்புகள்"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"அனுமதிகள், இயல்பு ஆப்ஸ்"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"பயனர்களும் கணக்குகளும்"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"வேண்டாம், தொந்தரவு செய்யாதே, குறுக்கீடு, குறுக்கிடல், இடைநிறுத்தம்"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"அருகாமை, இருப்பிடம், வரலாறு, அறிக்கையிடல்"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"துல்லியம்"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"கணக்கு"</string>
<string name="keywords_users" msgid="3434190133131387942">"வரம்பிடல், வரம்பு, வரம்பிட்டது"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"உரை திருத்தம், சரிசெய், ஒலி, அதிர்வு, தானியங்கு, மொழி, சைகை, பரிந்துரை, பரிந்துரைப்பு, தீம், வன்மொழி, சொல், வகை, ஈமோஜி, சர்வதேசம்"</string>
@@ -2872,6 +2924,7 @@
<item quantity="one">1 விதி</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"தொந்தரவு செய்யாதே"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"தொந்தரவு செய்ய வேண்டாம் என்பதை ஆன் செய்யும்"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"செயல்பாடு"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"இந்த ஒலிகள்/அதிர்வுகளை அனுமதி"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ஒலியெழுப்ப வேண்டாம்"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"தானாகவே ஆன் செய்"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"தானியங்கு விதிகள்"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"தானியங்கு விதி"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"டிஎன்டி விதிகளை அமை"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ஒலி & அதிர்வுகளை வரம்பிடு"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"அறிவிப்புகள் வேண்டாம்"</string>
@@ -2890,12 +2946,15 @@
<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_add" msgid="90014394953272517">"சேர்"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"இப்போது ஆன் செய்"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"இப்போது ஆஃப் செய்"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"ஆன் செய்"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"இப்போது ஆன் செய்"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"இப்போது ஆஃப் செய்"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> வரை ‘தொந்தரவு செய்ய வேண்டாம்’ ஆன் நிலையில் இருக்கும்"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"ஆஃப் செய்யப்படும் வரை, ‘தொந்தரவு செய்ய வேண்டாம்’ ஆன் நிலையில் இருக்கும்"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"(<xliff:g id="RULE_NAME">%s</xliff:g>) விதியின் காரணமாக, ‘தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"(<xliff:g id="APP_NAME">%s</xliff:g>) பயன்பாட்டின் மூலம், ‘தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"முக்கியமானவை மட்டும்"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2970,7 @@
<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="recent_notifications" msgid="5660639387705060156">"சமீபத்தில் அனுப்பியவை"</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>
@@ -2930,7 +2990,7 @@
<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_importance_title" msgid="848692592679312666">"முக்கியத்துவம்"</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="5455049524984686275">"ஒலியெழுப்பாது அல்லது காட்சிக் குறுக்கீடு செய்யாது"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"நடுத்தர முக்கியத்துவம்"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"அறிவிப்பு அணுகல்"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"பணி விவர அறிவிப்புகளுக்கான அணுகல் தடுக்கப்பட்டுள்ளது"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"\'தொந்தரவு செய்யாதே\' அணுகல்"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"\'தொந்தரவு செய்யாதே\' அணுகலை நிறுவப்பட்ட பயன்பாடுகள் எதுவும் கோரவில்லை"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"இந்தப் பயன்பாட்டின் அறிவிப்புகளை Android இயங்குதளம் இந்தச் சாதனத்தில் காட்டாது"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"இந்தச் சாதனத்தில் இந்த வகையிலான அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"சாதனத்தில், இந்தக் குழு அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"உங்கள் கோரிக்கையின் படி, இந்தச் சாதனத்தில், இந்தப் பயன்பாட்டின் அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"உங்கள் கோரிக்கையின் படி, இந்தச் சாதனத்தில், இந்த வகை அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"உங்கள் கோரிக்கையின் படி, இந்தச் சாதனத்தில், இந்தக் குழு அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
<string name="notification_channels" msgid="5346841743182627500">"வகைகள்"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"மற்றவை"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"சாதனத்தைத் திறக்க கைரேகையைப் பயன்படுத்துவதுடன் சேர்த்து, கடவுச்சொல் தேவைப்படுமாறு அமைத்து உங்கள் சாதனத்திற்குக் கூடுதல் பாதுகாப்பு வழங்கிடலாம். சாதனம் தொடங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \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="1793719723017395175">"ஆம்"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"இல்லை"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"பின் தேவையா?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"வடிவம் தேவையா?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"கடவுச்சொல் தேவையா?"</string>
@@ -3255,7 +3318,7 @@
<string name="high_power_system" msgid="7362862974428225301">"பேட்டரியைச் சேமிக்காது"</string>
<string name="high_power_desc" msgid="6283926163708585760">"பேட்டரி மேம்படுத்தலைப் பயன்படுத்தவில்லை எனில், உங்கள் பேட்டரி மிக விரைவில் தீர்ந்துவிடக்கூடும்."</string>
<string name="high_power_prompt_title" msgid="6358673688590282655">"எப்போதும் பின்னணியில் இயங்க, பயன்பாட்டை அனுமதிக்கவா?"</string>
- <string name="high_power_prompt_body" msgid="1031422980602565049">"எப்போதும் பின்னணியில் இயங்குவதற்கு <xliff:g id="APP_NAME">%1$s</xliff:g>ஐ அனுமதிப்பதால், பேட்டரி நிலை குறையக்கூடும். \n\nஇதை அமைப்புகள் > பயன்பாடுகள் & அறிவிப்புகள் என்பதற்குச் சென்று, மாற்றலாம்."</string>
+ <string name="high_power_prompt_body" msgid="1031422980602565049">"எப்போதும் பின்னணியில் இயங்க <xliff:g id="APP_NAME">%1$s</xliff:g> பயன்பாட்டை அனுமதிப்பதால், பேட்டரியின் ஆயுள் குறையக்கூடும். \n\nஇதை அமைப்புகள் > பயன்பாடுகள் & அறிவிப்புகள் என்பதற்குச் சென்று, மாற்றலாம்."</string>
<string name="battery_summary" msgid="8044042095190688654">"முழு சார்ஜ் ஆனதிலிருந்து <xliff:g id="PERCENTAGE">%1$s</xliff:g> பயன்படுத்தப்பட்டுள்ளது"</string>
<string name="battery_power_management" msgid="5571519699679107523">"பேட்டரி திறன் மேலாண்மை"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"கடைசியாக முழு சார்ஜ் செய்த நேரத்திலிருந்து, பேட்டரி பயன்படுத்தப்படவில்லை"</string>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"தற்போதைய பயனர்: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"உள்நுழைந்துள்ள முகவரி: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> இயல்பு பயன்பாடாகும்"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ஆன் / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ஆஃப்"</string>
<string name="backup_disabled" msgid="485189128759595412">"காப்புப் பிரதி முடக்கப்பட்டுள்ளது"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g>க்குப் புதுப்பிக்கப்பட்டது"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"காப்புப்பிரதிகள் எடுப்பதை ஆஃப் செய்ய முடியாது"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"இந்தச் செயல் முடக்கப்பட்டது. மேலும் அறிய, உங்கள் நிறுவனத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"மேலும் விவரங்கள்"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"உங்கள் நிர்வாகியால் அமைப்புகள், அனுமதிகள், கார்ப்பரேட் அணுகல், நெட்வொர்க் செயல்பாடு, சாதனத்தின் இருப்பிடத் தகவல் உட்பட உங்கள் பணி விவரத்துடன் தொடர்புடைய பயன்பாடுகளையும் தரவையும் கண்காணிக்கவும் நிர்வகிக்கவும் முடியும்."</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"பணி சுயவிவரம் முடக்கப்பட்டது"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"உங்கள் பணி சுயவிவரத்துடன் தொடர்புடைய பயன்பாடுகள், பின்புல ஒத்திசைவு மற்றும் பிற அம்சங்கள் ஆகியவை முடக்கப்பட்டன."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"இரவு ஒளி அட்டவணையை அமை"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"திரையின் பிரகாசத்தை குறைக்கும்"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"இரவு ஒளி இயக்கப்பட்டுள்ளது"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+மேலும் <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3537,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"ஏதுமில்லை"</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>
@@ -3559,31 +3628,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"பல சாதனங்களுடன் இணைக்கப்பட்டுள்ளது"</string>
<string name="demo_mode" msgid="2798762752209330277">"சிஸ்டம் பயனர் இடைமுக டெமோ பயன்முறை"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"விரைவு அமைப்புகளின் டெவெலப்பர் கட்டங்கள்"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"உதவுவதற்காகக் காத்திருக்கிறோம்"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"உங்களுக்கு உதவுவதற்காக வாரத்தில் 7 நாட்களும் 24 மணிநேரமும் காத்திருக்கிறோம்"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"உங்களுக்கு உதவுவதற்காக வாரத்தில் 7 நாட்களும் நாளில் 24 மணிநேரமும் காத்திருக்கிறோம்"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"சிக்கலைத் தீர்ப்பதற்கு உதவ, எங்கள் ஆதரவுக் குழுவினர் காத்திருக்கின்றனர்"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"உங்களுக்கு உதவுவதற்காக எங்கள் ஆதரவுக் குழு என்றும், எப்பொழுதும் காத்திருக்கிறது"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"உதவிப் பிரிவில் தேடவும் அல்லது ஆதரவு நேரத்தின் போது தொடர்புகொள்ளவும் (உள்ளூர் நேரம்):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ஃபோன் ஆதரவு நேரம் (உள்ளூர் நேரம்)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"உதவியில் தேடவும் அல்லது உதவிக்குறிப்புகளையும் உத்திகளையும் ஆராயவும்"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"இந்த நாட்டிற்கான ஆதரவு:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"வெளிநாட்டிற்குப் பயணிக்கிறீர்களா?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"சர்வதேசக் பேமெண்ட்கள் விதிக்கப்படலாம்"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"ஃபோன்"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"அரட்டை"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"உதவிக் குறிப்புகள் & உத்திகள் ஆராய்க"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"உதவிக்குச் செல் & கருத்து அனுப்பு"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"ஆதரவைத் தொடர்புகொள்ளவும்"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"உள்நுழைக"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"உள்நுழைய முடியவில்லையா?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"முறைமை தகவலை அனுப்பு"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"மீண்டும் காட்டாதே"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"இவராகக் கோருகிறது:"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"கணக்கைச் சேர்"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"கணினித் தகவல்"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"விண்டோ ட்ரேஸ்"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"சர்ஃபேஸ் டிரேஸ்"</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>
@@ -3599,11 +3645,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> வினாடிகள்</item>
<item quantity="one">1 வினாடி</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"காத்திருப்பு நேரம்: ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</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="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>
@@ -3614,32 +3660,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"கேமராவைத் திறக்க, பவர் பொத்தானை இருமுறை அழுத்தவும்"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"செல்ஃபிப் பயன்முறைக்கு, மொபைலை இருமுறை திருப்பவும்"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"செல்ஃபிப் பயன்முறைக்கு, டேப்லெட்டை இருமுறை திருப்பவும்"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"செல்ஃபிப் பயன்முறைக்கு, சாதனத்தை இருமுறை திருப்பவும்"</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_suggestion_summary" msgid="5987443721392571847">"திரை அணைக்கப்பட்டிருக்கும் போது, அறிவிப்புகளைப் பார்க்கலாம்"</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_pickup_suggestion_summary" msgid="7014700589991761035">"திரை அணைக்கப்பட்டிருக்கும் போது, அறிவிப்புகளைப் பார்க்கலாம்"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"அறிவிப்புகளைப் பார்க்க, சாதனத்தின் பின்புறத்தில் உள்ள கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"அறிவிப்புகளை உடனடியாகப் பார்க்கவும்"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"ஆன்"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"ஆஃப்"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"பூட்லோடர் ஏற்கனவே திறந்துள்ளது"</string>
@@ -3769,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"கோப்பக அணுகல்"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"கோப்பக அணுகல்"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 4e33f6b..5e04466 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"పుష్ బటన్"</item>
<item msgid="1624323946324499595">"పీర్ డివైజ్ నుండి పిన్"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 గంట"</item>
<item msgid="5198271470953124739">"ఎప్పటికీ గడువు ముగియదు"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (డిఫాల్ట్)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"చాలా తక్కువ"</item>
<item msgid="2042505933058940139">"బాగాలేదు"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 రోజులు పైబడినవి"</item>
<item msgid="5692284879054004388">"90 రోజులు పైబడినవి"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"నెట్వర్క్ ప్రాధాన్యతను ఉపయోగించండి"</item>
+ <item msgid="8745603368609022803">"గణించబడేదానిగా పరిగణించండి"</item>
+ <item msgid="2266114985518865625">"గణించబడనిదిగా పరిగణించండి"</item>
+ </string-array>
</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 66ab29c..e5d4d88 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"మీ పరికరాలు"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"కొత్త పరికరాన్ని జత చేయండి"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"జత చేయడానికి పరికరాన్ని అనుమతించండి మరియు బ్లూటూత్ పరికరాలకు కనెక్ట్ చేయండి"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"బ్యాండ్లో రింగ్ అవటాన్ని నిలిపివేయండి"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"బ్లూటూత్ హెడ్సెట్లలో అనుకూల ఫోన్ రింగ్టోన్లను ప్లే చేయవద్దు"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"తేదీని సెట్ చేయి"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"అక్షరక్రమంలో క్రమబద్ధీకరించు"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"సమయ మండలి ద్వారా క్రమబద్ధీకరించు"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>న ప్రారంభమవుతుంది."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"డేలైట్ ఆదా సమయం"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"ప్రామాణిక సమయం"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"ప్రాంతం ద్వారా సమయ మండలి"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"స్థిరమైన ఆఫ్సెట్ సమయ మండళ్లు"</string>
<string name="date_picker_title" msgid="1338210036394128512">"తేదీ"</string>
<string name="time_picker_title" msgid="483460752287255019">"సమయం"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"స్వయంచాలకంగా లాక్ చేయి"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"లాక్ స్క్రీన్ సందేశం"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"విడ్జెట్లను ప్రారంభించు"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"నిర్వాహకులు నిలిపివేసారు"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ఏమీ లేదు"</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">"ఉదా., రాజేష్ గారి Android."</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"ప్రొఫైల్ సమాచారం"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"ఖాతాలు"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"ఎన్క్రిప్షన్ & ఆధారాలు"</string>
@@ -459,9 +471,16 @@
<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="8971630898700461034">"స్క్రీన్ లాక్ను సెట్ చేయండి"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"మీ పరికరాన్ని సంరక్షిస్తుంది"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"వేలిముద్రను ఉపయోగించండి"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"మీ వేలిముద్రతో అన్లాక్ చేయండి"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"స్క్రీన్ లాక్ను ఎంచుకోండి"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"కార్యాలయ లాక్ను ఎంచుకోండి"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"స్పీకర్ ఫోన్ వలె"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"సంగీతం మరియు మీడియా కోసం"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"సెట్టింగ్లను గుర్తుంచుకో"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"గరిష్టంగా కనెక్ట్ అయిన బ్లూటూత్ ఆడియో పరికరాలు"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"గరిష్ట సంఖ్యలో కనెక్ట్ అయిన బ్లూటూత్ ఆడియో పరికరాలను ఎంచుకోండి"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"ప్రసారం చేయండి"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"వైర్లెస్ ప్రదర్శనను ప్రారంభించు"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"సమీపంలోని పరికరాలు కనుగొనబడలేదు."</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"పేరు"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"సైన్ ఇన్ చేయి"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fiని ఆన్ చేయాలనుకుంటోంది"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fiని ఆఫ్ చేయాలనుకుంటోంది"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fiని ప్రారంభించండి"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fiని ఉపయోగించండి"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi సెట్టింగ్లు"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"వైర్లెస్ యాక్సెస్ స్థానాలను సెటప్ చేయండి & నిర్వహించండి"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"పాస్వర్డ్"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"పాస్వర్డ్ను చూపు"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP బ్యాండ్ ఎంచుకోండి"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"స్వీయ"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz బ్యాండ్"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz బ్యాండ్"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP సెట్టింగ్లు"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS అందుబాటులో ఉంది)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"మీ నెట్వర్క్ పాస్వర్డ్ను నమోదు చేయండి"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"క్యారియర్ Wi‑Fi నెట్వర్క్"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ద్వారా కనెక్ట్ చేయండి"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> ద్వారా కనెక్ట్ చేయండి"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి మరియు ఇతర ప్రయోజనాల దృష్ట్యా, <xliff:g id="APP_NAME">%1$s</xliff:g> Wi-Fi ఆఫ్లో ఉన్నప్పటికీ, నెట్వర్క్ను స్కాన్ చేయడం ప్రారంభించాలనుకుంటుంది.\n\nస్కాన్ చేయాలనుకునే అన్ని అనువర్తనాల కోసం దీన్ని అనుమతించాలా?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"దీన్ని ఆఫ్ చేయడానికి, ఓవర్ఫ్లో మెనులో అధునాతనంకి వెళ్లండి."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"అనుమతించు"</string>
@@ -909,10 +933,8 @@
<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_local_only" msgid="857988412470694109">"యాప్లు సమీప పరికరాలతో కంటెంట్ని షేర్ చేయడం కోసం హాట్స్పాట్ని సృష్టించవచ్చు."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"హాట్స్పాట్ని స్వయంచాలకంగా ఆఫ్ చేయి"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"పరికరాలు ఏవీ కనెక్ట్ కాకపోతే Wi‑Fi హాట్స్పాట్ ఆఫ్ అవుతుంది"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"హాట్స్పాట్ను ప్రారంభిస్తోంది…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"హాట్స్పాట్ను ఆపివేస్తోంది…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> సక్రియంగా ఉంది"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android హాట్స్పాట్"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi కాలింగ్"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi కాలింగ్ను ఆన్ చేయండి"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"మొబైల్ నెట్వర్క్ బదులుగా Wi-Fiని ఉపయోగిస్తుంది"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"అత్యవసర చిరునామా"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi-Fi ద్వారా అత్యవసర కాల్ చేసినప్పుడు మీ స్థానాన్ని ఉపయోగించబడుతుంది"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"ప్రైవేట్ DNS లక్షణాల గురించి "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"ప్రదర్శన"</string>
<string name="sound_settings" msgid="5534671337768745343">"ధ్వని"</string>
<string name="all_volume_title" msgid="4296957391257836961">"వాల్యూమ్లు"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"మొబైల్ నెట్వర్క్ రకం"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"ఆపరేటర్ సమాచారం"</string>
<string name="status_data_state" msgid="5503181397066522950">"మొబైల్ నెట్వర్క్ స్థితి"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"సేవ స్థితి"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"సిగ్నల్ సామర్థ్యం"</string>
<string name="status_roaming" msgid="2638800467430913403">"రోమింగ్లో ఉంది"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"మీ కొత్త <xliff:g id="NAME">^1</xliff:g> పని చేస్తోంది. \n\nఫోటోలు, ఫైల్లు మరియు అనువర్తన డేటాను ఈ పరికరానికి తరలించడానికి, సెట్టింగ్లు > నిల్వకు వెళ్లండి."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ని తరలించండి"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g>ను మరియు దాని డేటాను <xliff:g id="NAME_0">^2</xliff:g>కి తరలించడానికి కేవలం కొన్ని క్షణాల సమయం పడుతుంది. మీరు తరలింపు పూర్తయ్యే వరకు అనువర్తనాన్ని ఉపయోగించలేరు. \n\nతరలించే సమయంలో <xliff:g id="NAME_1">^2</xliff:g>ని తీసివేయవద్దు."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"డేటాను తరలించడానికి మీరు వినియోగదారు <xliff:g id="APP">^1</xliff:g>ని అన్లాక్ చేయాలి."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g>ని తరలిస్తోంది…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"తరలించే సమయంలో <xliff:g id="NAME">^1</xliff:g>ని తీసివేయవద్దు. \n\nఈ డివైజ్లోని <xliff:g id="APP">^2</xliff:g> యాప్ తరలింపు పూర్తయ్యే వరకు అందుబాటులో ఉండదు."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"తరలింపు రద్దు చేయి"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"నెట్వర్క్, యాప్లు లేదా పరికరాన్ని రీసెట్ చేయవచ్చు"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, మొబైల్ & బ్లూటూత్ని రీసెట్ చేయండి"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"ఇది అన్ని నెట్వర్క్ సెట్టింగ్లను రీసెట్ చేస్తుంది, వీటితో సహా:\n\n"<li>"Wi‑Fi"</li>\n<li>"మొబైల్ డేటా"</li>\n<li>"బ్లూటూత్"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"eSIMలను కూడా రీసెట్ చేయి"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"సెట్టింగ్లను రీసెట్ చేయి"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"అన్ని నెట్వర్క్ సెట్టింగ్లను రీసెట్ చేయాలా? మీరు ఈ చర్యను తిరిగి రద్దు చేయలేరు!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"సెట్టింగ్లను రీసెట్ చేయి"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"రీసెట్ చేయాలా?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"ఈ వినియోగదారు కోసం నెట్వర్క్ రీసెట్ అందుబాటులో లేదు"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"నెట్వర్క్ సెట్టింగ్లు రీసెట్ చేయబడ్డాయి"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIMలను రీసెట్ చేయడం సాధ్యం కాదు"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"ఎర్రర్ కారణంగా eSIMలను రీసెట్ చేయడం సాధ్యం కాదు."</string>
<string name="master_clear_title" msgid="3531267871084279512">"మొత్తం డేటాను తొలగించండి (ఫ్యాక్టరీ రీసెట్)"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIMలో క్యారియర్లు"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMలు"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ఇది మొబైల్ సేవా ప్లాన్ని రద్దు చేయదు."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"USB నిల్వ"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"SD కార్డు"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"దయచేసి ఇంటర్నెట్కు కనెక్ట్ చేయండి"</string>
<string name="location_title" msgid="1029961368397484576">"నా స్థానం"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"కార్యాలయ ప్రొఫైల్ యొక్క స్థానం"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"మోడ్"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"అధిక నిర్దిష్టత"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"బ్యాటరీ ఆదా"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"పరికరం మాత్రమే"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"స్థానం ఆఫ్లో ఉంది"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"అనువర్తన-స్థాయి అనుమతులు"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"ఇటీవలి స్థాన అభ్యర్థనలు"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"స్థానాన్ని ఇటీవల అనువర్తనాలు ఏవీ అభ్యర్థించలేదు"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"స్థానం సేవలు"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"అధిక బ్యాటరీ వినియోగం"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"తక్కువ బ్యాటరీ వినియోగం"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"స్థానం మోడ్"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"స్థానాన్ని కనుగొనడానికి GPS, Wi‑Fi, బ్లూటూత్ లేదా మొబైల్ నెట్వర్క్లను ఉపయోగిస్తుంది"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"స్థానాన్ని కనుగొనడానికి Wi‑Fi, బ్లూటూత్ లేదా మొబైల్ నెట్వర్క్లను ఉపయోగిస్తుంది"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"స్థానాన్ని గుర్తించడానికి GPS మరియు పరికర సెన్సార్లను ఉపయోగిస్తుంది"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"స్కానింగ్"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi స్కానింగ్"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ఏ సమయంలోనైనా Wi‑Fi నెట్వర్క్లను గుర్తించడానికి సిస్టమ్ అనువర్తనాలు మరియు సేవలను అనుమతించడం ద్వారా స్థానాన్ని మెరుగుపరుస్తుంది."</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"స్థానం మూలాలు"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"చట్టపరమైన సమాచారం, స్థితి, సాఫ్ట్వేర్ సంస్కరణను వీక్షించండి"</string>
<string name="legal_information" msgid="5769301644270604095">"చట్టబద్ధమైన సమాచారం"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"మొత్తం <xliff:g id="COUNT">%1$d</xliff:g> అనువర్తనాలను చూడండి"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"మీ టాబ్లెట్ మరియు వ్యక్తిగత డేటా తెలియని మూలాల్లోని అనువర్తనాల ద్వారా దాడికి గురి కావడానికి ఎక్కువ అవకాశం ఉంటుంది. ఈ మూలం నుండి అనువర్తనాలను ఇన్స్టాల్ చేయడం ద్వారా, ఈ అనువర్తనాలను ఉపయోగించడం ద్వారా మీ టాబ్లెట్కు సంభవించే ఏదైనా నష్టానికి లేదా కోల్పోయే డేటాకి బాధ్యత వహించడానికి మీరు అంగీకరిస్తున్నారు."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"మీ ఫోన్ మరియు వ్యక్తిగత డేటా తెలియని మూలాల్లోని అనువర్తనాల ద్వారా దాడికి గురి కావడానికి ఎక్కువ అవకాశం ఉంటుంది. ఈ మూలం నుండి అనువర్తనాలను ఇన్స్టాల్ చేయడం ద్వారా, ఈ అనువర్తనాలను ఉపయోగించడం వలన మీ ఫోన్కు సంభవించే ఏదైనా నష్టానికి లేదా కోల్పోయే డేటాకి బాధ్యత వహించడానికి మీరు అంగీకరిస్తున్నారు."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"మీ పరికరం మరియు వ్యక్తిగత డేటాపై తెలియని మూలాధారాల నుండి పొందిన యాప్లు దాడి చేసే అవకాశం ఎక్కువగా ఉంది. ఈ మూలాధారం నుండి పొందిన యాప్లను ఇన్స్టాల్ చేయడం ద్వారా, వాటి ఉపయోగం కారణంగా మీ పరికరానికి జరిగే హాని లేదా డేటాని కోల్పోవడం వంటి వాటికి మీరే పూర్తి బాధ్యత వహించడానికి మీరు అంగీకరించాలి."</string>
<string name="advanced_settings" msgid="1777249286757067969">"అధునాతన సెట్టింగ్లు"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"మరిన్ని సెట్టింగ్ల ఎంపికలను ప్రారంభించు"</string>
<string name="application_info_label" msgid="5736524913065714880">"యాప్ సమాచారం"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"పనితీరుపై ప్రభావం చూపవచ్చు"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"పాయింటర్ కదలడం ఆగిపోయిన తర్వాత క్లిక్ చర్య అమలు చేస్తుంది"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"క్లిక్ చేయడానికి ముందు జాప్యం"</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_summary_state_enabled" msgid="8359913912320966304">"ఆన్"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ఆఫ్"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"శీఘ్ర సెట్టింగ్ల్లో చూపు"</string>
@@ -1987,7 +2015,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> ఉంది"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>లోపు ఛార్జ్ చేయాలి"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"నేపథ్య కార్యకలాపం"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"నియంత్రించబడింది"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"నేపథ్యంలో అమలు కావడానికి అనువర్తనాన్ని అనుమతించండి"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"ఉపయోగంలో లేకపోయినా యాప్ నేపథ్యంలో అమలు కాగలదు"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"ఉపయోగంలో లేని సమయంలో యాప్ నేపథ్య కార్యకలాపం పరిమితంగా ఉంటుంది"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"బ్యాటరీ మంచి స్థితిలో ఉంది"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"యాప్లు సాధారణంగా పనిచేస్తున్నాయి"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"తక్కువ బ్యాటరీ సామర్థ్యం"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"బ్యాటరీ మంచి బ్యాటరీ జీవితకాలాన్ని అందించలేదు"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"స్మార్ట్ బ్యాటరీ మేనేజర్ని ఆన్ చేయండి"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"బ్యాటరీ వినియోగాన్ని అనుకూలీకరించడం కోసం ఆన్ చేయండి"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"తక్కువ బ్యాటరీ మోడ్ని ఆన్ చేయండి"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"మీ బ్యాటరీ జీవితకాలాన్ని పెంచండి"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"తక్కువ బ్యాటరీ మోడ్ ఆన్లో ఉంది"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"కొన్ని ఫీచర్లు పరిమితం చేయబడ్డాయి"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ఫోన్ అధికంగా ఉపయోగించబడింది"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"టాబ్లెట్ అధికంగా ఉపయోగించబడింది"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"పరికరం అధికంగా ఉపయోగించబడింది"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి సుమారు <xliff:g id="HOUR">%1$s</xliff:g> సేపు ఉపయోగించబడింది"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"మీ ఫోన్ అధికంగా ఉపయోగించబడినందున బ్యాటరీ ఎక్కువుగా వినియోగించబడింది. మీ బ్యాటరీ సాధారణంగా పని చేస్తోంది.\n\n మీ ఫోన్ చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి సుమారు <xliff:g id="HOUR">%1$s</xliff:g> సేపు ఉపయోగించబడింది.\n\n మొత్తం వినియోగం:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"మీ టాబ్లెట్ అధికంగా ఉపయోగించబడినందున బ్యాటరీ ఎక్కువుగా వినియోగించబడింది. మీ బ్యాటరీ సాధారణంగా పని చేస్తోంది.\n\n మీ టాబ్లెట్ చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి సుమారు <xliff:g id="HOUR">%1$s</xliff:g> సేపు ఉపయోగించబడింది.\n\n మొత్తం వినియోగం:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"మీ పరికరం అధికంగా ఉపయోగించబడినందున బ్యాటరీ ఎక్కువుగా వినియోగించబడింది. మీ బ్యాటరీ సాధారణంగా పని చేస్తోంది.\n\n మీ పరికరం చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి సుమారు <xliff:g id="HOUR">%1$s</xliff:g> సేపు ఉపయోగించబడింది.\n\n మొత్తం వినియోగం:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"స్మార్ట్ బ్యాటరీ మేనేజర్"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"బ్యాటరీని స్వయంచాలకంగా నిర్వహించండి"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"వినియోగం ఆధారంగా స్వయంచాలకంగా యాప్లు వినియోగించిన శక్తిని సర్దుబాటు చేయండి"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"నియంత్రించబడిన యాప్లు"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d యాప్లు</item>
+ <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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"మీడియా సర్వర్"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"అనువర్తన అనుకూలీకరణ"</string>
<string name="battery_saver" msgid="8172485772238572153">"బ్యాటరీ సేవర్"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"బ్యాటరీ సేవర్ని ఉపయోగించండి"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"స్వయంచాలకంగా ఆన్ చేయి"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ఎప్పటికీ వద్దు"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> బ్యాటరీ ఉన్నప్పుడు"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"సమకాలీకరణ ప్రస్తుతం సమస్యలను ఎదుర్కొంటోంది. ఇది త్వరలో అందుబాటులోకి వస్తుంది."</string>
<string name="add_account_label" msgid="7811707265834013767">"ఖాతాను జోడించు"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"కార్యాలయ ప్రొఫైల్ ఇప్పటికీ అందుబాటులో లేదు"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"కార్యాలయ మోడ్"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"అనువర్తనాలు, నేపథ్య సమకాలీకరణ మరియు సంబంధిత లక్షణాలతో సహా కార్యాలయ ప్రొఫైల్ను పని చేయడానికి అనుమతిస్తుంది"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"కార్యాలయ ప్రొఫైల్ను తీసివేయి"</string>
<string name="background_data" msgid="5779592891375473817">"నేపథ్య డేటా"</string>
<string name="background_data_summary" msgid="8328521479872763452">"అనువర్తనాలు ఏ సమయంలోనైనా డేటాను సమకాలీకరించవచ్చు, పంపవచ్చు మరియు స్వీకరించవచ్చు"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"ఖాతాను తీసివేయాలా?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ఈ ఖాతాను తీసివేయడం వలన టాబ్లెట్ నుండి దీనికి చెందిన మొత్తం సందేశాలు, పరిచయాలు మరియు ఇతర డేటా తొలగించబడతాయి!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ఈ ఖాతాను తీసివేయడం వలన ఫోన్ నుండి దానికి సంబంధించిన మొత్తం సందేశాలు, పరిచయాలు మరియు ఇతర డేటా తొలగించబడతాయి!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"ఈ ఖాతాను తీసివేయడం వలన పరికరం నుండి దానికి సంబంధించిన అన్ని సందేశాలు, పరిచయాలు మరియు ఇతర డేటా తొలగించబడతాయి!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"ఈ మార్పును మీ నిర్వాహకులు అనుమతించలేదు"</string>
<string name="provider_label" msgid="7724593781904508866">"పుష్ చందాలు"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="other">ప్రమాణపత్రాలను తనిఖీ చేయి</item>
<item quantity="one">ప్రమాణపత్రాన్ని తనిఖీ చేయి</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"వినియోగదారులు"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"వినియోగదారులు & ప్రొఫైల్లు"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"వినియోగదారు లేదా ప్రొఫైల్ను జోడించు"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"వినియోగదారును జోడించు"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"బ్లూటూత్, ప్రసారం"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"యాప్లు & నోటిఫికేషన్లు"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"అనుమతులు, డిఫాల్ట్ యాప్లు"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"వినియోగదారులు & ఖాతాలు"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ఆటంకం కలిగించవద్దు, అంతరాయం కలిగించు, అంతరాయం, విరామం"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"సమీపం, స్థానం, చరిత్ర, నివేదన"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"ఖచ్చితత్వం"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"ఖాతా"</string>
<string name="keywords_users" msgid="3434190133131387942">"పరిమితి, పరిమితం చేయి, పరిమితం చేయబడింది"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"వచన దిద్దుబాటు, దిద్దుబాటు చేయి, ధ్వని, వైబ్రేట్, స్వయంచాలకం, భాష, సంజ్ఞ, సూచించు, సూచన, థీమ్, అభ్యంతరకరం, పదం, రకం, ఎమోజీ, అంతర్జాతీయం"</string>
@@ -2872,6 +2924,7 @@
<item quantity="one">1 నియమం</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"అంతరాయం కలిగించవద్దు"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"అంతరాయం కలిగించవద్దును ఆన్ చేయండి"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ప్రవర్తన"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"దీని నుండి అన్ని ధ్వనులు మరియు వైబ్రేషన్లు"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ధ్వని చేయదు"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"స్వయంచాలకంగా ఆన్ చేయండి"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"స్వయంచాలక నిబంధనలు"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"స్వయంచాలక నియమం"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"అంతరాయం కలిగించవద్దు నియమాలు సెట్ చేయి"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"నిర్దిష్ట సమయాలలో ధ్వనులు, వైబ్రేషన్లను పరిమితంగా ఉంచుతుంది"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"మొత్తం నిశ్శబ్దం"</string>
@@ -2890,12 +2946,15 @@
<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_add" msgid="90014394953272517">"జోడించు"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ఇప్పుడే ఆన్ చేయండి"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ఇప్పుడే ఆఫ్ చేయండి"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"ఆన్ చేయండి"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ఇప్పుడు ఆన్ చేయండి"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ఇప్పుడు ఆఫ్ చేయండి"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> వరకు అంతరాయం కలిగించవద్దు ఆన్లో ఉంటుంది"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"మీరు అంతరాయం కలిగించవద్దుని ఆఫ్ చేసేంత వరకు ఇది ఆన్లో ఉంటుంది"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"<xliff:g id="RULE_NAME">%s</xliff:g> నియమం ద్వారా అంతరాయం కలిగించవద్దు స్వయంచాలకంగా ఆన్ చేయబడింది"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"యాప్ <xliff:g id="APP_NAME">%s</xliff:g> ద్వారా అంతరాయం కలిగించవద్దు స్వయంచాలకంగా ఆన్ చేయబడింది"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"ప్రాధాన్యత మాత్రమే"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2970,7 @@
<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="recent_notifications" msgid="5660639387705060156">"ఇటీవల పంపినవి"</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>
@@ -2930,7 +2990,7 @@
<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_importance_title" msgid="848692592679312666">"ప్రాముఖ్యత"</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="5455049524984686275">"శబ్ద లేదా దృశ్య అంతరాయం కలిగించవద్దు"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"మధ్యస్థ ప్రాముఖ్యత"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"నోటిఫికేషన్ యాక్సెస్"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"కార్యాలయ ప్రొఫైల్ నోటిఫికేషన్లకు యాక్సెస్ బ్లాక్ చేయబడింది"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"అంతరాయం కలిగించవద్దు యాక్సెస్"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"ఇన్స్టాల్ చేసిన యాప్లేవీ అంతరాయం కలిగించవద్దు యాక్సెస్ అభ్యర్థించలేదు"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"అనువర్తనాలను లోడ్ చేస్తోంది..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ఈ డివైజ్లో ఈ యాప్ యొక్క నోటిఫికేషన్లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ఈ పరికరంలో ఈ వర్గం యొక్క నోటిఫికేషన్లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ఈ పరికరంలో ఈ సమూహం యొక్క నోటిఫికేషన్లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ యాప్ యొక్క నోటిఫికేషన్లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ వర్గం యొక్క నోటిఫికేషన్లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ సమూహం యొక్క నోటిఫికేషన్లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
<string name="notification_channels" msgid="5346841743182627500">"వర్గాలు"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"ఇతరం"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3126,6 +3187,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"మీ పరికరాన్ని అన్లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ పాస్వర్డ్ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్లు, సందేశాలు లేదా నోటిఫికేషన్లను స్వీకరించదు. \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="1793719723017395175">"అవును"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"లేదు"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"పిన్ అవసరమా?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ఆకృతి అవసరమా?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"పాస్వర్డ్ అవసరమా?"</string>
@@ -3398,7 +3461,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"ప్రస్తుత వినియోగదారు: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g>గా సైన్ ఇన్ చేసారు"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> డిఫాల్ట్గా ఉంది"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"ఆన్ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"ఆఫ్"</string>
<string name="backup_disabled" msgid="485189128759595412">"బ్యాకప్ నిలిపివేయబడింది"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g>కి నవీకరించబడింది"</string>
@@ -3408,6 +3472,7 @@
<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="6346948990624612516">"బ్యాకప్లను ఆపివేయడం సాధ్యపడదు"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"ఈ చర్య నిలిపివేయబడింది. మరింత తెలుసుకోవాలంటే, మీ సంస్థ యొక్క నిర్వాహకులను సంప్రదించండి."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"మరిన్ని వివరాలు"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"సెట్టింగ్లు, అనుమతులు, కార్పొరేట్ యాక్సెస్, నెట్వర్క్ కార్యకలాపం మరియు డివైజ్ యొక్క స్థాన సమాచారంతో పాటు మీ కార్యాలయ ప్రొఫైల్కి అనుబంధితంగా ఉన్న యాప్లు మరియు డేటాని మీ నిర్వాహకులు పర్యవేక్షించగలరు మరియు నిర్వహించగలరు ."</string>
@@ -3431,9 +3496,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"కార్యాలయ ప్రొఫైల్ ఆఫ్లో ఉంది"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"మీ కార్యాలయ ప్రొఫైల్కి సంబంధించిన అనువర్తనాలు, నేపథ్య సమకాలీకరణ మరియు ఇతర లక్షణాలు ఆఫ్ చేయబడ్డాయి."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"రాత్రి కాంతి షెడ్యూల్ని సెట్ చేయండి"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"నిద్ర పట్టేలా స్క్రీన్ కాషాయ రంగు వర్ణబేధం మారుస్తుంది"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"రాత్రి కాంతి ఆన్లో ఉంది"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> మరిన్ని"</string>
@@ -3538,6 +3605,8 @@
<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_none" msgid="5144174674654097316">"ఏదీ కాదు"</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>
@@ -3560,31 +3629,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"బహుళ పరికరాలకు కనెక్ట్ చేయబడింది"</string>
<string name="demo_mode" msgid="2798762752209330277">"సిస్టమ్ UI డెమో మోడ్"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"త్వరిత సెట్టింగ్లు డెవలపర్ టైల్లు"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"మేము సహాయం అందిస్తాము"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"మేము మీ కోసం 24/7 అందుబాటులో ఉంటాము"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"మేము మీ కోసం 24 7 అందుబాటులో ఉంటాము"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"మా మద్దతు బృందం ఎలాంటి సమస్యకు సహాయం చేయడానికైనా అందుబాటులో ఉంటుంది"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"మా సహాయక బృందం ఎల్లవేళలా అందుబాటులో ఉంటుంది"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"సహాయం కోసం శోధించండి లేదా ఈ సహాయ వేళల్లో (స్థానిక సమయం) సంప్రదించండి:<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ఫోన్ సహాయ వేళలు (స్థానిక సమయం)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"సహాయాన్ని శోధించండి లేదా చిట్కాలు & సలహాలను విశ్లేషించండి"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"ఈ దేశాలకు మద్దతు:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"విదేశాలకు ప్రయాణిస్తున్నారా?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"అంతర్జాతీయ ఛార్జీలు వర్తించవచ్చు"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"ఫోన్"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"చాట్"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"చిట్కాలు & ఉపాయాలను చూడండి"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"సహాయాన్ని శోధించండి & అభిప్రాయాన్ని పంపండి"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"మద్దతు విభాగాన్ని సంప్రదించండి"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"సైన్ ఇన్ చేయి"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"సైన్ ఇన్ చేయలేకపోతున్నారా?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"సిస్టమ్ సమాచారాన్ని పంపండి"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"మళ్లీ చూపవద్దు"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"దీనితో అభ్యర్థిస్తున్నారు"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"ఖాతాను జోడించండి"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"సిస్టమ్ సమాచారం"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"విండో స్థితిగతి కనుగొనడం"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ఉపరితలం స్థితిగతి"</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>
@@ -3600,11 +3646,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> సెకన్లు</item>
<item quantity="one">1 సెకను</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> వేచి ఉండాలి"</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="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>
@@ -3615,32 +3661,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"కెమెరాని తెరవడం కోసం పవర్ బటన్ని రెండుసార్లు నొక్కండి"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"సెల్ఫీ మోడ్ కోసం ఫోన్ని రెండుసార్లు ముందుకు వెనుకకు కదపండి"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"సెల్ఫీ మోడ్ కోసం టాబ్లెట్ని రెండుసార్లు ముందుకు వెనుకకు కదపండి"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"సెల్ఫీ మోడ్ కోసం పరికరాన్ని రెండుసార్లు ముందుకు వెనుకకు కదపండి"</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_suggestion_summary" msgid="5987443721392571847">"స్క్రీన్ ఆఫ్ చేయబడినప్పుడు నోటిఫికేషన్ల కోసం తనిఖీ చేయి"</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_pickup_suggestion_summary" msgid="7014700589991761035">"స్క్రీన్ ఆఫ్ చేయబడినప్పుడు నోటిఫికేషన్ల కోసం తనిఖీ చేయి"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"మీ నోటిఫికేషన్లను తనిఖీ చేయడానికి, మీ పరికరం వెనుకవైపు ఉన్న వేలిముద్ర సెన్సార్పై క్రిందికి స్వైప్ చేయండి."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"నోటిఫికేషన్లను త్వరగా చూడండి"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"వేలిముద్ర సెన్సార్పై దిగువకు స్వైప్ చేయండి"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"ఆన్"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"ఆఫ్"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"బూట్లోడర్ ఇప్పటికే అన్లాక్ చేయబడింది"</string>
@@ -3770,8 +3809,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"డైరెక్టరీ యాక్సెస్"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"డైరెక్టరీ యాక్సెస్"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index ad34e20..d83aa73 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"1 година"</item>
<item msgid="5198271470953124739">"Без часу очікування"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (за умовчанням)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Слабкий"</item>
<item msgid="2042505933058940139">"Слабкий"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"Старіші за 60 днів"</item>
<item msgid="5692284879054004388">"Додані понад 90 днів тому"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Використовувати параметри мережі"</item>
+ <item msgid="8745603368609022803">"Вважати тарифікованою"</item>
+ <item msgid="2266114985518865625">"Вважати нетарифікованою"</item>
+ </string-array>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6a1cdf5..d9110f2 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -172,6 +172,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваші пристрої"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Підключити новий пристрій"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Дозволити пристрою підключатися та під’єднуватися до пристроїв Bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Вимкнути внутрішньосмугові сигнали"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Не відтворювати спеціальні сигнали дзвінка телефона через гарнітуру Bluetooth"</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>
@@ -334,6 +336,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Дата"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Сортувати за алфавітом"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сортувати за часовим поясом"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> починається <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Літній час"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Стандартний час"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Часові пояси за регіонами"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Часові пояси з фіксованим зсувом"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
<string name="time_picker_title" msgid="483460752287255019">"Час"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Автоматичне блокування"</string>
@@ -352,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Інформація профілю"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Облікові записи"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрування й облікові дані"</string>
@@ -713,6 +721,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Як пристр.гучн.зв’язку"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музики та медіа"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запам\'ятати налашт."</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Максимальна кількість підключених аудіопристроїв Bluetooth"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Вибрати максимальну кількість підключених аудіопристроїв Bluetooth"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Трансляція"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Увімкнути бездротовий екран"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Не знайдено пристроїв поблизу."</string>
@@ -727,6 +737,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Назва"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 ГГц"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ГГц"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Увійти"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Мбіт/с"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"Додаток <xliff:g id="REQUESTER">%s</xliff:g> хоче ввімкнути Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"Додаток <xliff:g id="REQUESTER">%s</xliff:g> хоче вимкнути Wi-Fi"</string>
@@ -744,6 +755,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Увімкнути Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Використовувати Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Налаштування Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Налашт. і керуйте бездрот. точками доступу"</string>
@@ -855,7 +867,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" Є доступ до WPS"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Введіть пароль своєї мережі"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Мережа Wi-Fi оператора"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Під’єднатися через мережу оператора <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Під’єднатися через мережу оператора <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей, програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче вмикати сканування мережі, навіть коли Wi-Fi вимкнено.\n\nДозволити це для всіх програм, які потребують сканування?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Щоб вимкнути, у додатковому меню виберіть \"Додатково\"."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволити"</string>
@@ -933,10 +945,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Діапазон частот точки доступу"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Створіть мережу Wi-Fi для своїх пристроїв за допомогою точки доступу. Точка доступу надає інтернет-з’єднання через мобільне передавання даних. Може стягуватися додаткова плата за використання мобільного трафіку."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Додатки можуть створювати точку доступу, щоб ділитися вмістом із пристроями поруч."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Вимикати точку доступу автоматично"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Якщо немає під’єднаних пристроїв, точка доступу Wi-Fi вимикатиметься"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Увімкнення точки доступу…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Вимкнення точки доступу…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> активовано"</string>
@@ -985,6 +995,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Екстрена адреса"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Використовується як адреса, коли ви телефонуєте в екстрені служби через Wi-Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Докладніше"</annotation>" про функції приватної DNS"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
<string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Гучність"</string>
@@ -1334,6 +1345,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Новий пристрій пам’яті <xliff:g id="NAME">^1</xliff:g> налаштовано. \n\nЩоб перемістити на нього фотографії, файли й дані додатків, перейдіть у \"Налаштування\" > \"Пам’ять\"."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Перемістити додаток <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Переміщення додатка <xliff:g id="APP">^1</xliff:g> та його даних на пристрій <xliff:g id="NAME_0">^2</xliff:g> займе лише кілька хвилин. Ви не зможете користуватися додатком, поки не завершиться переміщення. \n\nНе видаляйте <xliff:g id="NAME_1">^2</xliff:g> під час переміщення"</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Щоб перемістити дані, потрібно розблокувати користувача <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Переміщення додатка <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Не видаляйте <xliff:g id="NAME">^1</xliff:g> під час переміщення. \n\nВи не зможете користуватися додатком <xliff:g id="APP">^2</xliff:g> на цьому пристрої, поки не завершиться переміщення."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Скасувати переміщення"</string>
@@ -1494,6 +1506,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Джерела даних про місцезнаходження"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"Переглянути правову інф-ю, стан, версію ПЗ"</string>
<string name="legal_information" msgid="5769301644270604095">"Правова інформація"</string>
@@ -1601,6 +1614,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Переглянути всі додатки: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ваш планшет і особисті дані більш уразливі до атак із боку додатків із невідомих джерел Установлюючи додатки з цього джерела, ви погоджуєтеся, що несете відповідальність за будь-яку шкоду, заподіяну вашому планшету, чи втрату даних унаслідок використання таких додатків."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваш телефон і особисті дані більш уразливі до атак із боку додатків із невідомих джерел Установлюючи додатки з цього джерела, ви погоджуєтеся, що несете відповідальність за будь-яку шкоду, заподіяну вашому телефону, чи втрату даних унаслідок використання таких додатків."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Ваш пристрій і особисті дані більш уразливі до атак невідомих додатків. Установлюючи додатки з цього джерела, ви погоджуєтеся, що несете відповідальність за будь-яку шкоду, заподіяну вашому пристрою, чи втрату даних унаслідок використання таких додатків."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Розширені налаштування"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Увімкнути додаткові варіанти налаштувань"</string>
<string name="application_info_label" msgid="5736524913065714880">"Про додаток"</string>
@@ -1902,6 +1916,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Може вплинути на продуктивність"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Клік після зупинки курсора"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Затримка перед кліком"</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_summary_state_enabled" msgid="8359913912320966304">"УВІМК."</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ВИМК."</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Показувати на панелі швидкого налаштування"</string>
@@ -2072,14 +2089,37 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Акумулятор заряджено"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Додатки працюють нормально"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Низький заряд акумулятора"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Акумулятор працюватиме недовго"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Увімкніть диспетчер заряду акумулятора"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Увімкніть, щоб оптимізувати використання акумулятора"</string>
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
<skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Телефон використовувався активно"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Планшет використовувався активно"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Пристрій використовувався активно"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Використовувався впродовж <xliff:g id="HOUR">%1$s</xliff:g> з часу останнього повного заряджання"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Через активне використання телефона заряд акумулятора значно знизився. Акумулятор працює нормально.\n\n Ви користувалися телефоном впродовж <xliff:g id="HOUR">%1$s</xliff:g> з часу останнього повного заряджання.\n\n Загалом спожито:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Через активне використання планшета заряд акумулятора значно знизився. Акумулятор працює нормально.\n\n Ви користувалися планшетом впродовж <xliff:g id="HOUR">%1$s</xliff:g> з часу останнього повного заряджання.\n\n Загалом спожито:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Через активне використання пристрою заряд акумулятора значно знизився. Акумулятор працює нормально.\n\n Ви користувалися пристроєм впродовж <xliff:g id="HOUR">%1$s</xliff:g> з часу останнього повного заряджання.\n\n Загалом спожито:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Smart battery manager"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Автоматичне керування зарядом акумулятора"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Автоматично регулює заряд акумулятора на основі його використання додатками"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Обмежені додатки"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d додаток</item>
+ <item quantity="few">%1$d додатки</item>
+ <item quantity="many">%1$d додатків</item>
+ <item quantity="other">%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>
@@ -2188,6 +2228,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Медіа-сервер"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Оптимізація додатка"</string>
<string name="battery_saver" msgid="8172485772238572153">"Режим економії заряду акумулятора"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Використовувати режим економії заряду акумулятора"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Вмикати автоматично"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Ніколи"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"коли рівень заряду акумулятора – <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2408,6 +2449,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Видалити обліковий запис?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Видалення цього облікового запису призведе до видалення всіх його повідомлень, контактів та інших даних із планшетного ПК."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Видалення цього облікового запису призведе до видалення всіх його повідомлень, контактів та інших даних із телефону."</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Якщо видалити цей обліковий запис, ви втратите всі його повідомлення, контакти й інші дані на пристрої."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Ця дія заборонена адміністратором"</string>
<string name="provider_label" msgid="7724593781904508866">"Надіслати підписки"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2944,8 +2986,8 @@
<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_add" msgid="90014394953272517">"Додати"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"УВІМКНУТИ"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ВИМКНУТИ"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Увімкнути"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Вимкнути"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Режим \"Не турбувати\" ввімкнено до <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Режим \"Не турбувати\" буде ввімкнено, доки ви його не вимкнете."</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Правило (<xliff:g id="RULE_NAME">%s</xliff:g>) автоматично ввімкнуло режим \"Не турбувати\""</string>
@@ -2984,7 +3026,7 @@
<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_importance_title" msgid="848692592679312666">"Пріоритет"</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="5455049524984686275">"Без звуку та візуальних сповіщень"</string>
@@ -3002,6 +3044,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Середній пріоритет"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"Доступ до сповіщень"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Доступ до сповіщень робочого профілю заблоковано"</string>
@@ -3034,9 +3077,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ у режимі \"Не турбувати\""</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Установлені додатки не запитували доступу до функції \"Не турбувати\""</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Завантаження додатків…"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android блокує сповіщення з цього додатка на цьому пристрої"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android блокує цю категорію сповіщень на цьому пристрої"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android блокує цю групу сповіщень на цьому пристрої"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"На ваш запит Android блокує сповіщення з цього додатка на пристрої"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"На ваш запит Android блокує цю категорію сповіщень на пристрої"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"На ваш запит Android блокує цю групу сповіщень на пристрої"</string>
<string name="notification_channels" msgid="5346841743182627500">"Категорії"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Інше"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3651,31 +3694,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Під’єднано до кількох пристроїв"</string>
<string name="demo_mode" msgid="2798762752209330277">"Демо-режим інтерфейсу системи"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Швидкі налаштування блоку розробника"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Ми готові допомогти"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Ми працюємо цілодобово та без вихідних"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Ми працюємо цілодобово та без вихідних"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Наша служба підтримки допоможе вам вирішити будь-які проблеми"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Наша команда підтримки працює цілодобово та без вихідних"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Скористайтеся довідкою або зв’яжіться з нами в години роботи (за місцевим часом):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Години роботи служби підтримки телефоном (за місцевим часом):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Шукайте в довідці або читайте поради та підказки"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Підтримується:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Подорожуєте за кордоном?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Може стягуватися плата за дзвінок в іншу країну"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Чат"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Переглянути поради та підказки"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Шукати в довідковому центрі/надіслати відгук"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Зв’яжіться зі службою підтримки"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Увійти"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Не можете ввійти?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Надіслати інформацію про систему"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Більше не показувати"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Запит з облікового запису"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Додати обліковий запис"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Інформація про систему"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Трасування вікон"</string>
+ <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Трасування шарів"</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>
@@ -3697,11 +3717,11 @@
<item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Очікування ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</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="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>
@@ -3881,8 +3901,8 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
- <skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <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="storage_access" msgid="8905018810338984531">"Доступ до пам’яті"</string>
+ <string name="keywords_storage_access" msgid="3708874088152933579">"пам’ять доступ охоплення каталог"</string>
</resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 5ec72cd..0a9eb86 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"پش بٹن"</item>
<item msgid="1624323946324499595">"ہمسر آلہ سے PIN"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 گھنٹہ"</item>
<item msgid="5198271470953124739">"کبھی ٹائم آؤٹ نہ کریں"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (ڈیفالٹ)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"ناقص"</item>
<item msgid="2042505933058940139">"ناقص"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 دن سے زیادہ پرانی"</item>
<item msgid="5692284879054004388">"90 دن سے زیادہ پرانی"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"نیٹ ورک کی ترجیح استعمال کریں"</item>
+ <item msgid="8745603368609022803">"میٹر شدہ کے بطور خیال کریں"</item>
+ <item msgid="2266114985518865625">"غیر میٹر شدہ کے بطور خیال کریں"</item>
+ </string-array>
</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 80eaa3f..641f589 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"آپ کے آلات"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"نئے آلہ کا جوڑا بنائیں"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"آلہ کو جوڑا بنانے اور بلوٹوتھ آلات سے منسلک کرنے کی اجازت دیں"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ان بینڈ رنگنگ کو غیر فعال کریں"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"بلوٹوتھ ہیڈ سیٹس پر حسب ضرورت رنگ ٹونز نہ بجائیں"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"تاریخ سیٹ کریں"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"حروف تہجی کے لحاظ سے ترتیب دیں"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ٹائم زون کے لحاظ سے ترتیب دیں"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> کو شروع ہوتا ہے۔"</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"ڈے لائٹ سیونگز کا وقت"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"معیاری وقت"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"علاقے کے لحاظ سے ٹائم زون"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"طے شدہ آف سیٹ ٹائم زونز"</string>
<string name="date_picker_title" msgid="1338210036394128512">"تاریخ"</string>
<string name="time_picker_title" msgid="483460752287255019">"وقت"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"خود کار طور پر مقفل کریں"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"مقفل اسکرین پیغام"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"ویجیٹس کو فعال کریں"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"منتظم کی طرف سے غیر فعال کردہ"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"کوئی نہیں"</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">"مثلاً، Joe کا Android۔"</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"پروفائل کی معلومات"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"اکاؤنٹس"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"مرموز کاری اور اسناد"</string>
@@ -459,9 +471,16 @@
<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="8971630898700461034">"اسکرین کا قفل سیٹ کریں"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"اپنے آلہ کا تحفظ کریں"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"فنگر پرنٹ استعمال کریں"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"اپنے فنگر پرنٹ کے ساتھ غیر مقفل کریں"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"اسکرین لاک منتخب کریں"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"دفتری قفل منتخب کریں"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"بطور اسپیکر فون"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"موسیقی اور میڈیا کیلئے"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ترتیبات کو یاد رکھیں"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"زیادہ سے زیادہ منسلک بلوٹوتھ آڈیو آلات"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"منسلک بلوٹوتھ آڈیو آلات کی زیادہ سے زیادہ تعداد منتخب کریں"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"کاسٹ کریں"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"وائرلیس ڈسپلے فعال کریں"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"کوئی قریبی آلات نہیں ملے۔"</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"نام"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"سائن ان کریں"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi کو آن کرنا چاہتی ہے"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi کو آف کرنا چاہتی ہے"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi آن کریں"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fi استعمال کریں"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi ترتیبات"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"وائرلیس رسائی پوائنٹس کو ترتیب دیں اور ان کا نظم کریں"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"پاس ورڈ"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"پاس ورڈ دکھائیں"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP بینڈ منتخب کریں"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"خودکار"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz بینڈ"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz بینڈ"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ترتیبات"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS دستیاب ہے)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"اپنا نیٹ ورک پاس ورڈ درج کریں"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"کیریئر Wi‑Fi نیٹ ورک"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"منسلک ہوں بذریعہ <xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"منسلک ہوں بذریعہ <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"مقام کی قطعیت کو بہتر بنانے اور دوسرے مقاصد کیلئے، <xliff:g id="APP_NAME">%1$s</xliff:g> Wi-Fi بند ہونے پر بھی نیٹ ورک اسکیننگ آن کرنا چاہتی ہے۔\n\nاسکین کرنے کی خواہاں سبھی ایپس کیلئے اس کی اجازت دیں؟"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"اسے آف کرنے کیلئے، اوور فلو مینو میں ایڈوانسڈ پر جائیں۔"</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"اجازت دیں"</string>
@@ -909,10 +933,8 @@
<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_local_only" msgid="857988412470694109">"قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایپس ایک ہاٹ اسپاٹ بنا سکتی ہیں۔"</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"خودکار طور پر ہاٹ اسپاٹ آف کریں"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"کوئی آلہ منسلک نہ ہونے پر Wi‑Fi ہاٹ اسپاٹ آف ہو جائے گا"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"ہاٹ اسپاٹ آن ہو رہا ہے…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"ہاٹ اسپاٹ آف ہو رہا ہے…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> فعال ہے"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi کالنگ"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi کالنگ آن کریں"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"موبائل نیٹ ورک کے بجائے Wi-Fi استعمال کریں"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"ہنگامی پتہ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"جب آپ Wi-Fi سے ہنگامی کال کرتے ہیں، تو آپ کے مقام کے طور پر استعمال ہوتا ہے"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"نجی DNS کی خصوصیات کے بارے میں "<annotation id="url">"مزید جانیں"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"ڈسپلے"</string>
<string name="sound_settings" msgid="5534671337768745343">"آواز"</string>
<string name="all_volume_title" msgid="4296957391257836961">"والیومز"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"موبائل نیٹ ورک کی قسم"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"آپریٹر کی معلومات"</string>
<string name="status_data_state" msgid="5503181397066522950">"موبائل نیٹ ورک کی صورت حال"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"سروس کی صورت حال"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"سگنل کی قوت"</string>
<string name="status_roaming" msgid="2638800467430913403">"رومنگ"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"آپ کا نیا <xliff:g id="NAME">^1</xliff:g> کام کر رہا ہے۔ \n\nتصاویر، فائلیں اور ایپ کا ڈیٹا اس آلہ پر منتقل کرنے کیلئے، ترتیبات > اسٹوریج پر جائیں۔"</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> کو منتقل کریں"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> اور اس کا ڈیٹا <xliff:g id="NAME_0">^2</xliff:g> میں منتقل کرنے میں بس تھوڑی دیر لگے گی۔ منتقلی مکمل ہونے تک آپ ایپ کو استعمال نہیں کر سکیں گے۔ \n\nمنتقلی کے دوران <xliff:g id="NAME_1">^2</xliff:g> کو نہ ہٹائیں۔"</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ڈیٹا منتقل کرنے کیلئے آپ کو صارف <xliff:g id="APP">^1</xliff:g> کو غیر مقفل کرنے کی ضرورت ہے۔"</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> کو منتقل کیا جا رہا ہے…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"منتقلی کے دوران <xliff:g id="NAME">^1</xliff:g> کو نہ ہٹائیں۔ \n\nاس آلہ پر <xliff:g id="APP">^2</xliff:g> ایپ منتقلی مکمل ہونے تک دستیاب نہیں ہوگی۔"</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"منتقلی منسوخ کریں"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"نیٹ ورک، ایپس، یا آلہ کو ری سیٹ کیا جا سکتا ہے"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi، موبائل اور بلوٹوتھ کو دوبارہ ترتیب دیں"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"یہ نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دے گا، بشمول:\n\n"<li>"Wi‑Fi"</li>\n<li>"موبائل ڈیٹا"</li>\n<li>"بلوٹوتھ"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"eSIMs کو بھی دوبارہ ترتیب دیں"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"ترتیبات دوبارہ ترتیب دیں"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"ترتیبات دوبارہ ترتیب دیں"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"دوبارہ ترتیب دیں؟"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"اس صارف کیلئے نیٹ ورک کو دوبارہ ترتیب دینا دستیاب نہیں ہے"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"نیٹ ورک کی ترتیبات کو دوبارہ ترتیب دیا گیا ہے"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIMs کو دوبارہ ترتیب نہیں دے سکتے"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"ایک خرابی کی وجہ سے eSIMs کو دوبارہ ترتیب نہیں دیا جا سکتا۔"</string>
<string name="master_clear_title" msgid="3531267871084279512">"تمام ڈیٹا (فیکٹری ری سیٹ) حذف کریں"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008">""<li>"eSIM پر موجود کیریئرس"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIMs"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"اس سے آپ کے موبائل سروس کا پلان منسوخ نہیں ہوگا۔"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا، "<b>"USB اسٹوریج"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا صاف کرنے کیلئے، "<b>"SD کارڈ"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"براہ کرم انٹرنیٹ سے مربوط کریں"</string>
<string name="location_title" msgid="1029961368397484576">"میرا مقام"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"دفتری پروفائل کیلئے مقام"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"وضع"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"اعلی درستگی"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"بیٹری کی بچت"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"صرف آلہ"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"مقام آف ہے"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"ایپ کی سطح کی اجازتیں"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"حالیہ مقام کی درخواستیں"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"حال میں کسی ایپس نے مقام کی درخواست نہیں کی ہے"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"مقام کی سروسز"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"بیٹری کا زیادہ استعمال"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"بیٹری کا کم استعمال"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"مقام وضع"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"مقام کا تعین کرنے کیلئے GPS، Wi‑Fi، بلوٹوتھ یا موبائل نیٹ ورکس استعمال کریں"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"مقام کا تعین کرنے کیلئے Wi‑Fi، بلوٹوتھ یا موبائل نیٹ ورکس استعمال کریں"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"مقام کا تعین کرنے کیلئے GPS اور آلہ کے سینسرز کا استعمال کریں"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"اسکیننگ"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi اسکیننگ"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"سسٹم ایپس اور سروسز کو کسی بھی وقت Wi‑Fi نیٹ ورکس کا پتا لگانے کی اجازت دے کر مقام کو بہتر بنائیں۔"</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"مقام کے مآخذ"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"قانونی معلومات، اسٹیٹس، سافٹ ویئر ورژن دیکھیں"</string>
<string name="legal_information" msgid="5769301644270604095">"قانونی معلومات"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"سبھی <xliff:g id="COUNT">%1$d</xliff:g> ایپس دیکھیں"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"آپ کے ٹیبلیٹ اور ذاتی ڈیٹا کو نامعلوم ایپس کی جانب سے حملے کا زیادہ خطرہ ہے۔ اس ذریعے سے ایپس ڈاؤن لوڈ کر کے، آپ اس بات سے اتفاق کرتے ہیں کہ آپ ان ایپس سے اپنے ٹیبلیٹ کو ہونے والے کسی بھی نقصان یا ڈیٹا کے نقصان کیلئے تنہا خود ذمہ دار ہوں گے۔"</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"آپ کے فون اور ذاتی ڈیٹا کو نامعلوم ایپس کی جانب سے حملے کا زیادہ خطرہ ہے۔ اس ذریعے سے ایپس ڈاؤن لوڈ کر کے، آپ اس بات سے اتفاق کرتے ہیں کہ آپ ان ایپس سے اپنے فون کو ہونے والے کسی بھی نقصان یا ڈیٹا کے نقصان کیلئے تنہا خود ذمہ دار ہوں گے۔"</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"آپ کے آلے اور ذاتی ڈیٹا کو نامعلوم ایپس کی جانب سے حملے کا زیادہ خطرہ ہے۔ اس ذریعے سے ایپس ڈاؤن لوڈ کر کے، آپ اس بات سے اتفاق کرتے ہیں کہ آپ ان ایپس سے اپنے آلے کو ہونے والے کسی بھی نقصان یا ڈیٹا کے نقصان کیلئے تنہا خود ذمہ دار ہوں گے۔"</string>
<string name="advanced_settings" msgid="1777249286757067969">"جدید ترین ترتیبات"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"مزید ترتیبات اختیارات کو فعال کریں"</string>
<string name="application_info_label" msgid="5736524913065714880">"ایپ کی معلومات"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"کارکردگی متاثر ہو سکتی ہے"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"پوائنٹر رُک جائے تو کلک کریں"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"کلک سے قبل توقف"</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_summary_state_enabled" msgid="8359913912320966304">"آن"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"آف"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"فوری ترتیبات میں دکھائیں"</string>
@@ -1987,7 +2015,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> باقی"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> چارج کرنے کیلئے"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"پس منظر کی سرگرمی"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"ممنوع"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"ایپ کو پس منظر میں چلنے کی اجازت دیں"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"استعمال نہ ہونے پر ایپ پس منظر میں چل سکتی ہے"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"استعمال نہ ہونے پر، ایپ کے پس منظر کی سرگرمی محدود ہوتی ہے"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"بیٹری اچھی حالت میں ہے"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ایپس حسب معمول برتاؤ کر رہی ہیں"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"بیٹری کی صلاحیت کم ہے"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"بیٹری زیادہ دیر تک نہیں چل سکتی"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"اسمارٹ بیٹری مینیجر آن کریں"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"بیٹری کے استعمال کو بہتر بنانے کیلئے آن کریں"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"کم بیٹری کی وضع آن کریں"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"اپنی بیٹری لائف بڑھائیں"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"کم بیٹری کی وضع آن ہے"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"کچھ خصوصیات محدود ہیں"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"فون بہت زیادہ استعمال ہوا"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ٹیبلیٹ بہت زیادہ استعمال ہوا"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"آلہ بہت زیادہ استعمال ہوا"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"آخری بار مکمل چارج ہونے کے بعد سے تقریباً <xliff:g id="HOUR">%1$s</xliff:g> استعمال ہوا"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"آپ کے فون کا کافی زیادہ استعمال ہونے کی وجہ سے اس کی بیٹری بہت زیادہ صرف ہوئی ہے۔ آپ کی بیٹری حسب معمول برتاؤ کر رہی ہے۔\n\n آپ کا فون آخری بار مکمل چارج ہونے کے بعد سے تقریباً <xliff:g id="HOUR">%1$s</xliff:g> استعمال ہوا۔\n\n کل استعمال:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"آپ کے ٹیبلیٹ کا کافی زیادہ استعمال ہونے کی وجہ سے اس کی بیٹری بہت زیادہ صرف ہوئی ہے۔ آپ کی بیٹری حسب معمول برتاؤ کر رہی ہے۔\n\n آپ کا ٹیبلیٹ آخری بار مکمل چارج ہونے کے بعد سے تقریباً <xliff:g id="HOUR">%1$s</xliff:g> استعمال ہوا۔\n\n کل استعمال:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"آپ کے آلے کا کافی زیادہ استعمال ہونے کی وجہ سے اس کی بیٹری بہت زیادہ صرف ہوئی ہے۔ آپ کی بیٹری حسب معمول برتاؤ کر رہی ہے۔\n\n آپ کا آلہ آخری بار مکمل چارج ہونے کے بعد سے تقریباً <xliff:g id="HOUR">%1$s</xliff:g> استعمال ہوا۔\n\n کل استعمال:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"اسمارٹ بیٹری مینیجر"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"بیٹری کا خودکار نظم کریں"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"استعمال کی بنیاد پر پاور کے استعمال کو خودکار طور پر ایڈجسٹ کریں"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"محدود کردہ ایپس"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d ایپس</item>
+ <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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ایپ کو بہتر بنانا"</string>
<string name="battery_saver" msgid="8172485772238572153">"بیٹری سیور"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"بیٹری سیور استعمال کریں"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"خود کار طور پر آن کریں"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"کبھی نہیں"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> بیٹری پر"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"مطابقت پذیری میں فی الحال دشواریاں پیش آ رہی ہیں۔ یہ جلد ہی واپس آ جائے گا۔"</string>
<string name="add_account_label" msgid="7811707265834013767">"اکاؤنٹ شامل کریں"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"دفتری پروفائل ابھی دستیاب نہیں ہے"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"کام موڈ"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"دفتری پروفائل کو کام کرنے دیں، بشمول ایپس، پس منظر کی مطابقت پذیری اور متعلقہ خصوصیات۔"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"دفتری پروفائل ہٹائیں"</string>
<string name="background_data" msgid="5779592891375473817">"پس منظر کا ڈیٹا"</string>
<string name="background_data_summary" msgid="8328521479872763452">"ایپس کسی بھی وقت ڈیٹا سنک، بھیج اور وصول کر سکتی ہیں"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"اکاؤنٹ ہٹائیں؟"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"اس اکاؤنٹ کو ہٹانے سے اس کے سبھی پیغامات، رابطے اور ٹیبلٹ سے دیگر ڈیٹا حذف ہو جائیں گے!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"اس اکاؤنٹ کو ہٹانے سے اس کے سبھی پیغامات، رابطے اور فون سے دیگر ڈیٹا حذف ہو جائیں گے!"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"اس اکاؤنٹ کو ہٹانے سے اس کے تمام پیغامات، رابطے اور اس آلے کا دیگر ڈیٹا حذف ہو جائے گا!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"آپ کے منتظم کی طرف سے اس تبدیلی کی اجازت نہیں ہے"</string>
<string name="provider_label" msgid="7724593781904508866">"پُش سبسکرپشنز"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="other">سرٹیفکیٹس چیک کریں</item>
<item quantity="one">سرٹیفیکیٹ چیک کریں</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"صارفین"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"صارفین اور پروفائلز"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"صارف یا پروفائل شامل کریں"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"صارف کو شامل کریں"</string>
@@ -2772,7 +2824,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"بلوٹوتھ، کاسٹ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ایپس اور اطلاعات"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"اجازتیں، ڈیفالٹ ایپس"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"صارفین اور اکاؤنٹس"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2803,7 +2856,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ڈسٹرب نہ کریں، مداخلت کرنا، مداخلت، بریک"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"قریبی، مقام، سرگزشت، اطلاع دہندگی"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"قطعیت"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"اکاؤنٹ"</string>
<string name="keywords_users" msgid="3434190133131387942">"پابندی، پابندی لگائیں، پابندی شدہ"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"متن کی اصلاح، اصلاح، آواز، ارتعاش، خودکار، زبان، اشارہ، تجویز کریں، تجویز، تھیم، ناگوار، لفظ، ٹائپ کریں، emoji، بین الاقوامی"</string>
@@ -2870,6 +2922,7 @@
<item quantity="one">1 اصول</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"ڈسٹرب نہ کریں"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"\'ڈسٹرب نہ کریں\' کو آن کریں"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"برتاؤ"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"اس سے آوازیں اور وائبریشنز کی اجازت دیں"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"کوئی آواز نہیں ہے"</string>
@@ -2879,8 +2932,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"خودکار طور پر آن کریں"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"خودکار اصول"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"خودکار اصول"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\'ڈسٹرب نہ کریں\' اصول سیٹ کریں"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"مخصوص اوقات پر آوازیں اور وائبریشنز کو محدود کریں"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"مکمل خاموشی"</string>
@@ -2888,12 +2944,15 @@
<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_add" msgid="90014394953272517">"شامل کریں"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ابھی آن کریں"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ابھی بند کریں"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"آن کریں"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ابھی آن کریں"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ابھی آف کریں"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"\'ڈسٹرب نہ کریں\' <xliff:g id="FORMATTED_TIME">%s</xliff:g> تک آن ہے"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"جب تک آپ \'ڈسٹرب نہ کریں\' بند نہیں کرتے تب تک وہ آن ہی رہے گا"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"\'ڈسٹرب نہ کریں\' کسی اصول (<xliff:g id="RULE_NAME">%s</xliff:g>) کے ذریعے خودکار طور پر آن ہو گیا تھا"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"\'ڈسٹرب نہ کریں\' کسی ایپ (<xliff:g id="APP_NAME">%s</xliff:g>) کے ذریعے خودکار طور پر آن ہو گیا تھا"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"صرف ترجیحی"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2909,6 +2968,7 @@
<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="recent_notifications" msgid="5660639387705060156">"حال ہی میں اطلاعات بھیجنے والی ایپس"</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>
@@ -2928,7 +2988,7 @@
<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_importance_title" msgid="848692592679312666">"اہمیت"</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="5455049524984686275">"کوئی صوتی یا بصری مداخلت نہیں"</string>
@@ -2946,6 +3006,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"متوسط اہمیت"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"اطلاع تک رسائی"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"دفتری پروفائل کی اطلاعات تک رسائی مسدود ہے"</string>
@@ -2976,9 +3037,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"ڈسٹرب نہ کریں تک رسائی"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"کسی انسٹال کردہ ایپس نے ڈسٹرب نہ کریں تک رسائی کی درخواست نہیں کی ہے"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"ایپس لوڈ ہو رہی ہیں…"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android اس ایپ کی اطلاعات کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android اطلاعات کے اس زمرے کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android اطلاعات کے اس گروپ کو اس آلہ پر ظاہر ہونے سے مسدود کر رہا ہے"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"آپ کی درخواست پر، Android اس ایپ کی اطلاعات کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"آپ کی درخواست پر، Android اطلاعات کے اس زمرے کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"آپ کی درخواست پر، Android اطلاعات کے اس گروپ کو اس آلہ پر ظاہر ہونے سے مسدود کر رہا ہے"</string>
<string name="notification_channels" msgid="5346841743182627500">"زمرے"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"دیگر"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3123,6 +3184,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی انگلی کا نشان استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\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="1793719723017395175">"ہاں"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"نہیں"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN درکار ہے؟"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"پیٹرن درکار ہے؟"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"پاس ورڈ درکار ہے؟"</string>
@@ -3395,7 +3458,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"موجودہ صارف: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"بطور <xliff:g id="USER_NAME">%1$s</xliff:g> سائن ان ہے"</string>
<string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ڈیفالٹ ہے"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"آن / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"آف"</string>
<string name="backup_disabled" msgid="485189128759595412">"بیک اپ غیر فعال ہے"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> پر اپ ڈیٹ کردہ"</string>
@@ -3405,6 +3469,7 @@
<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="6346948990624612516">"بیک اپس کو آف نہیں کر سکتے ہیں"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"یہ کارروائی غیر فعال ہے۔ مزید جاننے کیلئے اپنی تنظیم کے منتظم سے رابطہ کریں۔"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"مزید تفصیلات"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"آپ کا منتظم آپ کے دفتری پروفائل سے وابستہ ایپس اور ڈیٹا، بشمول ترتیبات، اجازتیں، کارپوریٹ رسائی، نیٹ ورک کی سرگرمی اور آلہ کے مقام کی معلومات مانیٹر اور منظم کر سکتا ہے۔"</string>
@@ -3428,9 +3493,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"دفتری پروفائل آف ہے"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"آپ کے دفتری پروفائل سے متعلق ایپس، پس منظر کی مطابقت پذیری اور دیگر خصوصیات آف ہیں۔"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"نائٹ لائٹ شیڈول سیٹ کریں"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"سونے میں مدد کیلئے اسکرین کا رنگ ہلکا امبر کریں"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"رات کی روشنی آن ہے"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> مزید"</string>
@@ -3535,6 +3602,8 @@
<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_none" msgid="5144174674654097316">"کوئی نہیں"</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>
@@ -3557,31 +3626,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"متعدد آلات سے منسلک کردہ"</string>
<string name="demo_mode" msgid="2798762752209330277">"سسٹم UI ڈیمو موڈ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"فوری ترتیبات کے ڈیولپر ٹائلز"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"ہم مدد کیلئے ہیں نا"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ہم 24/7 آپ کیلئے یہاں موجود ہیں"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"ہم 24 7 آپ کیلئے یہاں موجود ہیں"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"ہماری سپورٹ ٹیم کسی بھی قسم کا مسئلہ حل کرنے میں مدد کرنے کیلئے موجود ہے"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ہماری سپورٹ ٹیم ہر وقت، سارا دن آپ کی مدد کیلئے موجود ہوتی ہے"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"مدد تلاش کریں یا سپورٹ کے اوقات میں واپس آئیں (مقامی وقت کے مطابق):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"فون سپورٹ کے اوقات (مقامی وقت)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"مدد تلاش کریں یا تجاویز اور تراکیب دریافت کریں"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"سپورٹ برائے:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"بیرون ملک کا سفر کر رہے ہیں؟"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"بین الاقوامی چارجز لاگو ہو سکتے ہیں"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"فون"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"چیٹ کریں"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"تجاویز اور تراکیب دریافت کریں"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"مدد تلاش کریں اور تاثرات بھیجیں"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"سپورٹ سے رابطہ کریں"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"سائن ان کریں"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"سائن ان نہیں کر سکتے؟"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"سسٹم کی معلومات بھیجیں"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"دوبارہ مت دکھائیں"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"درخواست کی جا رہی ہے بطور"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"اکاؤنٹ شامل کریں"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"سسٹم کی معلومات"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"ونڈو ٹریس"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"سطح کا ٹریس"</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>
@@ -3597,11 +3643,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> سیکنڈ</item>
<item quantity="one">1 سیکنڈ</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"<xliff:g id="ESTIMATE">%1$s</xliff:g>~ انتظار"</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="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>
@@ -3612,32 +3658,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"کیمرا کھولنے کے لیے پاور بٹن کو دوبار دبائیں"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"سیلفی موڈ کے لیے فون کو دو بار مروڑیں"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"سیلفی موڈ کے لیے ٹیبلیٹ کو دو بار مروڑیں"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"سیلفی موڈ کے لیے آلہ کو دو بار مروڑیں"</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_suggestion_summary" msgid="5987443721392571847">"اسکرین آف ہونے پر اطلاعات چیک کریں"</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_pickup_suggestion_summary" msgid="7014700589991761035">"اسکرین آف ہونے پر اطلاعات چیک کریں"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"اپنی اطلاعات چیک کرنے کیلئے اپنے آلہ کی پشت پر فنگر پرنٹ سینسر پر نیچے سوائپ کریں۔"</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"جلدی سے اطلاعات دیکھیں"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"فنگر پرنٹ سینسر پر نیچے سوائپ کریں"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"آن"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"آف"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"بوٹ لوڈر پہلے سے غیر مقفل ہے"</string>
@@ -3767,8 +3806,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"ڈائرکٹری تک رسائی"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"ڈائرکٹری تک رسائی"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 6acd7c4..b278c78 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"Bog‘lash tugmasi"</item>
<item msgid="1624323946324499595">"ulashma qurilmadagi PIN-kod"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1 soat"</item>
<item msgid="5198271470953124739">"Doim yoniq tursin"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (standart)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Juda past"</item>
<item msgid="2042505933058940139">"Juda past"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"60 kundan ko‘proq"</item>
<item msgid="5692284879054004388">"90 kundan ko‘proq"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Tarmoq sozlamalaridan foydalanish"</item>
+ <item msgid="8745603368609022803">"Pulli"</item>
+ <item msgid="2266114985518865625">"Bepul"</item>
+ </string-array>
</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 72c9f28..0041d4c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Qurilmalaringiz"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yangi qurilmani ulash"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Qurilmaning Bluetooth qurilmalarga ulanishiga ruxsat berish"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Bitta liniyada jiringlashni faolsizlantirish"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Bluetooth quloqliklar orqali moslashtirilgan ringtonlar ijro etilmasin"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Sana"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alifbo bo‘yicha saralash"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Vaqt mintaqasi bo‘yicha saralash"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> sanasida boshlanadi."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Yozgi vaqt"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Standart vaqt"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Hududlar asosidagi vaqt mintaqasi"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Vaqt mintaqalarining surilishi tuzatildi"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Sana"</string>
<string name="time_picker_title" msgid="483460752287255019">"Vaqt"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Qurilmaning avtomatik qulflanishi"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Qulflangan ekran ustidagi matn"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Vidjetlarni yoqish"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Administrator tomonidan o‘chirilgan"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Yo‘q"</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">"M-n: Alisherning Android telefoni"</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profil ma’lumotlari"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Hisoblar"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Joylashuv"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Joylashuv axborotidan foydalanish"</string>
<string name="account_settings_title" msgid="626177544686329806">"Hisoblar"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Xavfsizlik va joylashuv"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Shifrlash va hisob ma’lumotlari"</string>
@@ -459,9 +471,16 @@
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Siz kiritgan parol to‘g‘ri, biroq planshetdagi ma’lumotlar shikastlangan.\n\nPlanshetdan foydalanishda davom etish uchun uning zavod sozlamalarini tiklashingiz lozim. Shundan so‘ng, Google hisobingizga zaxiralangan barcha ma’lumotlaringizni qayta tiklab olishingiz mumkin bo‘ladi."</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Siz kiritgan parol to‘g‘ri, biroq telefondagi ma’lumotlar shikastlangan.\n\nTelefondan foydalanishda davom etish uchun uning zavod sozlamalarini tiklashingiz lozim. Shundan so‘ng, Google hisobingizga zaxiralangan barcha ma’lumotlaringizni qayta tiklab olishingiz mumkin bo‘ladi."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Yozish usulini o‘zgartirish"</string>
- <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Ekranni qulfini o‘rnatish"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Qurilmangizni himoyalang"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Barmoq izidan foydalaning"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Barmoq izingiz bilan oching"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran qulfini tanlang"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Ishchi profil qulfini tanlang"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon karnayi sifatida"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiqa va media uchun"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Sozlamalarni eslab qolish"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimum ulangan Bluetooth audio qurilmalar"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Maksimum nechta Bluetooth audio qurilma ulash mumkinligi belgilang"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Translatsiya"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Simsiz monitorni yoqish"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Hech qanday qurilma topilmadi."</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Nomi"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GGs"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GGs"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Kirish"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbit/s"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ilovasi Wi-Fi tarmog‘ini yoqmoqchi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ilovasi Wi-Fi tarmog‘ini o‘chirib qo‘ymoqchi"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi‘ni yoqish"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fi orqali"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi sozlamalari"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Ulanish nuqtalarini sozlash & boshqarish"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"Parol"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Parol berkitilmasin"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi chastotalari diapazoni"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Avtomatik"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GGs"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GGs"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP sozlamalari"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mavjud)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Tarmoqqa ulanish uchun parolni kiriting"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Aloqa operatorining Wi‑Fi tarmog‘i"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> orqali ulanish"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> orqali ulanish"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Joylashuv aniqligini yana ham yaxshilash va boshqa maqsadlar uchun, Wi-Fi o‘chirilgan bo‘lsada <xliff:g id="APP_NAME">%1$s</xliff:g> tarmoqlarni qidirish vazifasini yoqmoqchi.\n\nBu ruxsat tarmoqlarni qidirishni istagan barcha ilovalarga berilsinmi?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Uni o‘chirish uchun menyudan “Qo‘shimcha” bandiga o‘ting."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruxsat berish"</string>
@@ -909,10 +933,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Wi-Fi chastotalari diapazoni"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Boshqa qurilmalaringiz uchun Wi-Fi tarmoq yaratish uchun hotspotdan foydalaning. Hotspot mobil internetingizni tarqatadi. Mobil internet uchun qo‘shimcha to‘lovlar olinishi mumkin."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Ilovalar yaqin-atrofdagi qurilmalarga kontent ulashish uchun hotspot yarata oladi."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Hotspotni avtomatik faolsizlantirish"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Hech qanday qurilma ulanmagan bo‘lsa, Wi-Fi hotspot faolsizlantiriladi"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Ulanish nuqtasi yoqilmoqda…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Ulanish nuqtasi o‘chirilmoqda…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> faol"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi qo‘ng‘iroq"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi qo‘ng‘iroqni yoqing"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Mobil aloqa o‘rniga Wi-Fi tarmog‘idan foydalaning"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<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_roaming_mode_title" msgid="1565039047187685115">"Rouming sozlamalari"</string>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Favqulodda holatlardagi manzili"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi orqali favqulodda chaqiruv amalga oshirilganda joylashuvingizdan foydalaniladi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958">"Maxfiy DNS imkoniyatlari haqida "<annotation id="url">"batafsil axborot"</annotation></string>
<string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
<string name="sound_settings" msgid="5534671337768745343">"Tovush"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Ovoz balandligi"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"Mobil tarmoq turi"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Operator ma‘lumoti"</string>
<string name="status_data_state" msgid="5503181397066522950">"Mobil tarmoq ahvoli"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"Xizmat holati"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"Signal darajasi"</string>
<string name="status_roaming" msgid="2638800467430913403">"Rouming"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Yangi “<xliff:g id="NAME">^1</xliff:g>” kartasi ishlashga tayyor. \n\nUnga rasm, ilova ma’lumotlari va boshqa fayllarni ko‘chirib o‘tkazish uchun Sozlamalar > Xotira bo‘limiga o‘ting."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ilovasini ko‘chirib o‘tkazing"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> va uning ma’lumotlarini “<xliff:g id="NAME_0">^2</xliff:g>” kartasiga ko‘chirib o‘tkazish biroz vaqt oladi. Ko‘chirish tugamaguncha ilovadan foydalana olmaysiz. \n\nKo‘chirish davomida “<xliff:g id="NAME_1">^2</xliff:g>” kartasini chiqara ko‘rmang."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Ma’lumotlarni ko‘chirish uchun <xliff:g id="APP">^1</xliff:g> foydalanuvchisini oching."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ko‘chirib o‘tkazilmoqda…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ko‘chirish davomida “<xliff:g id="NAME">^1</xliff:g>” kartasini chiqara ko‘rmang. \n\n Ushbu qurilmadagi <xliff:g id="APP">^2</xliff:g> ilovasi ko‘chirish tugamaguncha ishlamaydi."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Ko‘chirishni bekor qilish"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Tarmoq, ilova yoki qurilma sozlamalarini asliga qaytarishingiz mumkin"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, mobil internet va Bluetooth parametrlarini tiklash"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Bu barcha tarmoq sozlamalarini, jumladan, mazkur sozlamalarni asliga qaytaradi:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobil internet"</li>\n<li>"Bluetooth"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"Shuningdek, eSIM kartalar asliga qaytarilsin"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"Sozlamalarni tiklash"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Barcha tarmoq sozlamalari qayta tiklansinmi? Bu amalni ortga qaytarib bo‘lmaydi!"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Sozlamalarni tiklash"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Asliga qaytarilsinmi?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Bu foydalanuvchi tarmoq sozlamalarini tiklay olmaydi"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Tarmoq sozlamalari qayta tiklandi"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"Xatolik yuz berdi"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM asliga qaytarilmadi."</string>
<string name="master_clear_title" msgid="3531267871084279512">"Barcha ma’lumotlarni o‘chirish (zavod sozlamalarini tiklash)"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Planshetning "<b>"ichki xotirasidagi"</b>" barcha ma’lumotlar o‘chib ketadi, jumladan:\n\n"<li>" Google hisobingiz"</li>\n<li>"Tizim va ilovalarning ma’lumotlari/sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Telefonning "<b>"ichki xotirasidagi"</b>" barcha ma’lumotlar o‘chib ketadi, jumladan:\n\n"<li>" Google hisobingiz"</li>\n<li>"Tizim va ilovalarning ma’lumotlari/sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu qurilmada boshqa foydalanuvchilar ham bor.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiqa"</li>\n<li>"Rasmlar"</li>\n<li>"Foydalanuvchining boshqa ma\'lumotlari"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM uchun aloqa operatorlari"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM kartalar"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Bu mobil xizmatining tarif rejasini bekor qilmaydi."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Musiqa, rasm va boshqa ma’lumotlarni o\'chirish uchun "<b>"USB xotirani"</b>" ham tozalash kerak."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musiqa, rasm va boshqa ma’lumotlarni o‘chirish uchun "<b>"SD kartani"</b>" ham tozalash kerak."</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Iltimos, Internetga ulaning"</string>
<string name="location_title" msgid="1029961368397484576">"Mening joylashuvim"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ishchi profil joyi"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"Rejim"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Yuqori aniqlik"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batareya quvvatini tejash"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Faqat qurilma asosida"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"Joylashuv xizmati o‘chiq"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"Ilovalar uchun ruxsatlar"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"Joylashuv axboroti so‘rovlari"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"Hech qanday ilova yaqin vaqtda joylashuv ma‘lumotini so‘ramadi"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"Joylashuv axboroti xizmatlari"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Yuqori batareya sarfi"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Batareya sarfi kam"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"Joylashuvni aniqlash"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Joylashuvni aniqlash uchun GPS, Wi-Fi, Bluetooth yoki mobil tarmoqlardan foydalanish"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Joylashuvni aniqlash uchun Wi-Fi, Bluetooth yoki mobil tarmoqlardan foydalanish"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Joylashuvni GPS va qurilma sensorlari yordamida aniqlash"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Qidiruv"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi orqali aniqlash"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Joylashuv axboroti aniq bo‘lishi uchun tizimga oid ilova va xizmatlarga xohlagan vaqtda yaqin-atrofdagi Wi-Fi tarmoqlarini qidirishiga ruxsat bering."</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Joylashuv manbalari"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Planshet haqida"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Telefon haqida"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Qurilma haqida"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Taqlid qurilma haqida"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Yuridik ma’lumotlar, holat, dasturiy ta’minot versiyasini ko‘rish"</string>
<string name="legal_information" msgid="5769301644270604095">"Huquqiy ma’lumotlar"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Barcha ilovalar (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Planshetingiz va shaxsiy ma‘lumotlaringiz notanish ilovalar xujumiga zaif bo‘ladi. Bunday ilovalarni ushbu manbadan o‘rnatish bilan ularning planshetizga yetkazadigan shikast va ma‘lumotlaringizni o‘chirib yuborishiga javobgarlikni o‘z zimmangizga olasiz."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefoningiz va shaxsiy ma‘lumotlaringiz notanish ilovalar xujumiga zaif bo‘ladi. Bunday ilovalarni ushbu manbadan o‘rnatish bilan ularning telefoningizga yetkazadigan shikast va ma‘lumotlaringizni o‘chirib yuborishiga javobgarlikni o‘z zimmangizga olasiz."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Qurilmangiz va shaxsiy ma’lumotlaringiz notanish ilovalar hujumiga qarshilik ko‘rsata olmaydi. Ushbu manbadan ilovalar o‘rnatish orqali siz ulardan foydalanish natijasida qurilmangizga yetkazilgan har qanday zarar yoki o‘chib ketgan ma’lumotlaringiz uchun o‘zingiz javobgar bo‘lasiz."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Kengaytirilgan sozlamalar"</string>
<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>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Unumdorligiga ta’sir qilishi mumkin"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kursor harakatlanishdan to‘xtagandan keyin bosing"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Bosishdan oldin biroz kuting"</string>
+ <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_summary_state_enabled" msgid="8359913912320966304">"YONIQ"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"O‘CHIQ"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Tezkor sozlamalarda ko‘rsatish"</string>
@@ -1987,7 +2015,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">"Batareya quvvati <xliff:g id="REMAIN">%1$s</xliff:g>dan so‘ng tugaydi"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"Batareya quvvati <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>dan so‘ng to‘ladi"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"Fondagi jarayonlar"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"Cheklangan"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Ilovaga fonda ishlashiga ruxsat berish"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"Bu ilova ochilmagan vaqtda ham fonda ishlayveradi"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"Ilova ishlatilmaganda, fondagi harakati cheklanadi"</string>
@@ -2036,14 +2064,39 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Batareya quvvati joyida"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Ilovalar odatdagidek ishlamoqda"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Batareya sig‘imi kichik"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batareya uzoq muddat ishlay olmaydi"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Smart batareya boshqaruvini yoqing"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Batareya sarfini optimallashtirish uchun yoqing"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"Tejamkor batareya rejimini yoqing"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"Batareya quvvatini tejang"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"Tejamkor batareya rejimi yoniq"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"Ayrim funksiyalar cheklangan"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefon qattiq ishlatildi"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Planshet qattiq ishlatildi"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Qurilma qattiq ishlatildi"</string>
+ <!-- String.format failed for translation -->
+ <!-- no translation found for battery_tip_high_usage_summary (5437023146333888605) -->
<skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+ <!-- String.format failed for translation -->
+ <!-- no translation found for battery_tip_dialog_message (6744251070067861233) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <!-- String.format failed for translation -->
+ <!-- no translation found for battery_tip_dialog_message (7091442312127403445) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- String.format failed for translation -->
+ <!-- no translation found for battery_tip_dialog_message (7621045312469814256) -->
<skip />
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Batareya quvvatini tejash"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Energiya iste’molini avtomatik nazorat qilish"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Ilovalarning energiya iste’molini avtomatik nazorat qilish"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Cheklangan imkoniyatli ilovalar"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d ta ilova</item>
+ <item quantity="one">%1$d ta ilova</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Ilova yopilsinmi?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefoningiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasi telefoningizni yoniq qoldirmoqda.\n\nBu muammoni tuzatish uchun ilovani majburan to‘xtatishingiz mumkin.\n\nAgar bu yana takrorlansa, batareya quvvati unumdorligini oshirish uchun ilovani o‘chirib tashlashingiz lozim bo‘ladi."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Planshetingiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasi planshetingizni yoniq qoldirmoqda.\n\nBu muammoni tuzatish uchun ilovani majburan to‘xtatishingiz mumkin.\n\nAgar bu yana takrorlansa, batareya quvvati unumdorligini oshirish uchun ilovani o‘chirib tashlashingiz lozim bo‘ladi."</string>
@@ -2158,6 +2211,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Ilovalarni optimallashtirish"</string>
<string name="battery_saver" msgid="8172485772238572153">"Quvvat tejash"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Quvvat tejash funksiyasidan foydalanish"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Avtomatik yoqish"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Hech qachon"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"batareya quvvati: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2345,8 +2399,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"Sinxronizatsiyada muammo bor. Tez orada qayta tiklanadi."</string>
<string name="add_account_label" msgid="7811707265834013767">"Hisob qo‘shish"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"Ishchi profil hali mavjud emas"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"Ish rejimi"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"Ishchi profilini yoqish: ilovalar, fonda sinxronlash va bog‘liq funksiyalar"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"Ishchi profilni o‘chirish"</string>
<string name="background_data" msgid="5779592891375473817">"Ma’lumotlarni fonda yuklash"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Ilovalar sinxronlanishi, ma’lumotlarni istalgan paytda jo‘natishi va qabul qilishi mumkin"</string>
@@ -2378,6 +2436,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Hisobni olib tashlansinmi?"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Ushbu hisob bilan bog‘liq barcha xabarlar, kontaktlar va boshqa ma’lumotlar telefondan o‘chib ketadi."</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Ushbu hisob bilan bog‘liq barcha xabarlar, kontaktlar va boshqa ma’lumotlar telefondan o‘chib ketadi."</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Ushbu hisob o‘chirilganda unga bog‘liq barcha xabar, kontakt va boshqa ma’lumotlar qurilmadan o‘chib ketadi."</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Bu o‘zgarishni amalga oshirish uchun administrator ruxsat bermagan"</string>
<string name="provider_label" msgid="7724593781904508866">"Bosma obunalar"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2596,7 +2655,8 @@
<item quantity="other">Sertifikatlarni tekshirish</item>
<item quantity="one">Sertifikatni tekshirish</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"Foydalanuvchilar"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"Foydalanuvchilar & profillar"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Foydalanuvchi yoki profil qo‘shish"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"Foydalanuvchi qo‘shish"</string>
@@ -2786,7 +2846,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Ilovalar va bildirishnomalar"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Ruxsatnomalar, birlamchi ilovalar"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"Foydalanuvchilar va hisoblar"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2817,7 +2878,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"bezovta qilmaslik, bezovta, bezovtalik, uzish"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="6615286961552714686">"yaqin atrof, joylashuv, tarix, hisobot"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"aniqlik"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"hisob"</string>
<string name="keywords_users" msgid="3434190133131387942">"cheklov, cheklash, cheklangan"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"matnni tuzatish, to‘g‘ri, ovoz, tebranish, avto, til, imo-ishora, taklif qilish, taklif, mavzu, haqoratomuz so‘z, yozish, kulgich, xalqaro"</string>
@@ -2884,6 +2944,7 @@
<item quantity="one">1 ta qoida</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"Bezovta qilinmasin"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Bezovta qilinmasin rejimini yoqing"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Xatti-harakatlar"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Ovoz va tebranishlarga ruxsat:"</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ovozsiz"</string>
@@ -2893,8 +2954,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Avtomatik yoqish"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Avtomatik qoidalar"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Avtomatik qoida"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Bezovta qilmaslik qoidalari"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Tovush va tebranishlarni muayyan vaqtga cheklash"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Qoidadan foydalanish"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Faqat muhimlari"</string>
<string name="zen_mode_option_alarms" msgid="5785372117288803600">"Faqat signallar"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Jimjitlik"</string>
@@ -2902,12 +2966,15 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Vizual bildirishnomalarni bloklash"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vizual signallarga ruxsat"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Qo‘shish"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"YOQISH"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"O‘CHIRISH"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"Yoqish"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Yoqish"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Faolsizlantirish"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Bezovta qilinmasin rejimi <xliff:g id="FORMATTED_TIME">%s</xliff:g> gacha yoqilgan"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Bezovta qilinmasin rejimi uni o‘chirmaguningizcha yoniq qoladi"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Bezovta qilinmasin rejimi <xliff:g id="RULE_NAME">%s</xliff:g> qoidasi tomonidan yoqilgan"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Bezovta qilinmasin rejimi <xliff:g id="APP_NAME">%s</xliff:g> ilovasi tomonidan yoqilgan"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Faqat muhimlari"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Ishchi profil ovozlari"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Shaxsiy profil ovozlaridan foydalanish"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Tovushlar ishchi va shaxsiy profillar uchun bir xil"</string>
@@ -2923,6 +2990,7 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Ringtonlar"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Boshqa tovush va tebranishlar"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Bildirishnomalar"</string>
+ <string name="recent_notifications" msgid="5660639387705060156">"Yaqinda yuborilgan"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Kengaytirilgan sozlamalar"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Ishga oid bildirishnomalar"</string>
<string name="notification_badging_title" msgid="5938709971403474078">"Bildirishnoma belgisi"</string>
@@ -2942,7 +3010,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Ilova bildirishnomalari"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Bildirishnomalar turkumi"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Bildirishnomalar turkumi guruhi"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Muhimligi"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Xatti-harakatlar"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Ovozga ruxsat berish"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Bildirishnomalar hech qachon ko‘rsatilmasin"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Bildirishnomalarsiz"</string>
@@ -2960,6 +3028,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"O‘rtacha muhim"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Juda muhim"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Favqulodda muhim"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Bildirishnomalar ko‘rsatilsin"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Bildirishnoma yordamchisi"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirishnomalarga ruxsat"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ishchi profil bildirishnomalariga kirish taqiqlangan"</string>
@@ -2990,9 +3059,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Bezovta qilinmasin rejimi"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Hech qaysi ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Ilovalar yuklanmoqda…"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bu qurilmada ushbu ilova bildirishnomalarini bloklamoqda"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bu qurilmada ushbu turkum bildirishnomalarini bloklamoqda"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bu qurilmada ushbu bildirishnomalar guruhini bloklamoqda"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Bu ilova bildirishnomalarini faolsizlantirdingiz"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Bu turkum bildirishnomasini faolsizlantirdingiz"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Mazkur bildirishnomalar guruhini faolsizlantirdingiz"</string>
<string name="notification_channels" msgid="5346841743182627500">"Turkumlar"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Boshqa"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3137,6 +3206,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Qurilmani qulfini ochish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda parol kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, chaqiruvlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun parol talab qilinsinmi?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ha"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Yo‘q"</string>
+ <string name="restricted_true_label" msgid="1793719723017395175">"Ha"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"Yo‘q"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN-kod talab qilinsinmi?"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Chiz. parol talab qil-mi?"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Parol talab qilinsinmi?"</string>
@@ -3291,7 +3362,7 @@
<string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Agar MTP qo‘llab-quvvatlanmasa, surat yoki fayllarni o‘tkazish (PTP)"</string>
<string name="usb_use_MIDI" msgid="870922185938298263">"MIDI sifatida foydalanish"</string>
<string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu qurilmadan MIDI sifatida foydalanish"</string>
- <string name="usb_use" msgid="3256040963685055320">"USB rejimi"</string>
+ <string name="usb_use" msgid="3256040963685055320">"USB ulanish maqsadi"</string>
<string name="usb_pref" msgid="1400617804525116158">"USB"</string>
<string name="usb_summary_charging_only" msgid="7544327009143659751">"Shu qurilmani quvvatlash"</string>
<string name="usb_summary_power_only" msgid="3629517713817003738">"Quvvat uzatish"</string>
@@ -3409,7 +3480,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"Joriy foydalanuvchi: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Siz <xliff:g id="USER_NAME">%1$s</xliff:g> sifatida kirgansiz"</string>
<string name="payment_summary" msgid="3472482669588561110">"Birlamchi ilova: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"YONIQ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"O‘CHIQ"</string>
<string name="backup_disabled" msgid="485189128759595412">"Zaxiralash o‘chirilgan"</string>
<string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> versiyasiga yangilandi"</string>
@@ -3419,6 +3491,7 @@
<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="6346948990624612516">"Zaxiralashni faolsizlantirish imkonsiz"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"Bu funksiya o‘chirib qo‘yilgan. Administrator bilan bog‘laning."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Qo‘shimcha tafsilotlar"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"Administratoringiz ishchi profilingiz bilan bog‘liq ilova va ma’lumotlarni, jumladan, sozlamalar, ruxsatnomalar, korporativ kirish huquqi, tarmoqdagi faollik va qurilmaning joylashuvi haqidagi ma’lumotlarni kuzatishi va boshqarishi mumkin."</string>
@@ -3442,9 +3515,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"Ishchi profil o‘chirilgan"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Ishchi profil bilan bog‘liq ilovalar, fonda sinxronlash va boshqa funksiyalar o‘chirib qo‘yildi."</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Tungi rejim jadvalini sozlash"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Uyqu uchun sariq ekran"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"Tungi rejim yoqilgan"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran qizg‘ish tusga kirdi. Bu osonroq uyquga ketishga yordamlashadi."</string>
+ <string name="suggestions_title_v2" msgid="5601181602924147569">"Taklif etiladi"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Tavsiyalar"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ta"</string>
@@ -3549,6 +3624,8 @@
<string name="notification_log_details_none" msgid="184131801230614059">"yo‘q"</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_none" msgid="5144174674654097316">"Hech biri"</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>
@@ -3571,31 +3648,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Tezkor sozlamalarning dasturchi tugmalari"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Sizga yordam berish uchun shu yerdamiz"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Biz kecha-yu kunduz xizmatingizdamiz"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Biz kecha-yu kunduz xizmatingizdamiz"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Bizning ko‘mak jamoamiz har qanday masalani hal qilish uchun xizmatingizda"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Ko‘mak markazimiz jamoasi kecha-yu kunduz xizmatingizda"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Muammolar yechimini qidiring yoki ko‘mak xizmati ish soatlarida (mahalliy vaqt bilan) bog‘laning:<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Ko‘mak xizmatining ish soatlari (mahalliy vaqt bilan):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Muammolar yechimini qidiring yoki maslahat va tavsiyalar bilan tanishib chiqing"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Ko‘mak xizmati:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Sayohat qilyapsizmi?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Xalqaro qo‘ng‘iroqlar uchun to‘lov olinishi mumkin"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Maslahat va tavsiyalar bilan tanishib chiqish"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Muammolar yechimini qidirish va fikr-mulohaza yuborish"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Ko‘mak xizmati bilan bog‘lanish"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Kirish"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Hisobingizga kira olmayapsizmi?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Tizim haqida ma’lumotlarni yuborish"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Boshqa ko‘rsatilmasin"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"So‘rov yuborish…"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Hisob qo‘shish"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Tizimga oid ma’lumotlar"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Oyna trassirovkasi"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Yuza trassirovkasi"</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>
@@ -3611,11 +3665,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> soniya</item>
<item quantity="one">1 soniya</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"Kutish: taxminan <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Xotirani boshqarish"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Xotiradan joy bo‘shatishga yordamlashish uchun xotira boshqaruvi qurilmangizdan zaxiralangan rasm va videolarni o‘chirib tashlaydi."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Rasm va videolarni o‘chirib tashlash"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Xotira boshqaruvi"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Xotira boshqaruvidan foydalanish"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Avtomatik"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Qo‘llanma"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Joy bo‘shatish"</string>
@@ -3626,32 +3680,25 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kameraga o‘tish"</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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Kamerani ochish uchun quvvat tugmasini ikki marta bosish"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamerani almashtirish"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Tezkor selfi olish"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Selfi rejimiga o‘tish uchun telefonni ikki marta silkiting"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Selfi rejimiga o‘tish uchun planshetni ikki marta silkiting"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Selfi rejimiga o‘tish uchun qurilmani ikki marta silkiting"</string>
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefonni tekshirish uchun ekranni ikki marta bosing"</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_suggestion_summary" msgid="5987443721392571847">"Ekran o‘chiqligida bildirishnomalarni tekshirish"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Bildirishnomalarni tekshirish uchun ko‘tarish"</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="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Ekran o‘chiqligida bildirishnomalarni tekshirish"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Barmoq izi skaneridan foydalanish"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Barmoq izini surish"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Bildirishnomalarni tekshirish uchun qurilma orqasidagi barmoq izi skaneri ustida pastga suring"</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Bildirishnomalarni tezda ko‘rish"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Barmoq izi skanerida pastga surish"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Yoniq"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"O‘chiq"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"OT yuklagich allaqachon qulfdan chiqarilgan"</string>
@@ -3781,8 +3828,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"Kataloglarga kirish"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"kataloglarga kirish"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 76988e4..b31d67f 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -117,7 +117,9 @@
</string-array>
<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+ <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+ <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"按钮"</item>
<item msgid="1624323946324499595">"从对等设备获取的 PIN 码"</item>
@@ -136,6 +138,20 @@
<item msgid="477015974247590543">"1小时"</item>
<item msgid="5198271470953124739">"永不超时"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1（默认）"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"弱"</item>
<item msgid="2042505933058940139">"微弱"</item>
@@ -476,4 +492,9 @@
<item msgid="2900554746706302178">"超过 60 天"</item>
<item msgid="5692284879054004388">"超过 90 天"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"使用网络偏好设置"</item>
+ <item msgid="8745603368609022803">"视为按流量计费"</item>
+ <item msgid="2266114985518865625">"视为不按流量计费"</item>
+ </string-array>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 48adb3d..2fd220d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"您的设备"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"与新设备配对"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"允许设备与蓝牙设备配对并进行连接"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"停用通过蓝牙播放铃声"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"不通过蓝牙耳机播放自定义手机铃声"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"设置日期"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"按字母顺序排序"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"按时区排序"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g>开始于 <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>。"</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"夏令时"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"标准时间"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"按地区选择时区"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"固定偏移量时区"</string>
<string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
<string name="time_picker_title" msgid="483460752287255019">"时间"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"自动锁定"</string>
@@ -340,6 +347,10 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"锁定屏幕消息"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"启用微件"</string>
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"已被管理员停用"</string>
+ <!-- no translation found for lockdown_settings_title (7393790212603280213) -->
+ <skip />
+ <!-- no translation found for lockdown_settings_summary (8678086272188880615) -->
+ <skip />
<string name="owner_info_settings_summary" msgid="7472393443779227052">"无"</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">"例如，小明的 Android 设备。"</string>
@@ -348,6 +359,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"个人资料信息"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"帐号"</string>
<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="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密与凭据"</string>
@@ -459,9 +471,16 @@
<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="8971630898700461034">"设置屏幕锁定"</string>
- <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"保护您的设备"</string>
- <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"使用指纹"</string>
+ <!-- no translation found for suggested_lock_settings_title (8195437597439375655) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (7915739444107426777) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (9202820303111653610) -->
+ <skip />
+ <!-- no translation found for suggested_lock_settings_summary (1252628838133344781) -->
+ <skip />
+ <!-- no translation found for suggested_fingerprint_lock_settings_title (414499342011664436) -->
+ <skip />
<string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"使用指纹解锁"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"选择工作资料锁屏方式"</string>
@@ -691,6 +710,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"将基座用作免提电话"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"用于音乐和媒体"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"记住设置"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"已连接蓝牙音频设备的数量上限"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"选择已连接蓝牙音频设备的数量上限"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"投射"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"开启无线显示"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"未在附近找到设备。"</string>
@@ -705,6 +726,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"名称"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"登录"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g>请求开启 WLAN"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g>请求关闭 WLAN"</string>
@@ -722,6 +744,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WLAN"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"打开WLAN"</string>
<string name="wifi_settings" msgid="29722149822540994">"WLAN"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"使用 WLAN"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"WLAN设置"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"WLAN"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"设置和管理无线接入点"</string>
@@ -816,6 +839,7 @@
<string name="wifi_password" msgid="5948219759936151048">"密码"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"显示密码"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"选择 AP 频段"</string>
+ <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"自动"</string>
<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz 频段"</string>
<string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz 频段"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP 设置"</string>
@@ -833,7 +857,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （可使用 WPS）"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"请输入您的网络密码"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"运营商 WLAN 网络"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"通过<xliff:g id="NAME">%1%s</xliff:g>连接"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"通过<xliff:g id="NAME">%1$s</xliff:g>连接"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"为了提高位置信息精确度以及其他目的，“<xliff:g id="APP_NAME">%1$s</xliff:g>”请求启用网络扫描功能（在关闭了WLAN时也可进行扫描）。\n\n是否对所有需要进行扫描的应用批准这项请求？"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"要关闭此功能，请转到菜单下的“高级”。"</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允许"</string>
@@ -909,10 +933,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP 频段"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"使用热点创建 WLAN 网络供其他设备使用。热点会使用您的移动数据连接提供互联网连接。这可能会产生额外的移动数据流量费用。"</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"应用可以通过创建热点，与附近的设备共享内容。"</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"自动关闭热点"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"如果未连接任何设备，WLAN 热点将关闭"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"正在打开热点..."</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"正在关闭热点..."</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已连接"</string>
@@ -923,7 +945,8 @@
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android热点"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"WLAN 通话"</string>
<string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"开启 WLAN 通话功能"</string>
- <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"使用 WLAN 网络（而非移动网络）"</string>
+ <!-- no translation found for wifi_calling_suggestion_summary (4277772016570248405) -->
+ <skip />
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"通话偏好设置"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"WLAN 通话模式"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"漫游偏好设置"</string>
@@ -961,6 +984,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"紧急联系地址"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"当您通过 WLAN 网络拨打紧急呼救电话时，系统会判定您位于这个位置"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"详细了解"</annotation>"私人 DNS 功能"</string>
<string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
<string name="sound_settings" msgid="5534671337768745343">"声音"</string>
<string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -1175,6 +1199,8 @@
<string name="status_network_type" msgid="3279383550222116235">"手机网络类型"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"运营商信息"</string>
<string name="status_data_state" msgid="5503181397066522950">"移动网络状态"</string>
+ <!-- no translation found for status_esim_id (6456255368300906317) -->
+ <skip />
<string name="status_service_state" msgid="2323931627519429503">"服务状态"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"信号强度"</string>
<string name="status_roaming" msgid="2638800467430913403">"漫游"</string>
@@ -1308,6 +1334,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"新的<xliff:g id="NAME">^1</xliff:g>可以使用了。\n\n要将照片、文件和应用数据移动到此设备，请转到“设置”>“存储”。"</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"移动<xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"将<xliff:g id="APP">^1</xliff:g>及其相关数据移动到<xliff:g id="NAME_0">^2</xliff:g>仅需几分钟时间。在移动操作完成前，您将无法使用该应用。\n\n请勿在移动过程中移除该<xliff:g id="NAME_1">^2</xliff:g>。"</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"您必须解锁用户“<xliff:g id="APP">^1</xliff:g>”，才能移动数据。"</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"正在移动<xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"请勿在移动过程中移除该<xliff:g id="NAME">^1</xliff:g>。\n\n在移动操作完成前，您将无法使用此设备上的<xliff:g id="APP">^2</xliff:g>应用。"</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"取消移动"</string>
@@ -1360,19 +1387,24 @@
<string name="reset_dashboard_summary" msgid="4851012632493522755">"网络、应用或设备可以重置"</string>
<string name="reset_network_title" msgid="6166025966016873843">"重置 WLAN、移动数据网络和蓝牙设置"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"此操作会重置所有网络设置，包括：\n\n"<li>"WLAN"</li>\n<li>"移动数据网络"</li>\n<li>"蓝牙"</li></string>
+ <string name="reset_esim_title" msgid="5914265121343650792">"一并重置 eSIM 卡"</string>
+ <!-- no translation found for reset_esim_desc (6412324670559060446) -->
+ <skip />
<string name="reset_network_button_text" msgid="2035676527471089853">"重置设置"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"要重置所有网络设置吗？此操作无法撤消！"</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"重置设置"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"要重置网络设置吗？"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"此用户无权重置网络设置"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"网络设置已重置"</string>
+ <string name="reset_esim_error_title" msgid="1464195710538232590">"无法重置 eSIM 卡"</string>
+ <string name="reset_esim_error_msg" msgid="8434956817922668388">"出现错误，无法重置 eSIM 卡。"</string>
<string name="master_clear_title" msgid="3531267871084279512">"清除所有数据（恢复出厂设置）"</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>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM 卡中的运营商"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="6008213558725767177"><li>"eSIM 卡"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"这样并不会取消您的移动服务套餐。"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB存储设备"</b>"。"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"要清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD卡"</b>"。"</string>
@@ -1432,21 +1464,12 @@
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"请连接到互联网"</string>
<string name="location_title" msgid="1029961368397484576">"我的位置"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"工作资料位置信息"</string>
- <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
- <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精确度"</string>
- <string name="location_mode_battery_saving_title" msgid="711273645208158637">"低耗电量"</string>
- <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"仅限设备"</string>
- <string name="location_mode_location_off_title" msgid="2829713015012529465">"位置信息：关闭"</string>
<string name="location_app_level_permissions" msgid="1825588230817081339">"应用级权限"</string>
<string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的位置信息请求"</string>
<string name="location_no_recent_apps" msgid="2800907699722178041">"最近没有任何应用申请使用位置信息"</string>
<string name="location_category_location_services" msgid="7437150886946685979">"位置信息服务"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"高电耗"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"低电耗"</string>
- <string name="location_mode_screen_title" msgid="4528716772270246542">"位置信息模式"</string>
- <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"使用 GPS、WLAN、蓝牙或移动网络确定位置"</string>
- <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"使用 WLAN、蓝牙或移动网络确定位置"</string>
- <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"使用 GPS 和设备传感器确定位置"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"扫描"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WLAN 扫描"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"允许系统应用和服务随时检测 WLAN 网络，以便提高位置信息的精确度。"</string>
@@ -1468,6 +1491,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"位置信息来源"</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>
<string name="about_settings_summary" msgid="3371517697156165959">"查看法律信息、状态和软件版本"</string>
<string name="legal_information" msgid="5769301644270604095">"法律信息"</string>
@@ -1575,6 +1599,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"查看全部 <xliff:g id="COUNT">%1$d</xliff:g> 个应用"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"您的平板电脑和个人数据更容易受到未知应用的攻击。安装来自该来源的应用即表示，您同意对因使用这些应用可能导致的平板电脑损坏或数据丢失承担责任。"</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"您的手机和个人数据更容易受到未知应用的攻击。安装来自该来源的应用即表示，您同意对因使用这些应用可能导致的手机损坏或数据丢失承担责任。"</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"您的设备和个人数据更容易受到未知应用的攻击。安装来自该来源的应用即表示，您同意对因使用这些应用可能导致的设备损坏或数据丢失问题承担责任。"</string>
<string name="advanced_settings" msgid="1777249286757067969">"高级设置"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"启用更多设置选项"</string>
<string name="application_info_label" msgid="5736524913065714880">"应用信息"</string>
@@ -1874,6 +1899,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"可能会影响性能"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"指针停止移动后点击"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"点击前延迟"</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_summary_state_enabled" msgid="8359913912320966304">"开启"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"关闭"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"在“快捷设置”中显示"</string>
@@ -1987,7 +2015,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>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"充电剩余时间：<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <string name="background_activity_title" msgid="8618384801540759730">"后台活动"</string>
+ <string name="background_activity_title" msgid="4797874712348525348">"受限"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"允许应用在后台运行"</string>
<string name="background_activity_summary_on" msgid="649282072540085599">"在您未使用应用时，应用可在后台运行"</string>
<string name="background_activity_summary_off" msgid="7666330699090632040">"在您未使用应用时，应用的后台活动会受限"</string>
@@ -2030,14 +2058,31 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
- <skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
- <skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
- <skip />
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"电池状况良好"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"应用行为正常"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"电池电量不足"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"电池的续航时间不理想"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"开启智能电池管理器"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"开启即可优化电池用量"</string>
+ <string name="battery_tip_early_heads_up_title" msgid="1454605424618204941">"开启“电量不足模式”"</string>
+ <string name="battery_tip_early_heads_up_summary" msgid="4003736326324428487">"延长电池续航时间"</string>
+ <string name="battery_tip_early_heads_up_done_title" msgid="1545434816346760843">"“电量不足模式”已开启"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="8191928150995385163">"部分功能受到限制"</string>
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"频繁使用手机"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"频繁使用平板电脑"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"频繁使用设备"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"自上次充满电后已使用了大约 <xliff:g id="HOUR">%1$s</xliff:g>"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"您的手机因频繁使用而消耗了很多电量。您的电池目前运行正常。\n\n自上次充满电后，您的手机已使用了大约 <xliff:g id="HOUR">%1$s</xliff:g>。\n\n总用电量："</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"您的平板电脑因频繁使用而消耗了很多电量。您的电池目前运行正常。\n\n自上次充满电后，您的平板电脑已使用了大约 <xliff:g id="HOUR">%1$s</xliff:g>。\n\n总用电量："</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"您的设备因频繁使用而消耗了很多电量。您的电池目前运行正常。\n\n自上次充满电后，您的设备已使用了大约 <xliff:g id="HOUR">%1$s</xliff:g>。\n\n总用电量："</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"智能电池管理器"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"自动管理电池"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"根据使用情况自动调整应用的耗电量"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"受限应用"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d 个应用</item>
+ <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>
@@ -2146,6 +2191,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"媒体服务器"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"应用优化"</string>
<string name="battery_saver" msgid="8172485772238572153">"省电模式"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"使用省电模式"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"自动开启"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"一律不"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"电量剩余 <xliff:g id="PERCENT">%1$s</xliff:g> 时"</string>
@@ -2333,8 +2379,12 @@
<string name="sync_is_failing" msgid="1591561768344128377">"同步操作当前遇到了一些问题，很快便可恢复。"</string>
<string name="add_account_label" msgid="7811707265834013767">"添加帐号"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"工作资料尚不可用"</string>
- <string name="work_mode_label" msgid="5794470908668593961">"工作模式"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"启用工作资料，包括应用、后台同步和相关功能"</string>
+ <!-- no translation found for work_mode_label (7157582467956920750) -->
+ <skip />
+ <!-- no translation found for work_mode_on_summary (3628349169847990263) -->
+ <skip />
+ <!-- no translation found for work_mode_off_summary (2657138190560082508) -->
+ <skip />
<string name="remove_managed_profile_label" msgid="3856519337797285325">"移除工作资料"</string>
<string name="background_data" msgid="5779592891375473817">"后台流量"</string>
<string name="background_data_summary" msgid="8328521479872763452">"应用可以随时同步、发送和接收数据"</string>
@@ -2366,6 +2416,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"要移除帐号吗？"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"移除该帐号会从平板电脑中删除所有相关的邮件、联系人以及其他数据。"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"移除该帐号会从手机中删除所有相关的邮件、联系人以及其它数据。"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"移除该帐号后，设备上的相关消息、联系人和其他数据也将全部删除！"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"您的管理员不允许进行这项更改"</string>
<string name="provider_label" msgid="7724593781904508866">"推送订阅"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2584,7 +2635,8 @@
<item quantity="other">检查证书</item>
<item quantity="one">检查证书</item>
</plurals>
- <string name="user_settings_title" msgid="6151874007858148344">"用户"</string>
+ <!-- no translation found for user_settings_title (3493908927709169019) -->
+ <skip />
<string name="user_list_title" msgid="7937158411137563543">"用户和个人资料"</string>
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"添加用户或个人资料"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"添加用户"</string>
@@ -2774,7 +2826,8 @@
<string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"蓝牙、投射"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"应用和通知"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"权限、默认应用"</string>
- <string name="account_dashboard_title" msgid="4936890821712178853">"用户和帐号"</string>
+ <!-- no translation found for account_dashboard_title (5895948991491438911) -->
+ <skip />
<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>
@@ -2805,7 +2858,6 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"勿扰, 请勿打扰, 打扰, 打断"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM 内存"</string>
<string name="keywords_location" msgid="6615286961552714686">"附近, 位置信息, 位置, 记录, 历史记录, 报告"</string>
- <string name="keywords_location_mode" msgid="8584992704568356084">"精确度 准确度"</string>
<string name="keywords_accounts" msgid="1957925565953357627">"帐号"</string>
<string name="keywords_users" msgid="3434190133131387942">"限制, 限定, 受限"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"文字, 文本, 更正, 声音, 提示音, 振动, 自动, 语言, 手势, 推荐, 建议, 主题, 主题背景, 令人反感, 字词, 输入, 表情符号, 国际"</string>
@@ -2872,6 +2924,7 @@
<item quantity="one">1 条规则</item>
</plurals>
<string name="zen_mode_settings_title" msgid="1066226840983908121">"勿扰模式"</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"开启“勿扰”模式"</string>
<string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"行为"</string>
<string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"允许以下类型的提示音和振动："</string>
<string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"不发出提示音"</string>
@@ -2881,8 +2934,11 @@
<string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"自动开启"</string>
<string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"自动规则"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"自动规则"</string>
- <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"设置“勿扰”规则"</string>
- <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"在特定时段限制声音和振动"</string>
+ <!-- no translation found for zen_mode_automation_suggestion_title (4321254843908888574) -->
+ <skip />
+ <!-- no translation found for zen_mode_automation_suggestion_summary (6223252025075862701) -->
+ <skip />
+ <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_no_interruptions" msgid="8107126344850276878">"完全阻止"</string>
@@ -2890,12 +2946,15 @@
<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_add" msgid="90014394953272517">"添加"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"立即开启"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"立即关闭"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="8287824809739581837">"开启"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"立即开启"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"立即关闭"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"勿扰模式结束时间：<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"勿扰模式将一直开启，直到您将其关闭"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"某个规则（<xliff:g id="RULE_NAME">%s</xliff:g>）已自动开启勿扰模式"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"某个应用（<xliff:g id="APP_NAME">%s</xliff:g>）已自动开启勿扰模式"</string>
+ <string name="zen_interruption_level_priority" msgid="2078370238113347720">"仅限优先事项"</string>
+ <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</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>
@@ -2911,6 +2970,7 @@
<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="recent_notifications" msgid="5660639387705060156">"最近发送"</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>
@@ -2930,7 +2990,7 @@
<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_importance_title" msgid="848692592679312666">"重要程度"</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="5455049524984686275">"不发出提示音，也不在屏幕上弹出通知"</string>
@@ -2948,6 +3008,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"重要性：中等"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"通知使用权"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"已禁止访问工作资料通知"</string>
@@ -2978,9 +3039,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"“勿扰”权限"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"没有任何已安装应用申请“勿扰”权限"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"正在加载应用…"</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android 会阻止此应用的通知显示在此设备上"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android 会阻止这类通知显示在此设备上"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android 会阻止这组通知显示在此设备上"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"根据您的要求，Android 会阻止此应用的通知显示在此设备上"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"根据您的要求，Android 会阻止这类通知显示在此设备上"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"根据您的要求，Android 会阻止这组通知显示在此设备上"</string>
<string name="notification_channels" msgid="5346841743182627500">"类别"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"其他"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3125,6 +3186,8 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"为了进一步保护此设备的安全，除了使用指纹解锁设备之外，您还可以将设备设为需要输入密码才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\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="1793719723017395175">"是"</string>
+ <string name="restricted_false_label" msgid="6374816254102233858">"否"</string>
<string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"要求输入 PIN 码吗？"</string>
<string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"要求绘制图案吗？"</string>
<string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"要求输入密码吗？"</string>
@@ -3224,7 +3287,7 @@
<string name="usage_access" msgid="5479504953931038165">"使用情况访问权限"</string>
<string name="permit_usage_access" msgid="4012876269445832300">"允许访问使用记录"</string>
<string name="app_usage_preference" msgid="7065701732733134991">"应用使用偏好设置"</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>
@@ -3397,7 +3460,8 @@
<string name="users_and_accounts_summary" msgid="245282689646897882">"当前用户：<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"目前登录的用户为：<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="payment_summary" msgid="3472482669588561110">"默认使用<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="location_on_summary" msgid="5127631544018313587">"开启/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+ <!-- no translation found for location_on_summary (4083334422422067511) -->
+ <skip />
<string name="location_off_summary" msgid="6474350053215707957">"关闭"</string>
<string name="backup_disabled" msgid="485189128759595412">"备份功能已停用"</string>
<string name="about_summary" msgid="924181828102801010">"已更新至 Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3407,6 +3471,7 @@
<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="6346948990624612516">"无法关闭备份功能"</string>
<string name="default_admin_support_msg" msgid="2853684309779513863">"此操作已被禁止执行。要了解详情，请与贵单位的管理员联系。"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"更多详情"</string>
<string name="admin_profile_owner_message" msgid="5860816886981109626">"您的管理员可以监控和管理与您的工作资料相关的应用和数据（其中包括设置、权限、企业权限、网络活动和设备的位置信息）。"</string>
@@ -3430,9 +3495,11 @@
<string name="condition_work_title" msgid="7293722361184366648">"工作资料已关闭"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"与您的工作资料相关的应用、后台同步功能和其他功能均已关闭。"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"设置“夜间模式”时间安排"</string>
- <string name="night_display_suggestion_summary" msgid="1747638280833631187">"将屏幕色调调节为琥珀色以帮助您入睡"</string>
+ <!-- no translation found for night_display_suggestion_summary (228346372178218442) -->
+ <skip />
<string name="condition_night_display_title" msgid="5599814941976856183">"“夜间模式”已开启"</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>
<string name="suggestions_more_title" msgid="8223690393059519879">"另外 <xliff:g id="ID_1">%1$d</xliff:g> 条"</string>
@@ -3537,6 +3604,8 @@
<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_none" msgid="5144174674654097316">"无"</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>
@@ -3559,31 +3628,8 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"已连接到多部设备"</string>
<string name="demo_mode" msgid="2798762752209330277">"系统界面演示模式"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"快捷设置开发者图块"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"我们会随时为您提供帮助"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"我们可全天候为您提供服务"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"我们可全天候为您提供服务"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"我们的支持团队会协助您解决任何问题"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"我们的支持团队可全天候为您提供服务"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"请搜索相关帮助内容或在支持服务时段内（当地时间）再次联系我们：<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"电话支持服务时段（当地时间）<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"搜索帮助或发现更多提示与技巧"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"支持的国家/地区："</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"您目前人在国外吗？"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"可能需要支付国际通话费用"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"电话"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"聊天"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"探索更多提示和技巧"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"搜索帮助与发送反馈"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"与支持人员联系"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"登录"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"无法登录？"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"发送系统信息"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"不再显示"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"通过以下帐号提出请求："</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"添加帐号"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"系统信息"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"窗口跟踪"</string>
+ <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"表面跟踪"</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>
@@ -3599,11 +3645,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 秒</item>
<item quantity="one">1 秒</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"大约需等待 <xliff:g id="ESTIMATE">%1$s</xliff:g>"</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="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>
@@ -3614,32 +3660,25 @@
<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_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"按电源按钮两次即可打开相机"</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="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"扭转手机两次即可开启自拍模式"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"扭转平板电脑两次即可开启自拍模式"</string>
- <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"扭转设备两次即可开启自拍模式"</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_suggestion_summary" msgid="5987443721392571847">"屏幕关闭时查看通知"</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_pickup_suggestion_summary" msgid="7014700589991761035">"屏幕关闭时查看通知"</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>
<string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"要查看通知，请在设备背面的指纹传感器上向下滑动手指。"</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"快速查看通知"</string>
- <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"在指纹传感器上向下滑动手指"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"开启"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"关闭"</string>
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"引导加载程序已解锁"</string>
@@ -3769,8 +3808,26 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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="directory_access" msgid="4722237210725864244">"目录访问权限"</string>
+ <string name="keywords_directory_access" msgid="360557532842445280">"目录访问权限"</string>
+ <!-- no translation found for directory_on_volume (1246959267814974387) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for my_device_info_title (5512426315065239032) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (7850936731324591758) -->
+ <skip />
+ <!-- no translation found for my_device_info_title (5512071003076176919) -->
+ <skip />
+ <!-- no translation found for my_device_info_account_preference_title (342933638925781861) -->
+ <skip />
+ <!-- no translation found for my_device_info_device_name_preference_title (7104085224684165324) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_pref (2460847604498343330) -->
+ <skip />
+ <!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
</resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index e29b113..c991cab 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"1 小時"</item>
<item msgid="5198271470953124739">"無時限"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 (預設)"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"差"</item>
<item msgid="2042505933058940139">"差"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"超過 60 天"</item>
<item msgid="5692284879054004388">"超過 90 天"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"使用網路偏好設定"</item>
+ <item msgid="8745603368609022803">"視為計量付費"</item>
+ <item msgid="2266114985518865625">"視為非計量付費"</item>
+ </string-array>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 27d1c90..a52183c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"你的裝置"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"配對新裝置"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"允許裝置與藍牙裝置配對並建立連線"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"停用藍牙同步鈴聲功能"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"不透過藍牙耳機播放自訂手機鈴聲"</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>
@@ -330,6 +332,16 @@
<string name="date_time_set_date" msgid="7021491668550232105">"設定日期"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"依照字母排序"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"依照時區排序"</string>
+ <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+ <skip />
+ <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+ <skip />
+ <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+ <skip />
+ <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+ <skip />
<string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
<string name="time_picker_title" msgid="483460752287255019">"時間"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"自動鎖定"</string>
@@ -348,6 +360,8 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"個人資料資訊"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"帳戶"</string>
<string name="location_settings_title" msgid="1369675479310751735">"定位"</string>
+ <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+ <skip />
<string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
<string name="security_settings_title" msgid="4918904614964215087">"安全性與位置資訊"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密和憑證"</string>
@@ -691,6 +705,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"當成手機喇叭"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"使用於音樂與媒體"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"記住設定"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"已連線藍牙音訊裝置的數量上限"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"選取已連線藍牙音訊裝置的數量上限"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"投放"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"啟用無線螢幕分享"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"找不到附近的裝置。"</string>
@@ -705,6 +721,8 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"名稱"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+ <skip />
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"「<xliff:g id="REQUESTER">%s</xliff:g>」要求開啟 Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"「<xliff:g id="REQUESTER">%s</xliff:g>」要求關閉 Wi-Fi"</string>
@@ -722,6 +740,8 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"開啟 Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+ <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+ <skip />
<string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi 設定"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"設定、管理無線網路存取點"</string>
@@ -833,7 +853,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入你的網路密碼"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"電信業者 Wi‑Fi 網路"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"透過「<xliff:g id="NAME">%1%s</xliff:g>」連線"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"透過「<xliff:g id="NAME">%1$s</xliff:g>」連線"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟網路掃描功能 (即使 Wi-Fi 已關閉)，藉此提升定位精確度及用於其他用途。\n\n你要對所有需要執行掃描的應用程式允許這項要求嗎？"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"如要關閉這項功能，請在溢位選單中選取 [進階]。"</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
@@ -909,10 +929,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"存取點頻帶"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"使用無線基地台建立 Wi‑Fi 網路供其他裝置使用。無線基地台會使用你的行動數據連線提供網際網路。可能需支付額外的行動數據傳輸費用。"</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"應用程式可以建立無線基地台來和鄰近的裝置分享內容。"</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"自動關閉無線基地台"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Wi‑Fi 無線基地台會在沒有任何裝置連線時關閉"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"正在開啟無線基地台…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"正在關閉無線基地台…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> 使用中"</string>
@@ -961,6 +979,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"緊急地址"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"當你透過 Wi‑Fi 網路撥打緊急電話時，系統會判定你位於這個地址"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"進一步瞭解"</annotation>"私人 DNS 功能"</string>
<string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
<string name="sound_settings" msgid="5534671337768745343">"音效"</string>
<string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -1044,7 +1063,7 @@
<string name="auto_brightness_very_high_title" msgid="8867164854439331022">"非常高"</string>
<string name="auto_brightness_subtitle" msgid="6454652530864093466">"你偏好的亮度"</string>
<string name="auto_brightness_off_summary" msgid="7629228736838155268">"不要根據環境光源調整亮度"</string>
- <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"電池用量已增加"</string>
+ <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"將增加電池用量"</string>
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"根據環境光源調整最佳亮度。開啟這項功能之後，你依然可以暫時調整亮度。"</string>
<string name="night_display_title" msgid="2626451512200357686">"夜燈"</string>
<string name="night_display_text" msgid="1837277457033025056">"夜燈功能會將你的螢幕色調改為琥珀色，讓你更輕鬆地在光線昏暗的環境中查看螢幕，也比較容易入睡。"</string>
@@ -1088,13 +1107,13 @@
<string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
<string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
<string name="ambient_display_screen_title" msgid="4252755516328775766">"環境顯示"</string>
- <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"一律開啟/電池用量已增加"</string>
+ <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"一律開啟/將增加電池用量"</string>
<string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新通知"</string>
<string name="ambient_display_category_triggers" msgid="4359289754456268573">"顯示時機"</string>
<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>
@@ -1308,6 +1327,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"新的「<xliff:g id="NAME">^1</xliff:g>」運作中。\n\n如要將相片、檔案和應用程式資料移動到這台裝置上，請前往 [設定] > [儲存空間]。"</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"移動「<xliff:g id="APP">^1</xliff:g>」"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"將「<xliff:g id="APP">^1</xliff:g>」和相關資料移動到「<xliff:g id="NAME_0">^2</xliff:g>」只需要幾分鐘。移動作業完成後，你才可以使用該應用程式。\n\n請勿在執行移動作業時移除「<xliff:g id="NAME_1">^2</xliff:g>」。"</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"你必須將使用者「<xliff:g id="APP">^1</xliff:g>」解鎖，才能移動資料。"</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"正在移動「<xliff:g id="APP">^1</xliff:g>」…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"請勿在執行移動作業時移除「<xliff:g id="NAME">^1</xliff:g>」。\n\n移動作業完成後，這台裝置上的「<xliff:g id="APP">^2</xliff:g>」應用程式才可供使用。"</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"取消移動"</string>
@@ -1468,6 +1488,8 @@
<string name="location_sources_heading" msgid="1278732419851088319">"位置資訊來源"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"關於平板電腦"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"關於手機"</string>
+ <!-- no translation found for about_settings (6717640957897546887) -->
+ <skip />
<string name="about_settings" product="emulator" msgid="221313099578564438">"關於模擬裝置"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"查看法律資訊、狀態、軟體版本"</string>
<string name="legal_information" msgid="5769301644270604095">"法律資訊"</string>
@@ -1575,6 +1597,8 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"查看全部共 <xliff:g id="COUNT">%1$d</xliff:g> 個應用程式"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"來歷不明的應用程式可能會損害你的平板電腦和個人資料。安裝這個來源提供的應用程式集表示你同意，如因使用這些應用程式導致你的平板電腦受損或資料遺失，須自行負責。"</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"來歷不明的應用程式可能會損害你的手機和個人資料。安裝這個來源提供的應用程式即表示你同意，如因使用這些應用程式導致你的手機受損或資料遺失，須自行負責。"</string>
+ <!-- no translation found for install_all_warning (3648003301476423145) -->
+ <skip />
<string name="advanced_settings" msgid="1777249286757067969">"進階設定"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"啟用更多設定選項"</string>
<string name="application_info_label" msgid="5736524913065714880">"應用程式資訊"</string>
@@ -1874,6 +1898,12 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"可能會影響效能"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"游標停止移動後點擊"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"點擊前延遲"</string>
+ <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+ <skip />
+ <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+ <skip />
+ <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+ <skip />
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"開啟"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"關閉"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"在快速設定中顯示"</string>
@@ -2030,14 +2060,37 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"電池狀態良好"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"應用程式正常運作中"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"電池電量不足"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"電量衰退過快"</string>
+ <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
<skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+ <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+ <skip />
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+ <skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"頻繁使用手機"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"頻繁使用平板電腦"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"頻繁使用裝置"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"自上次完全充飽電後已使用了約 <xliff:g id="HOUR">%1$s</xliff:g>"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"你的手機因為頻繁使用而耗用大量電力。你的電池目前正常運作中。\n\n自上次完全充飽電後，你的手機已使用了約 <xliff:g id="HOUR">%1$s</xliff:g>。\n\n總用量："</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"你的平板電腦因為頻繁使用而耗用大量電力。你的電池目前正常運作中。\n\n自上次完全充飽電後，你的平板電腦已使用了約 <xliff:g id="HOUR">%1$s</xliff:g>。\n\n總用量："</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"你的裝置因為頻繁使用而耗用大量電力。你的電池目前正常運作中。\n\n自上次完全充飽電後，你的裝置已使用了約 <xliff:g id="HOUR">%1$s</xliff:g>。\n\n總用量："</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Smart battery manager"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"自動管理電池"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"根據使用情形自動調整應用程式的耗電量"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"受限制的應用程式"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="other">%1$d 個應用程式</item>
+ <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>
@@ -2146,6 +2199,8 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"媒體伺服器"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"應用程式最佳化"</string>
<string name="battery_saver" msgid="8172485772238572153">"節約耗電量"</string>
+ <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+ <skip />
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"自動開啟"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"永遠不要"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"電量為 <xliff:g id="PERCENT">%1$s</xliff:g> 時"</string>
@@ -2267,7 +2322,7 @@
<string name="backup_data_summary" msgid="708773323451655666">"將應用程式資料、Wi-Fi 密碼及其他設定備份到 Google 伺服器"</string>
<string name="backup_configure_account_title" msgid="3790872965773196615">"備份帳戶"</string>
<string name="include_app_data_title" msgid="2829970132260278394">"包括應用程式資料"</string>
- <string name="auto_restore_title" msgid="5397528966329126506">"自動還原功能"</string>
+ <string name="auto_restore_title" msgid="5397528966329126506">"自動還原"</string>
<string name="auto_restore_summary" msgid="4235615056371993807">"重新安裝應用程式時，還原備份的設定和資料"</string>
<string name="backup_inactive_title" msgid="685838037986644604">"備份服務未啟用"</string>
<string name="backup_configure_account_default_summary" msgid="2436933224764745553">"目前沒有帳戶正在儲存備份資料"</string>
@@ -2370,6 +2425,8 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"確定要移除帳戶？"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"移除帳戶後，平板電腦上所有的訊息、聯絡人和其他資料將全部遭到刪除！"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"移除帳戶後，手機上所有的郵件、聯絡人和其他資料將全部遭到刪除！"</string>
+ <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+ <skip />
<string name="remove_account_failed" msgid="3901397272647112455">"你的管理員不允許這項變更"</string>
<string name="provider_label" msgid="7724593781904508866">"發送訂閱"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2894,8 +2951,8 @@
<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_add" msgid="90014394953272517">"新增"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"立即開啟"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"立即關閉"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"立即開啟"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"立即關閉"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"零打擾模式結束時間：<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"零打擾模式會保持開啟，直到你關閉為止"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"規則 (<xliff:g id="RULE_NAME">%s</xliff:g>) 已將零打擾模式自動開啟"</string>
@@ -2934,7 +2991,7 @@
<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_importance_title" msgid="848692592679312666">"重要性"</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="5455049524984686275">"不發出音效或顯示通知"</string>
@@ -2952,6 +3009,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"中重要性"</string>
<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="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"管理員已禁止存取 Work 設定檔通知"</string>
@@ -2982,9 +3040,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"零打擾存取權"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"最近沒有已安裝的應用程式要求「零打擾」存取權"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android 已設定封鎖，不讓這個應用程式的通知顯示在這個裝置上"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android 已設定封鎖，不讓這個類別的通知顯示在這個裝置上"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android 已設定封鎖，不讓這個群組的通知顯示在這個裝置上"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Android 已根據你的要求設定封鎖，不讓這個應用程式的通知顯示在這個裝置上"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Android 已根據你的要求設定封鎖，不讓這個類別的通知顯示在這個裝置上"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Android 已根據你的要求設定封鎖，不讓這個群組的通知顯示在這個裝置上"</string>
<string name="notification_channels" msgid="5346841743182627500">"類別"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"其他"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3563,31 +3621,10 @@
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"已連線到多個裝置"</string>
<string name="demo_mode" msgid="2798762752209330277">"系統 UI 示範模式"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"快速設定開發人員圖塊"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"我們很樂意為你提供協助"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"我們隨時為你提供服務"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"我們隨時為你提供服務"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"我們的支援小組會協助你解決任何問題"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"我們的支援小組全年無休，隨時為你提供服務"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"搜尋相關說明或是於支援服務時間 (當地時間) 再次來電：<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"電話支援服務時間 (當地時間)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"搜尋相關說明，或是探索實用提示及秘訣"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"電話支援服務："</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"人在國外嗎？"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"可能需要支付國際通話費用"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"電話"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"即時通訊"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"探索實用提示及秘訣"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"搜尋說明及提供意見"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"與支援小組聯絡"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"登入"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"無法登入嗎？"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"傳送系統資訊"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"不要再顯示"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"透過以下帳戶提出要求"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"新增帳戶"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"系統資訊"</string>
+ <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+ <skip />
+ <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+ <skip />
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Work 設定檔設定"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"聯絡人搜尋"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允許你的機構搜尋聯絡人，以便識別來電者和聯絡人的身分"</string>
@@ -3603,11 +3640,12 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 秒</item>
<item quantity="one">1 秒</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"大約需等候 <xliff:g id="ESTIMATE">%1$s</xliff:g>"</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>
+ <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+ <skip />
<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>
@@ -3773,8 +3811,10 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+ <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>
+ <!-- no translation found for storage_access (8905018810338984531) -->
<skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+ <!-- no translation found for keywords_storage_access (3708874088152933579) -->
<skip />
</resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 20534f9..b7ff086 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -136,6 +136,20 @@
<item msgid="477015974247590543">"1 ihora"</item>
<item msgid="5198271470953124739">"Ayiphelelwa isikhathi"</item>
</string-array>
+ <string-array name="bluetooth_max_connected_audio_devices">
+ <item msgid="60897909354162249">"1 Okuzenzakalelayo"</item>
+ <item msgid="7584056855393485416">"2"</item>
+ <item msgid="844570832050176311">"3"</item>
+ <item msgid="1896812737336024220">"4"</item>
+ <item msgid="2664420770707984266">"5"</item>
+ </string-array>
+ <string-array name="bluetooth_max_connected_audio_devices_values">
+ <item msgid="1992185266918208754">"1"</item>
+ <item msgid="2731443086402670729">"2"</item>
+ <item msgid="74627748729027880">"3"</item>
+ <item msgid="2654447223197666662">"4"</item>
+ <item msgid="7026157954713482328">"5"</item>
+ </string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Akukuhle"</item>
<item msgid="2042505933058940139">"Akukuhle"</item>
@@ -476,4 +490,9 @@
<item msgid="2900554746706302178">"Ngaphezulu kobudala obuyizinsuku ezingu-60"</item>
<item msgid="5692284879054004388">"Ngaphezulu kobudala obuyizinsuku ezingu-90"</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item msgid="2975784243692054526">"Sebenzisa izinketho zenethiwekhi"</item>
+ <item msgid="8745603368609022803">"Phatha njengokulinganisiwe"</item>
+ <item msgid="2266114985518865625">"Phatha njengokungalinganisiwe"</item>
+ </string-array>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 420ec71..704c64e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -170,6 +170,8 @@
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Amadivayisi akho"</string>
<string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Bhanqa idivayisi entsha"</string>
<string name="bluetooth_pref_summary" msgid="2606502649251443574">"Vumela idivayisi ukuthi ibhangqe iphinde ixhumeke kumadivayisi e-bluetooth"</string>
+ <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Khubaza ukukhala okuphakathi nomkhiqizo"</string>
+ <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Ungadlali amathoni okukhala efoni kumahedisethi e-Bluetooth"</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>
@@ -330,6 +332,11 @@
<string name="date_time_set_date" msgid="7021491668550232105">"Setha idethi"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Hlunga ngama-alfabethi"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Hlunga ngesikhathi somkhawulo"</string>
+ <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> iqala ngo-<xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+ <string name="zone_time_type_dst" msgid="8850494578766845276">"Isikhathi sokulondoloza usuku"</string>
+ <string name="zone_time_type_standard" msgid="3462424485380376522">"Isikhathi esivamile"</string>
+ <string name="zone_menu_by_region" msgid="4603214570803607532">"Izoni yesikhathi ngesifunda"</string>
+ <string name="zone_menu_by_offset" msgid="1172774718486088771">"Amazoni esikhathi alungisiwe"</string>
<string name="date_picker_title" msgid="1338210036394128512">"Idethi"</string>
<string name="time_picker_title" msgid="483460752287255019">"Isikhathi"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"Ivalwe ngokuzenzakalelayo"</string>
@@ -348,6 +355,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Ulwazi lwephrofayela"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Ama-akhawunti"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Indawo"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Sebenzisa indawo"</string>
<string name="account_settings_title" msgid="626177544686329806">"Ama-akhawunti"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Ukuvikela nendawo"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Ukubethela nokuqinisekisa"</string>
@@ -691,6 +699,8 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Njenge sipikhafoni"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Komculo nemidiya"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Khumbula izilungiselelo"</string>
+ <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Amadivayisi omsindo e-Bluetooth axhumekile"</string>
+ <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Khetha inombolo enkulu yamadivayisi omsindo we-Bluetooth axhumekile"</string>
<string name="wifi_display_settings_title" msgid="8740852850033480136">"Abalingisi"</string>
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Nika amandla ukubukeka okungenantambo "</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Awekho amadivayisi aseduze atholakele."</string>
@@ -705,6 +715,7 @@
<string name="wifi_display_options_name" msgid="4756080222307467898">"Igama"</string>
<string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+ <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Ngena ngemvume"</string>
<string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
<string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ifuna ukuvula i-Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ifuna ukuvala i-Wi-Fi"</string>
@@ -722,6 +733,7 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"I-Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Vula i-Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"I-Wi-Fi"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Sebenzisa i-Wi-Fi"</string>
<string name="wifi_settings_category" msgid="8719175790520448014">"Izilungiselelo ze-Wi-Fi"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"I-Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Hlela, uphathe izindawo zokungena ezingenantambo"</string>
@@ -833,7 +845,7 @@
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (i-WPS iyatholakala)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Faka iphasiwedi yakho yenethiwekhi"</string>
<string name="wifi_carrier_connect" msgid="8174696557882299911">"Inethiwekhi ye-Wi-Fi yenkampani yenethiwekhi"</string>
- <string name="wifi_carrier_content" msgid="4634077285415851933">"Xhuma nge-<xliff:g id="NAME">%1%s</xliff:g>"</string>
+ <string name="wifi_carrier_content" msgid="4634077285415851933">"Xhuma nge-<xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ukuze kuthuthukiswe ukufaneleka kwendawo nezinye izinjongo, i-<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula ukuskena kwenethiwekhi, noma ngabe i-Wi-Fi ivaliwe.\n\nVumela lokhu ngazo zonke izinhlelo zokusebenza ezifuna ukuskena?"</string>
<string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ukuze uvale lokhu, iya ku-Okuthuthukile kwimenyu yokuningi."</string>
<string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Vumela"</string>
@@ -909,10 +921,8 @@
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"I-AP Band"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Sebenzisa i-hotspot ukudala inethiwekhi ye-Wi‑Fi yamanye amadivayisi akho. I-Hotspot inikezela nge-inthanethi isebenzisa uxhumo lwedatha yakho yeselula. Amashaji edatha yeselula angeziwe angasebenza."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Izinhlelo zokusebenza zingadala i-hotspot ukwabelana ngokuqukethwe namadivayisi aseduze."</string>
- <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
- <skip />
- <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
- <skip />
+ <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Vala ama-hotspot ngokuzenzakalela"</string>
+ <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"I-Wi-Fi hotspot izovaleka uma kungekho amadivayisi axhunyiwe"</string>
<string name="wifi_tether_starting" msgid="1322237938998639724">"Ivula i-hotspot…"</string>
<string name="wifi_tether_stopping" msgid="4835852171686388107">"Ivala i-hotspot…"</string>
<string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"I-<xliff:g id="NETWORK_SSID">%1$s</xliff:g> iyasebenza"</string>
@@ -961,6 +971,7 @@
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Ikheli eliphuthumayo"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Isetshenziswa njengendawo yakho uma wenza ikholi ephuthumayo nge-Wi-Fi"</string>
+ <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Funda kabanzi"</annotation>" mayelana nezici ze-Private DNS"</string>
<string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
<string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
<string name="all_volume_title" msgid="4296957391257836961">"Amavolumu"</string>
@@ -1308,6 +1319,7 @@
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"I-<xliff:g id="NAME">^1</xliff:g> yakho entsha iyasebenza. \n\nUkuze uhambise izithombe, amafayela, nedatha yohlelo lokusebenza kule divayisi, hamba ku-Izilungiselelo > Isitoreji."</string>
<string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Hambisa i-<xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Ukuhambisa i-<xliff:g id="APP">^1</xliff:g> kanye nedatha yayo ku-<xliff:g id="NAME_0">^2</xliff:g> kuzothatha izikhathi ezimbalwa kuphela. Ngeke uze ukwazi ukusebenzisa uhlelo lokusebenza kuze kube ukuhanjiswa kuqedile. \n\nUngasusi i-<xliff:g id="NAME_1">^2</xliff:g> ngesikhathi sokuhambisa."</string>
+ <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Ukuze uhambise idatha udinga ukuvula umsebenzisi <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Ihambisa i-<xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ungasusi i-<xliff:g id="NAME">^1</xliff:g> ngesikhathi sokuhambisa. \n\nUhlelo lokusebenza lwe-<xliff:g id="APP">^2</xliff:g> kule divayisi ngeke luze lutholakale kuze kuqedwe ukuhambisa."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Khansela ukuhambisa"</string>
@@ -1469,6 +1481,7 @@
<string name="location_sources_heading" msgid="1278732419851088319">"Imithombo yendawo"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Mayelana nethebhulethi"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Mayelana nefoni"</string>
+ <string name="about_settings" product="device" msgid="6717640957897546887">"Mayelana nedivayisi"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"Mayelana nedivayisi elinganisiwe"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Buka ulwazi lomthetho, umumo wefoni, inguqulo yesofthiwe"</string>
<string name="legal_information" msgid="5769301644270604095">"Uwazi olusemthethweni"</string>
@@ -1576,6 +1589,7 @@
<string name="see_all_apps_title" msgid="1317153498074308438">"Bona zonke izinhlelo zokusebenza ezingu-<xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ithebulethi yakho nedatha yomuntu siqu kusengcupheni enkulu ukuthi kungahlaselwa izinhlelo zokusebenza ezingaziwa. Ngokufaka izinhlelo zokusebenza kusukela kulo mthombo, uyavuma ukuthi unesibopho sanoma ikuphi ukonakala kuthebulethi yakho noma ukulahlekelwa idatha okungabangelwa ukusetshenziswa kwazo."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"Ifoni yakho nedatha yomuntu siqu kusengcupheni enkulu ukuthi kungahlaselwa izinhlelo zokusebenza ezingaziwa. Ngokufaka izinhlelo zokusebenza kusukela kulo mthombo, uyavuma ukuthi unesibopho sanoma ikuphi ukonakala kufoni yakho noma ukulahlekelwa idatha okungabangelwa ukusetshenziswa kwazo."</string>
+ <string name="install_all_warning" product="device" msgid="3648003301476423145">"Idivayisi yakho nedatha yomuntu siqu isengcupheni enkulu ukuthi kungahlaselwa izinhlelo zokusebenza ezingaziwa. Ngokufaka izinhlelo zokusebenza kusukela kulo mthombo, uyavuma ukuthi unesibopho sanoma ikuphi ukonakala kudivayisi yakho noma ukulahlekelwa idatha okungabangelwa ukusetshenziswa kwazo."</string>
<string name="advanced_settings" msgid="1777249286757067969">"Izilungiselelo ezithuthukisiwe"</string>
<string name="advanced_settings_summary" msgid="4016682978071086747">"Nima amandla izinketho eziphezulu zezilungiselelo"</string>
<string name="application_info_label" msgid="5736524913065714880">"Ulwazi lohlelo lokusebenza"</string>
@@ -1875,6 +1889,9 @@
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Ingaphazamisa ukusebenza"</string>
<string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Chofoza ngemuva kokuthi isikhombisi siyeke ukuhamba"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Bambezela ngaphambi kokuchofoza"</string>
+ <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Sebeenzisa 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_summary_state_enabled" msgid="8359913912320966304">"VULIWE"</string>
<string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VALIWE"</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Bonisa Kuzilungiselelo Ezisheshayo"</string>
@@ -2031,14 +2048,35 @@
<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>
- <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+ <string name="battery_tip_summary_title" msgid="7060523369832289878">"Ibhethri lisesimeni esihle"</string>
+ <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Izinhlelo zokusebenza ziziphethe ngokujwayelekile"</string>
+ <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Amandla ebhethri aphansi"</string>
+ <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Ibhethri alikwazi ukunikeza impilo enhle yebhethri"</string>
+ <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Vula isiphathi sebhethri esihlakaniphile"</string>
+ <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Vula ukuze uthuthukise ukusebenza kwebhethri"</string>
+ <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
<skip />
- <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+ <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+ <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
<skip />
- <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+ <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
<skip />
+ <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Ifoni isetshenziswe kakhulu"</string>
+ <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Ithebhulethi isetshenziswe kakhulu"</string>
+ <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Idivayisi isetshenziswe kakhulu"</string>
+ <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Cishe u-<xliff:g id="HOUR">%1$s</xliff:g> usetshenzisiwe kusuka ekushajeni okugcwele"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Ifoni yakho isetshenziswe kakhulu futhi lokhu kusebenzise ibhethri eliningi. Ibhethri lakho lisebenza kahle.\n\n Ifoni yakho isetshenziswe cishe izikhathi ezingu-<xliff:g id="HOUR">%1$s</xliff:g> kusuka ekushajeni okugcwele.\n\n Ukusebenzisa okuphelele:"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Ithebhulethi yakho isetshenziswe kakhulu futhi lokhu kusebenzise ibhethri eliningi. Ithebhulethi yakho isebenza kahle.\n\n Ifoni yakho isetshenziswe cishe izikhathi ezingu-<xliff:g id="HOUR">%1$s</xliff:g> kusuka ekushajeni okugcwele.\n\n Ukusebenzisa okuphelele:"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Idivayisi yakho isetshenziswe kakhulu futhi lokhu kusebenzise ibhethri eliningi. Ibhethri lakho lisebenza kahle.\n\n Idivayisi yakho isetshenziswe cishe izikhathi ezingu-<xliff:g id="HOUR">%1$s</xliff:g> kusuka ekushajeni okugcwele.\n\n Ukusebenzisa okuphelele:"</string>
+ <string name="smart_battery_manager_title" msgid="5677222263071864438">"Isiphathi sebhethri esihlakaniphile"</string>
+ <string name="smart_battery_title" msgid="7014692334636228916">"Phatha ngokuzenzakalela ibhethri"</string>
+ <string name="smart_battery_summary" msgid="6435844879637999044">"Lungisa ngokuzenzakalelayo ukusetshenziswa kwamandla ngezinhlelo zokusebenza ngokususelwe ekusebenzeni"</string>
+ <string name="restricted_app_title" msgid="8982477293044330653">"Izinhlelo zokusebenza ezikhawulelwe"</string>
+ <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+ <item quantity="one">%1$d izinhlelo zokusebenza</item>
+ <item quantity="other">%1$d izinhlelo zokusebenza</item>
+ </plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"Misa uhlelo lokusebenza?"</string>
<string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Ifoni yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP">%1$s</xliff:g> igcina ifoni yakho ivukile.\n\nUkuze uzame ukulungisa le nkinga, ungamisa uhlelo lokusebenza.\n\nUma lokhu kuqhubeka ukwenzeka, kungenzeka kumele ukhiphe uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
<string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Ithebulethi yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP">%1$s</xliff:g> igcina ithebulethi yakho ivukile.\n\nUkuze uzame ukulungisa le nkinga, ungamisa uhlelo lokusebenza.\n\nUma lokhu kuqhubeka ukwenzeka, kungenzeka kumele ukhiphe uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
@@ -2147,6 +2185,7 @@
<string name="process_mediaserver_label" msgid="6500382062945689285">"Iseva yemidiya"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Ukuthuthukisa kohlelo lokusebenza"</string>
<string name="battery_saver" msgid="8172485772238572153">"Isilondolozi sebhethri"</string>
+ <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Sebenzisa isilondolozi sebhethri"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Vula ngokuzenzakalela"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Akusoze"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"kokungu-<xliff:g id="PERCENT">%1$s</xliff:g> kubhethri"</string>
@@ -2367,6 +2406,7 @@
<string name="really_remove_account_title" msgid="8800653398717172460">"Khipha i-akhawunti"</string>
<string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Ingabe ngempela ufuna ukukhipha le-akhawunti? Ukukukhipha kuzosusa yonke imiyalezo yayo, othintana nabo, neminye imininingo esuka kwi-tablet! BREAK"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Ingabe ngempela ufuna ukukhipha le-akhawunti? Ukukukhipha kuzosusa yonke imiyalezo yayo, othintana nabo, neminye imininingo esuka kwifoni! BREAK"</string>
+ <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Ingabe ngempela ufuna ukukhipha le-akhawunti? Ukukukhipha kuzosusa yonke imiyalezo yayo, othintana nabo, neminye imininingo esuka kudivayisi!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"Lolu shintsho aluvunyelwe umlawuli wakho"</string>
<string name="provider_label" msgid="7724593781904508866">"Dudula imali ekhishelwayo"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2891,8 +2931,8 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Vimbela ukuphazamiseka okubonakalayo"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vumela amasignali okubuka"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Engeza"</string>
- <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"VULA MANJE"</string>
- <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"VALA MANJE"</string>
+ <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Vula manje"</string>
+ <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Vala manje"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Okuthi ungaphazamisi kuvuliwe kuze kube ngu-<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Okuthi Ungaphazamisi kuzohlala kuvuliwe uze ukuvale"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Okuthi Ungaphazamisi kuvulwe ngokuzenzakalelayo ngomthetho (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2931,7 +2971,7 @@
<string name="app_notifications_title" msgid="5810577805218003760">"Izaziso zohlelo lokusebenza"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"Isigaba sezaziso"</string>
<string name="notification_group_title" msgid="7180506440133859601">"Iqembu lesigaba sesaziso"</string>
- <string name="notification_importance_title" msgid="848692592679312666">"Ukubaluleka"</string>
+ <string name="notification_importance_title" msgid="4368578960344731828">"Ukuziphatha"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Vumela umsindo"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"Ungalokothi ubonise izaziso"</string>
<string name="notification_importance_min" msgid="5455049524984686275">"Awukho umsindo noma ukuphazamiseka okubukwayo"</string>
@@ -2949,6 +2989,7 @@
<string name="notification_channel_summary_low" msgid="322317684244981244">"Ukubaluleka okumaphakathi"</string>
<string name="notification_channel_summary_default" msgid="1111749130423589931">"Ukubaluleka okuphezulu"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Ukubaluleka okusheshayo"</string>
+ <string name="notification_switch_label" msgid="6843075654538931025">"Bonisa izaziso"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Umsizi wesaziso"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Ukufinyelela isaziso"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ukufinyelela kuzaziso zephrofayela yomsebenzi zivinjelwe"</string>
@@ -2979,9 +3020,9 @@
<string name="manage_zen_access_title" msgid="2611116122628520522">"Ukufinyelela kokungaphazamisi"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Azikho izinhlelo zokusebenza ezifakiwe ezicele ukufinyelela kokungaphazamisi"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
- <string name="app_notifications_off_desc" msgid="4882445501376722969">"I-Android ivimbela izaziso zalolu hlelo lokusebenza kusukela ekuveleni kule divayisi"</string>
- <string name="channel_notifications_off_desc" msgid="5899225298718840635">"I-Android ivimbela lesi sigaba sezaziso kusukela ekuveleni kule divayisi"</string>
- <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"I-Android ivimbela leli qembu lezaziso kusukela ekuveleni kule divayisi"</string>
+ <string name="app_notifications_off_desc" msgid="8289223211387083447">"Ngokwesicelo sakho, i-Android ivimbela izaziso zalolu hlelo lokusebenza kusukela ekuveleni kule divayisi"</string>
+ <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Ngokwesicelo sakho i-Android ivimbela lesi sigaba sezaziso kusukela ekuveleni kule divayisi"</string>
+ <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Ngokwesicelo sakho i-Android ivimbela leli qembu lezaziso kusukela ekuveleni kule divayisi"</string>
<string name="notification_channels" msgid="5346841743182627500">"Izigaba"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"Okunye"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3560,31 +3601,8 @@
<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="quick_settings_developer_tiles" msgid="5947788063262762448">"Othayela bonjiniyela bezilungiselelo ezisheshayo"</string>
- <string name="support_escalation_title" msgid="4111071371281023145">"Silapha ukuze sisize"</string>
- <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Sikhona lapha kuwe ngokungu-24/7"</string>
- <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Sikhona lapha kuwe ngokungu-24 7"</string>
- <string name="support_escalation_summary" msgid="8473084168776014405">"Ithimba lethu losekelo lilapha ukuze kusizwe kubhekelwe noma iyiphi inkinga"</string>
- <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Ithimba lethu losekelo liyatholakala usuku lonke nsuku zonke"</string>
- <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Sesha usizo noma ubuye ngesikhathi samahora osekelo (isikhathi sasendaweni):<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Amahora osekelo lwefoni (isikhathi sasendaweni)<br><b><xliff:g id="OPERATION_HOURS">%s</xliff:g></b>"</string>
- <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Sesha usizo noma hlola amathiphu namacebo"</string>
- <string name="support_country_list_title" msgid="823853371280534111">"Usekelo lwe-:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
- <string name="support_international_phone_title" msgid="1308334014138718455">"Uhambela amazwe aphesheya?"</string>
- <string name="support_international_phone_summary" msgid="208231793637026927">"Izindleko zangamazwe zingasebenza"</string>
- <string name="support_escalation_by_phone" msgid="4843223043487058711">"Ifoni"</string>
- <string name="support_escalation_by_chat" msgid="977019859110763749">"Ingxoxo"</string>
- <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Hlola amathiph namacebo"</string>
- <string name="support_help_feedback_title" msgid="693440287222186718">"Sesha usizo futhi uthumele impendulo"</string>
- <string name="support_sign_in_required_title" msgid="1367187789121480440">"Xhumana nosekelo"</string>
- <string name="support_sign_in_button_text" msgid="3054769428620671241">"Ngena ngemvume"</string>
- <string name="support_sign_in_required_help" msgid="5200654782405538114">"Awukwazi ukungena ngemvume?"</string>
- <string name="support_disclaimer_title" msgid="4825302018208770031">"Thumela ulwazi lwesistimu"</string>
- <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ungabonisi futhi"</string>
- <string name="support_account_request_prefix" msgid="6387847874661861650">"Icela njengo"</string>
- <string name="support_account_picker_add_account" msgid="5076277544846506214">"Engeza i-akhawunti"</string>
- <string name="support_system_information_title" msgid="3439905790018934773">"Ulwazi lwesistimu"</string>
+ <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Ukulandela kwewindi"</string>
+ <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Ukulandela isendlalelo"</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>
@@ -3600,11 +3618,11 @@
<item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> amasekhondi</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> amasekhondi</item>
</plurals>
- <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> linda"</string>
<string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Phatha isitoreji"</string>
<string name="automatic_storage_manager_text" msgid="4562950476680600604">"Ukuze kusizwe kukhululwe isikhala sesitoreji, isiphathi sesitoreji sisusa izithombe ezenziwe isipele namavidiyo kusukela kudivayisi yakho."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Susa izithombe namavidiyo"</string>
<string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Isiphathi sesitoreji"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Sebenzisa isiphathi sesitoreji"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Okuzenzakalelayo"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"Okwenziwa ngesandla"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"Khulula isikhala manje"</string>
@@ -3770,8 +3788,8 @@
<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>
- <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
- <skip />
- <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
- <skip />
+ <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="storage_access" msgid="8905018810338984531">"Ukufinyelela kwesotoreji"</string>
+ <string name="keywords_storage_access" msgid="3708874088152933579">"ukufinyelela kwesitoreji kuhleleke ngqo"</string>
</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index dbcfee1..cb6f9be 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -266,14 +266,16 @@
<item>PWD</item>
</string-array>
- <!-- Wi-Fi AP band settings. Either 2.4GHz or 5GHz. -->
+ <!-- Wi-Fi AP band settings. Either Auto, 2.4GHz or 5GHz. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array name="wifi_ap_band_config_full">
+ <item>@string/wifi_ap_choose_auto</item>
<item>@string/wifi_ap_choose_2G</item>
<item>@string/wifi_ap_choose_5G</item>
</string-array>
<string-array name="wifi_ap_band_config_2G_only">
+ <item>@string/wifi_ap_choose_auto</item>
<item>@string/wifi_ap_choose_2G</item>
</string-array>
@@ -983,6 +985,8 @@
<item>0</item>
<item>5</item>
<item>15</item>
+ <item>50</item>
+ <item>100</item>
</integer-array>
<!-- Process stats memory use details: labels for memory states -->
@@ -1063,4 +1067,16 @@
<item>zen_mode_from_none</item>
</string-array>
+ <string-array name="wifi_metered_entries">
+ <item>Use network preference</item>
+ <item>Treat as metered</item>
+ <item>Treat as unmetered</item>
+ </string-array>
+
+ <string-array name="wifi_metered_values" translatable="false">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ </string-array>
+
</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e3fa070..2d48e42 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -123,6 +123,7 @@
<attr name="switchBarMarginStart" format="dimension" />
<attr name="switchBarMarginEnd" format="dimension" />
<attr name="switchBarBackgroundColor" format="color" />
+ <attr name="switchBarBackgroundActivatedColor" format="color" />
<attr name="preferenceBackgroundColor" format="color" />
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 687d5bd..ab8a6fd 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -54,12 +54,39 @@
surface in search results or not.-->
<bool name="config_show_wifi_settings">true</bool>
+ <!-- Whether toggle_airplane is available or not. -->
+ <bool name="config_show_toggle_airplane">true</bool>
+
<!-- Whether location mode is available or not. -->
<bool name="config_location_mode_available">true</bool>
+ <!-- Whether location scanning is available or not. -->
+ <bool name="config_show_location_scanning">true</bool>
+
<!-- Whether high_power_apps should be shown or not. -->
<bool name="config_show_high_power_apps">true</bool>
+ <!-- Whether media_volume should be shown or not. -->
+ <bool name="config_show_media_volume">true</bool>
+
+ <!-- Whether alarm_volume should be shown or not. -->
+ <bool name="config_show_alarm_volume">true</bool>
+
+ <!-- Whether notification_volume should be shown or not. -->
+ <bool name="config_show_notification_volume">true</bool>
+
+ <!-- Whether notification_ringtone should be shown or not. -->
+ <bool name="config_show_notification_ringtone">true</bool>
+
+ <!-- Whether screen_locking_sounds should be shown or not. -->
+ <bool name="config_show_screen_locking_sounds">true</bool>
+
+ <!-- Whether charging_sounds should be shown or not. -->
+ <bool name="config_show_charging_sounds">true</bool>
+
+ <!-- Whether touch_sounds should be shown or not. -->
+ <bool name="config_show_touch_sounds">true</bool>
+
<!-- Whether device_administrators should be shown or not. -->
<bool name="config_show_device_administrators">true</bool>
@@ -72,15 +99,63 @@
<!-- Whether enabled_vr_listeners should be shown or not. -->
<bool name="config_show_enabled_vr_listeners">true</bool>
+ <!-- Whether phone_language should be shown or not. -->
+ <bool name="config_show_phone_language">true</bool>
+
+ <!-- Whether virtual_keyboard_pref should be shown or not. -->
+ <bool name="config_show_virtual_keyboard_pref">true</bool>
+
+ <!-- Whether physical_keyboard_pref should be shown or not. -->
+ <bool name="config_show_physical_keyboard_pref">true</bool>
+
+ <!-- Whether spellcheckers_settings should be shown or not. -->
+ <bool name="config_show_spellcheckers_settings">true</bool>
+
+ <!-- Whether tts_settings_summary should be shown or not. -->
+ <bool name="config_show_tts_settings_summary">true</bool>
+
+ <!-- Whether pointer_speed should be shown or not. -->
+ <bool name="config_show_pointer_speed">true</bool>
+
+ <!-- Whether vibrate_input_devices should be shown or not. -->
+ <bool name="config_show_vibrate_input_devices">true</bool>
+
+ <!-- Whether manage_device_admin should be shown or not. -->
+ <bool name="config_show_manage_device_admin">true</bool>
+
+ <!-- Whether unlock_set_or_change should be shown or not. -->
+ <bool name="config_show_unlock_set_or_change">true</bool>
+
+ <!-- Whether screen_pinning_settings should be shown or not. -->
+ <bool name="config_show_screen_pinning_settings">true</bool>
+
+ <!-- Whether manage_trust_agents should be shown or not. -->
+ <bool name="config_show_manage_trust_agents">true</bool>
+
+ <!-- Whether show_password should be shown or not. -->
+ <bool name="config_show_show_password">true</bool>
+
+ <!-- Whether trust_agent_click_intent should be shown or not. -->
+ <bool name="config_show_trust_agent_click_intent">true</bool>
+
<!-- Whether wallpaper attribution should be shown or not. -->
<bool name="config_show_wallpaper_attribution">true</bool>
<!-- Whether default_home should be shown or not. -->
<bool name="config_show_default_home">true</bool>
+ <!-- Whether color correction preference should be shown or not. -->
+ <bool name="config_show_color_correction_preference">true</bool>
+
+ <!-- Whether color inversion preference should be shown or not. -->
+ <bool name="config_show_color_inversion_preference">true</bool>
+
<!-- Whether accessibility shortcut preference should be shown or not. -->
<bool name="config_show_accessibility_shortcut_preference">true</bool>
<!-- Whether assist_and_voice_input should be shown or not. -->
<bool name="config_show_assist_and_voice_input">true</bool>
+
+ <!-- Whether system_update_settings should be shown or not. -->
+ <bool name="config_show_system_update_settings">true</bool>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3e80ab4..e10b4cb 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -81,6 +81,8 @@
<color name="material_blue_700">#3367D6</color>
<color name="material_grey_100">#f5f5f5</color>
<color name="material_grey_200">#ffffff</color>
+ <color name="switch_bar_background">#ff80868B</color>
+
<color name="message_text_incoming">#ffffffff</color>
<color name="message_text_outgoing">#ff323232</color>
@@ -116,4 +118,22 @@
<!-- Suggestion/condition colors -->
<color name="suggestion_condition_background">#f2f2f2</color>
<color name="condition_card_background">#f8f8f8</color>
+
+ <!-- Dashboard/homepage icon background colors -->
+ <color name="homepage_network_background">#2196F3</color>
+ <color name="homepage_connected_device_background">#71A234</color>
+ <color name="homepage_app_and_notification_background">#FF7E0F</color>
+ <color name="homepage_battery_background">#258982</color>
+ <color name="homepage_display_background">#FFB600</color>
+ <color name="homepage_sound_background">#01B1AF</color>
+ <color name="homepage_storage_background">#C14CE6</color>
+ <color name="homepage_security_background">#0F9D58</color>
+ <color name="homepage_accounts_background">#F15B8D</color>
+ <color name="homepage_accessibility_background">#5011C1</color>
+ <color name="homepage_system_background">#757575</color>
+ <color name="homepage_support_background">#26459C</color>
+ <color name="homepage_generic_icon_background">#1A73E8</color>
+ <!-- End of dashboard/homepage icon background colors -->
+
</resources>
+
diff --git a/res/values/config.xml b/res/values/config.xml
index 097350b..ce61164 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -44,6 +44,10 @@
<!-- Whether to show Camera laser sensor switch in Developer Options -->
<bool name="config_show_camera_laser_sensor">false</bool>
+ <!-- Whether to show Connected MAC Randomization in Developer Options
+ as not all devices can support dynamic MAC address change. -->
+ <bool name="config_wifi_support_connected_mac_randomization">false</bool>
+
<!-- Fully-qualified class name for the implementation of the FeatureFactory to be instantiated. -->
<string name="config_featureFactory" translatable="false">com.android.settings.overlay.FeatureFactoryImpl</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 557318b..332deea 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -101,15 +101,17 @@
<dimen name="dashboard_tile_minimum_height">72dp</dimen>
<!-- Dashboard image tile size -->
- <dimen name="dashboard_tile_image_size">24dp</dimen>
+ <dimen name="dashboard_tile_image_size">36dp</dimen>
+
+ <!-- Dashboard foreground image size -->
+ <dimen name="dashboard_tile_foreground_image_size">24dp</dimen>
+
+ <!-- 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">24dp</dimen>
- <!-- SwitchBar margin start / end -->
- <dimen name="switchbar_margin_start">16dp</dimen>
- <dimen name="switchbar_margin_end">16dp</dimen>
-
<!-- SwitchBar sub settings margin start / end -->
<dimen name="switchbar_subsettings_margin_start">72dp</dimen>
<dimen name="switchbar_subsettings_margin_end">16dp</dimen>
@@ -300,4 +302,23 @@
<dimen name="suggestion_condition_header_padding_collapsed">10dp</dimen>
<dimen name="suggestion_condition_header_padding_expanded">5dp</dimen>
+ <!-- Suggestion cards size and padding -->
+ <dimen name="suggestion_card_icon_size">24dp</dimen>
+ <dimen name="suggestion_card_width_one_card">328dp</dimen>
+ <dimen name="suggestion_card_width_two_cards">158dp</dimen>
+ <dimen name="suggestion_card_width_multiple_cards">152dp</dimen>
+ <dimen name="suggestion_card_outer_margin">16dp</dimen>
+ <dimen name="suggestion_card_inner_margin">12dp</dimen>
+ <dimen name="suggestion_card_padding_bottom_one_card">16dp</dimen>
+ <dimen name="suggestion_card_corner_radius">2dp</dimen>
+ <dimen name="suggestion_card_title_padding_bottom_one_card">6dp</dimen>
+ <dimen name="suggestion_card_title_padding_bottom_multiple_cards">8dp</dimen>
+
+ <!-- Padding for the reset screens -->
+ <dimen name="reset_checkbox_padding_end">8dp</dimen>
+ <dimen name="reset_checkbox_title_padding_top">12dp</dimen>
+ <dimen name="reset_checkbox_summary_padding_top">4dp</dimen>
+ <dimen name="reset_checkbox_title_text_size">18sp</dimen>
+ <dimen name="reset_checkbox_summary_text_size">14sp</dimen>
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 74737ad..f917d81 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -752,6 +752,17 @@
<string name="zone_list_menu_sort_alphabetically">Sort alphabetically</string>
<!-- Menu item on Select time zone screen -->
<string name="zone_list_menu_sort_by_timezone">Sort by time zone</string>
+ <!-- Label describing when a given time zone changes to DST or standard time -->
+ <string name="zone_change_to_from_dst"><xliff:g id="time_type" example="Pacific Summer Time">%1$s</xliff:g> starts on <xliff:g id="transition_date" example="Mar 11 2018">%2$s</xliff:g>.</string>
+ <!-- Describes the time type "daylight savings time" (used in zone_change_to_from_dst, when no zone specific name is available) -->
+ <string name="zone_time_type_dst">Daylight savings time</string>
+ <!-- Describes the time type "standard time" (used in zone_change_to_from_dst, when no zone specific name is available) -->
+ <string name="zone_time_type_standard">Standard time</string>
+ <!-- The menu item to switch to selecting a time zone by region (default) -->
+ <string name="zone_menu_by_region">Time zone by region</string>
+ <!-- The menu item to switch to selecting a time zone with a fixed offset (such as UTC or GMT+0200) -->
+ <string name="zone_menu_by_offset">Fixed offset time zones</string>
+
<!-- Title string shown above DatePicker, letting a user select system date
[CHAR LIMIT=20] -->
<string name="date_picker_title">Date</string>
@@ -777,6 +788,10 @@
<string name="security_enable_widgets_title">Enable widgets</string>
<!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
<string name="security_enable_widgets_disabled_summary">Disabled by admin</string>
+ <!-- Text shown for the title of the lockdown option -->
+ <string name="lockdown_settings_title">Show lockdown option</string>
+ <!-- Text shown for the description of the lockdown option -->
+ <string name="lockdown_settings_summary">Display power button option that turns off extended access and fingerprint unlocking.</string>
<!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
<string name="owner_info_settings_summary">None</string>
<!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
@@ -793,6 +808,9 @@
<string name="Accounts_settings_title">Accounts</string>
<!-- Main Settings screen setting option title for the item to take you to the location screen -->
<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>
+
<!-- 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 -->
@@ -1102,14 +1120,18 @@
<!-- Security Picker --><skip />
- <!-- Title for suggested actions for screen lock -->
- <string name="suggested_lock_settings_title">Set screen lock</string>
+ <!-- Title for suggested actions for screen lock [CHAR LIMIT=34] -->
+ <string name="suggested_lock_settings_title">Set screen lock for security</string>
- <!-- Summary for suggested actions for screen lock -->
- <string name="suggested_lock_settings_summary">Protect your device</string>
+ <!-- Summary for suggested actions for screen lock (tablet) -->
+ <string name="suggested_lock_settings_summary" product="tablet">Prevent others from using your tablet</string>
+ <!-- Summary for suggested actions for screen lock (device) -->
+ <string name="suggested_lock_settings_summary" product="device">Prevent others from using your device</string>
+ <!-- Summary for suggested actions for screen lock (phone) -->
+ <string name="suggested_lock_settings_summary" product="default">Prevent others from using your phone</string>
- <!-- Title for suggested actions for settings up a fingerprint lock -->
- <string name="suggested_fingerprint_lock_settings_title">Use fingerprint</string>
+ <!-- Title for suggested actions for settings up a fingerprint lock [CHAR LIMIT=34] -->
+ <string name="suggested_fingerprint_lock_settings_title">Unlock with fingerprint</string>
<!-- Summary for suggested actions for settings up a fingerprint lock -->
<string name="suggested_fingerprint_lock_settings_summary">Unlock with your fingerprint</string>
@@ -1682,6 +1704,8 @@
<string name="wifi_band_24ghz">2.4 GHz</string>
<!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
<string name="wifi_band_5ghz">5 GHz</string>
+ <!-- Wifi Sign in text for button [CHAR LIMIT = 40]-->
+ <string name="wifi_sign_in_button_text">Sign in</string>
<!-- Link speed on Wifi Status screen -->
<string name="link_speed">%1$d Mbps</string>
@@ -1722,6 +1746,9 @@
<string name="wifi_quick_toggle_summary">Turn on Wi\u2011Fi</string>
<!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen [CHAR LIMIT=20]-->
<string name="wifi_settings">Wi\u2011Fi</string>
+
+ <!-- Used in the Wi-Fi settings screen to control turning on/off Wi-Fi entirely [CHAR LIMIT=30]-->
+ <string name="wifi_settings_master_switch_title">Use Wi\u2011Fi</string>
<!-- Title of the Wi-fi settings screen -->
<string name="wifi_settings_category">Wi\u2011Fi settings</string>
<!-- Title of the Wi-fi settings entry in the left top level menu -->
@@ -1922,6 +1949,8 @@
<string name="wifi_show_password">Show password</string>
<!-- Label for the RadioGroup to choose wifi ap band -->
<string name="wifi_ap_band_config">Select AP Band</string>
+ <!-- Label for the radio button to choose wifi ap channel automatically-->
+ <string name="wifi_ap_choose_auto">Auto</string>
<!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
<string name="wifi_ap_choose_2G">2.4 GHz Band</string>
<!-- Label for the radio button to choose wifi ap 5GHz band -->
@@ -2228,7 +2257,7 @@
<!-- Title of suggestion to turn on wifi calling [CHAR LIMIT=30] -->
<string name="wifi_calling_suggestion_title">Turn on Wi-Fi Calling</string>
<!-- Summary of suggestion to turn on wifi calling [CHAR LIMIT=60] -->
- <string name="wifi_calling_suggestion_summary">Use Wi-Fi instead of mobile network</string>
+ <string name="wifi_calling_suggestion_summary">Extend coverage by calling over Wi-Fi</string>
<!-- Title of WFC preference item [CHAR LIMIT=30] -->
<string name="wifi_calling_mode_title">Calling preference</string>
<!-- Title of WFC preference selection dialog [CHAR LIMIT=30] -->
@@ -2736,6 +2765,8 @@
<string name="status_latest_area_info">Operator info</string>
<!-- About phone, status item title. The status of data access. For example, the value may be "Connected" -->
<string name="status_data_state">Mobile network state</string>
+ <!-- About phone, status item title. The ID of embedded SIM card. -->
+ <string name="status_esim_id">EID</string>
<!-- About phone, status item title. The status of whether we have service. for example, the value may be "In service" -->
<string name="status_service_state">Service state</string>
<!-- About phone, status item title. The current cell tower signal strength -->
@@ -3194,6 +3225,10 @@
<string name="reset_network_title">Reset Wi-Fi, mobile & Bluetooth</string>
<!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
<string name="reset_network_desc">This will reset all network settings, including:\n\n<li>Wi\u2011Fi</li>\n<li>Mobile data</li>\n<li>Bluetooth</li>"</string>
+ <!-- SD card & phone storage settings screen, title for the checkbox to let user decide whether erase eSIM data together [CHAR LIMIT=NONE] -->
+ <string name="reset_esim_title">Also reset eSIMs</string>
+ <!-- SD card & phone storage settings screen, message for the checkbox to let user decide whether erase eSIM data together [CHAR LIMIT=NONE] -->
+ <string name="reset_esim_desc">Erase all eSIMs on the phone. You\u2019ll have to contact your carrier to redownload your eSIMs. This will not cancel your mobile service plan.</string>
<!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
<string name="reset_network_button_text">Reset settings</string>
<!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
@@ -3206,6 +3241,10 @@
<string name="network_reset_not_available">Network reset is not available for this user</string>
<!-- Reset settings complete toast text [CHAR LIMIT=75] -->
<string name="reset_network_complete_toast">Network settings have been reset</string>
+ <!-- Title of the error message shown when error happens during erase eSIM data [CHAR LIMIT=NONE] -->
+ <string name="reset_esim_error_title">Cant\u2019t reset eSIMs</string>
+ <!-- Message of the error message shown when error happens during erase eSIM data [CHAR LIMIT=NONE] -->
+ <string name="reset_esim_error_msg">The eSIMs can\u2019tt be reset due to an error.</string>
<!-- Master Clear -->
<!-- Button title to factory data reset the entire device -->
@@ -3221,7 +3260,7 @@
<!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
<string name="master_clear_desc_also_erases_external">"<li>Music</li>\n<li>Photos</li>\n<li>Other user data</li>"</string>
<!-- SD card & phone storage settings screen, list of items on an eSIM (embedded SIM) that will be erased during this operation [CHAR LIMIT=NONE] -->
- <string name="master_clear_desc_also_erases_esim">"<li>Carriers on eSIM</li>"</string>
+ <string name="master_clear_desc_also_erases_esim">"<li>eSIMs</li>"</string>
<!-- SD card & phone storage settings screen, notification if there are eSIM (embedded SIM) profiles present that the user's mobile service plan will not be canceled [CHAR LIMIT=NONE] -->
<string name="master_clear_desc_no_cancel_mobile_plan">"\n\nThis will not cancel your mobile service plan.</string>
<!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
@@ -3352,16 +3391,6 @@
<string name="location_title">My Location</string>
<!-- [CHAR LIMIT=30] Title for managed profile location switch -->
<string name="managed_profile_location_switch_title">Location for work profile</string>
- <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
- <string name="location_mode_title">Mode</string>
- <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
- <string name="location_mode_high_accuracy_title">High accuracy</string>
- <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
- <string name="location_mode_battery_saving_title">Battery saving</string>
- <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
- <string name="location_mode_sensors_only_title">Device only</string>
- <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
- <string name="location_mode_location_off_title">Location off</string>
<!-- [CHAR LIMIT=30] Location settings screen. It's a link that directs the user to a page that
shows the location permission setting for each installed app -->
<string name="location_app_level_permissions">App-level permissions</string>
@@ -3375,14 +3404,6 @@
<string name="location_high_battery_use">High battery use</string>
<!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
<string name="location_low_battery_use">Low battery use</string>
- <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
- <string name="location_mode_screen_title">Location mode</string>
- <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
- <string name="location_mode_high_accuracy_description">Use GPS, Wi\u2011Fi, Bluetooth, or mobile networks to determine location </string>
- <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
- <string name="location_mode_battery_saving_description">Use Wi\u2011Fi, Bluetooth, or mobile networks to determine location</string>
- <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
- <string name="location_mode_sensors_only_description">Use GPS and device sensors to determine location</string>
<!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
<string name="location_scanning_screen_title">Scanning</string>
<!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
@@ -3432,6 +3453,8 @@
<!-- Main settings screen, setting title for the user to go into the About phone screen -->
<string name="about_settings" product="default">About phone</string>
<!-- Main settings screen, setting title for the user to go into the About phone screen -->
+ <string name="about_settings" product="device">About device</string>
+ <!-- Main settings screen, setting title for the user to go into the About phone screen -->
<string name="about_settings" product="emulator">About emulated device</string>
<!-- Main settings screen, setting summary for the user to go into the About phone screen-->
<string name="about_settings_summary">View legal info, status, software version</string>
@@ -3706,6 +3729,15 @@
result from their use.
</string>
+ <!-- Warning that appears below the unknown sources switch in settings -->
+ <string name="install_all_warning" product="device">
+ Your device and personal data are more vulnerable
+ to attack by unknown apps. By installing apps from
+ this source, you agree that you are responsible for
+ any damage to your device or loss of data that may
+ result from their use.
+ </string>
+
<!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
<string name="advanced_settings">Advanced settings</string>
<!-- Applications settings screen, setting check box summary. This is the summary for "Advanced settings" checkbox -->
@@ -4394,6 +4426,12 @@
<string name="accessibility_autoclick_preference_title">Click after pointer stops moving</string>
<!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] -->
<string name="accessibility_autoclick_delay_preference_title">Delay before click</string>
+ <!-- Used in the acessibilty service settings to control turning on/off the service entirely -->
+ <string name="accessibility_service_master_switch_title">Use service</string>
+ <!-- Used in the Color correction settings screen to control turning on/off the feature entirely -->
+ <string name="accessibility_daltonizer_master_switch_title">Use color correction</string>
+ <!-- Used in the Captions settings screen to control turning on/off the feature entirely -->
+ <string name="accessibility_caption_master_switch_title">Use captions</string>
<!-- Preference's state when enabled. Note: UPPERCASE -->
<string name="accessibility_summary_state_enabled">ON</string>
@@ -4675,7 +4713,7 @@
<string name="power_charge_remaining"><xliff:g id="until_charged">%1$s</xliff:g> to charge</string>
<!-- Title for the background activity setting, which allows a user to control whether an app can run in the background [CHAR_LIMIT=40] -->
- <string name="background_activity_title">Background activity</string>
+ <string name="background_activity_title">Restricted</string>
<!-- Summary for the background activity [CHAR_LIMIT=120] -->
<string name="background_activity_summary">Allow the app to run in the background</string>
<!-- Summary for the background activity when it is on [CHAR_LIMIT=120] -->
@@ -4773,6 +4811,46 @@
<string name="battery_tip_low_battery_title">Low battery capacity</string>
<!-- Summary for the low battery tip [CHAR LIMIT=NONE] -->
<string name="battery_tip_low_battery_summary">Battery can\'t provide good battery life</string>
+ <!-- Title for the smart battery tip [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_smart_battery_title">Turn on smart battery manager</string>
+ <!-- Summary for the smart battery tip [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_smart_battery_summary">Turn on to optimize battery usage</string>
+ <!-- Title for the early heads up tip [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_early_heads_up_title">Turn on Low Battery Mode</string>
+ <!-- Summary for the early hedas up tip [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_early_heads_up_summary">Extend your battery life</string>
+ <!-- Title when early heads up is solved [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_early_heads_up_done_title">Low Battery Mode is on</string>
+ <!-- Summary when early heads up is solved [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_early_heads_up_done_summary">Some features are limited</string>
+ <!-- Title for the battery high usage tip [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_high_usage_title" product="default">Phone used heavily</string>
+ <!-- Title for the battery high usage tip [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_high_usage_title" product="tablet">Tablet used heavily</string>
+ <!-- Title for the battery high usage tip [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_high_usage_title" product="device">Device used heavily</string>
+ <!-- Summary for the battery high usage tip, which presents how many hours the device been used since last full charge [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_high_usage_summary">About <xliff:g id="hour">%1$s</xliff:g> used since last full charge</string>
+ <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_dialog_message" product="default">Your phone was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your phone was used for about <xliff:g id="hour">%1$s</xliff:g> since last full charge.\n\n Total usage:</string>
+ <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_dialog_message" product="tablet">Your tablet was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your tablet was used for about <xliff:g id="hour">%1$s</xliff:g> since last full charge.\n\n Total usage:</string>
+ <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
+ <string name="battery_tip_dialog_message" product="device">Your device was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your device was used for about <xliff:g id="hour">%1$s</xliff:g> since last full charge.\n\n Total usage:</string>
+
+ <!-- Title for the smart battery manager preference [CHAR LIMIT=NONE] -->
+ <string name="smart_battery_manager_title">Smart battery manager</string>
+ <!-- Title for the smart battery toggle [CHAR LIMIT=NONE] -->
+ <string name="smart_battery_title">Auto-manage battery</string>
+ <!-- Summary for the smart battery toggle [CHAR LIMIT=NONE] -->
+ <string name="smart_battery_summary">Automatically adjust power usage by apps based on usage</string>
+ <!-- Title for restricted app preference, clicking it will goes to restricted app list [CHAR LIMIT=NONE] -->
+ <string name="restricted_app_title">Restricted apps</string>
+ <!-- Summary for restricted app preference, clicking it will goes to restricted app list [CHAR LIMIT=NONE] -->
+ <plurals name="restricted_app_summary">
+ <item quantity="one">%1$d app</item>
+ <item quantity="other">%1$d apps</item>
+ </plurals>
<!-- Title for force stop dialog [CHAR LIMIT=30] -->
<string name="dialog_stop_title">Stop app?</string>
@@ -5021,6 +5099,9 @@
<!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
<string name="battery_saver">Battery Saver</string>
+ <!-- Used in the Battery Saver settings screen to control turning on/off the feature entirely -->
+ <string name="battery_saver_master_switch_title">Use Battery Saver</string>
+
<!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
<string name="battery_saver_turn_on_automatically_title">Turn on automatically</string>
@@ -5501,10 +5582,12 @@
<string name="add_account_label">Add account</string>
<!-- Label for the state of the work profile [CHAR LIMIT=80] -->
<string name="managed_profile_not_available_label">Work profile isn\u2019t available yet</string>
- <!-- Account Settings. The preference title for enabling work mode -->
- <string name="work_mode_label">Work mode</string>
- <!-- Account Settings. The preference summary for enabling work mode -->
- <string name="work_mode_summary">Allow work profile to function, including apps, background sync, and related features</string>
+ <!-- This string is the title of a setting. If a user taps the setting, they can turn their work profile on or off. The work profile is a section of their phone that's managed by their employer. "Work" is an adjective. -->
+ <string name="work_mode_label">Work profile</string>
+ <!-- This string is located under a setting and describes what the setting does. It's letting a user know whether their work profile is on or off, and they can use the setting to turn it on or off. The work profile is a section of their phone that's managed by their employer. "Work" is an adjective.-->
+ <string name="work_mode_on_summary">Managed by your organization</string>
+ <!-- This string is located under a setting and describes what the setting does. It's letting a user know whether their work profile is on or off, and they can use the setting to turn it on or off. The work profile is a section of their phone that's managed by their employer. "Work" is an adjective.-->
+ <string name="work_mode_off_summary">Apps and notifications are off</string>
<!-- Button label to remove the work profile [CHAR LIMIT=35] -->
<string name="remove_managed_profile_label">Remove work profile</string>
<!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
@@ -5572,6 +5655,8 @@
<string name="really_remove_account_message" product="tablet">Removing this account will delete all of its messages, contacts, and other data from the tablet!</string>
<!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
<string name="really_remove_account_message" product="default">Removing this account will delete all of its messages, contacts, and other data from the phone!</string>
+ <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+ <string name="really_remove_account_message" product="device">Removing this account will delete all of its messages, contacts, and other data from the device!</string>
<!-- This is shown if the autheticator for a given account fails to remove it. [CHAR LIMIT=NONE] -->
<string name="remove_account_failed">This change isn\'t allowed by your admin</string>
<!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
@@ -6056,7 +6141,7 @@
<skip/>
<!-- User settings screen title [CHAR LIMIT=25] -->
- <string name="user_settings_title">Users</string>
+ <string name="user_settings_title">Multiple users</string>
<!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
<string name="user_list_title">Users & profiles</string>
<!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -6348,6 +6433,7 @@
<string name="help_uri_process_stats_summary" translatable="false"></string>
<string name="help_uri_process_stats_apps" translatable="false"></string>
<string name="help_uri_private_dns" translatable="false"></string>
+ <string name="help_uri_about_phone_v2" translatable="false"></string>
<!-- User account title [CHAR LIMIT=30] -->
<string name="user_account_title">Account for content</string>
@@ -6559,8 +6645,8 @@
<string name="app_and_notification_dashboard_title">Apps & notifications</string>
<!-- Summary for Apps & Notification settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
<string name="app_and_notification_dashboard_summary">Permissions, default apps</string>
- <!-- Title for setting tile leading to User and accounts settings [CHAR LIMIT=40]-->
- <string name="account_dashboard_title">Users & accounts</string>
+ <!-- Title for setting tile leading to account settings [CHAR LIMIT=40]-->
+ <string name="account_dashboard_title">Accounts</string>
<!-- Title for setting tile leading to setting UI which allows user set default app to
handle actions such as open web page, making phone calls, default SMS apps [CHAR LIMIT=40]-->
<string name="app_default_dashboard_title">Default apps</string>
@@ -6605,7 +6691,6 @@
<string name="keywords_sounds_and_notifications_interruptions">dont don\u2019t disturb, interrupt, interruption, break</string>
<string name="keywords_app">RAM</string>
<string name="keywords_location">nearby, location, history, reporting</string>
- <string name="keywords_location_mode">accuracy</string>
<string name="keywords_accounts">account</string>
<string name="keywords_users">restriction, restrict, restricted</string>
<string name="keywords_keyboard_and_ime">text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international</string>
@@ -6756,6 +6841,9 @@
<!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=50]-->
<string name="zen_mode_settings_title">Do Not Disturb</string>
+ <!-- Do not disturb: Title for the Do not Disturb dialog to turn on Do not disturb. [CHAR LIMIT=50]-->
+ <string name="zen_mode_settings_turn_on_dialog_title">Turn on Do Not Disturb</string>
+
<!-- Do not disturb: Title for the behaviors option and associated settings page. [CHAR LIMIT=30] -->
<string name="zen_mode_behavior_settings_title">Behavior</string>
@@ -6783,11 +6871,14 @@
<!-- 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 for the zen mode automation option Suggestion. [CHAR LIMIT=50] -->
- <string name="zen_mode_automation_suggestion_title">Set Do Not Disturb rules</string>
+ <!-- Do not disturb: Title for the zen mode automation option Suggestion. [CHAR LIMIT=34] -->
+ <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=NONE] -->
- <string name="zen_mode_automation_suggestion_summary">Limit sounds & vibrations at certain times</string>
+ <string name="zen_mode_automation_suggestion_summary">Set Do Not Disturb rules</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>
<!-- Do not disturb: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
<string name="zen_mode_option_important_interruptions">Priority only</string>
@@ -6810,11 +6901,14 @@
<!-- Do not disturb: Button to add new automatic rule to DND. [CHAR LIMIT=30] -->
<string name="zen_mode_add">Add</string>
+ <!-- Do not disturb: Label for button in enable zen dialog that will turn on zen mode. [CHAR LIMIT=30] -->
+ <string name="zen_mode_enable_dialog_turn_on">Turn on</string>
+
<!-- Do not disturb: Label for button that will turn on zen mode. [CHAR LIMIT=30] -->
- <string name="zen_mode_button_turn_on">TURN ON NOW</string>
+ <string name="zen_mode_button_turn_on">Turn on now</string>
<!-- Do not disturb: Label for button that will turn off zen mode. [CHAR LIMIT=30] -->
- <string name="zen_mode_button_turn_off">TURN OFF NOW</string>
+ <string name="zen_mode_button_turn_off">Turn off now</string>
<!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing end time of DND -->
<string name="zen_mode_settings_dnd_manual_end_time">Do Not Disturb is on until <xliff:g id="formatted_time" example="7:00 AM">%s</xliff:g></string>
@@ -6828,6 +6922,12 @@
<!-- [CHAR LIMIT=110] Zen mode settings footer: Footer how DND was triggered by an app -->
<string name="zen_mode_settings_dnd_automatic_rule_app">Do Not Disturb was automatically turned on by an app (<xliff:g id="app_name" example="Android Services">%s</xliff:g>)</string>
+ <!--[CHAR LIMIT=40] Zen Interruption level: Priority. -->
+ <string name="zen_interruption_level_priority">Priority only</string>
+
+ <!-- [CHAR LIMIT=20] Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. -->
+ <string name="zen_mode_and_condition"><xliff:g id="zen_mode" example="Priority interruptions only">%1$s</xliff:g>. <xliff:g id="exit_condition" example="For one hour">%2$s</xliff:g></string>
+
<!-- Work Sounds: Work sound settings section header. [CHAR LIMIT=50] -->
<string name="sound_work_settings">Work profile sounds</string>
@@ -6873,6 +6973,9 @@
<!-- Configure Notifications Settings title. [CHAR LIMIT=30] -->
<string name="configure_notification_settings">Notifications</string>
+ <!-- notification header - apps that have recently sent notifications -->
+ <string name="recent_notifications">Recently sent</string>
+
<!-- Configure Notifications: Advanced section header [CHAR LIMIT=30] -->
<string name="advanced_section_header">Advanced</string>
@@ -7510,6 +7613,11 @@
<!-- Button label to say no to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->
<string name="encryption_interstitial_no">No</string>
+ <!-- Label to say yes to the question of whether app is restricted. [CHAR LIMIT=20] -->
+ <string name="restricted_true_label">Yes</string>
+ <!-- Label to say no to the question of whether app is restricted. [CHAR LIMIT=20] -->
+ <string name="restricted_false_label">No</string>
+
<!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
<string name="encrypt_talkback_dialog_require_pin">Require PIN?</string>
@@ -8210,17 +8318,14 @@
<!-- Summary of memory screen [CHAR LIMIT=NONE] -->
<string name="memory_summary">Avg <xliff:g id="used_memory" example="1.7GB">%1$s</xliff:g> of <xliff:g id="total_memory" example="2GB">%2$s</xliff:g> memory used</string>
- <!-- Summary of Users & accounts setting screen [CHAR LIMIT=NONE] -->
- <string name="users_and_accounts_summary">Current user: <xliff:g id="user_name" example="Jason">%1$s</xliff:g></string>
-
<!-- Summary of User settings [CHAR LIMIT=NONE] -->
<string name="users_summary">Signed in as <xliff:g id="user_name" example="Jason">%1$s</xliff:g></string>
<!-- 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 screen [CHAR LIMIT=NONE] -->
- <string name="location_on_summary">ON / <xliff:g id="location_mode" example="High accuracy">%1$s</xliff:g></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>
@@ -8243,6 +8348,8 @@
<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>
<!-- Shown when the user tries to change a settings locked by an admin [CHAR LIMIT=200] -->
<string name="default_admin_support_msg">This action is disabled. To learn more, contact your
organization\'s admin.</string>
@@ -8316,7 +8423,7 @@
<string name="night_display_suggestion_title">Set Night Light schedule</string>
<!-- Night display: Summary for the night display option Suggestion (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
- <string name="night_display_suggestion_summary">Tint screen amber to help you fall asleep</string>
+ <string name="night_display_suggestion_summary">Automatically tint screen every night</string>
<!-- Title of condition that night display is on (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
<string name="condition_night_display_title">Night Light is on</string>
@@ -8328,6 +8435,9 @@
<string name="condition_summary" translatable="false"><xliff:g name="count" example="3">%1$d</xliff:g></string>
<!-- Title for the suggestions section on the dashboard [CHAR LIMIT=30] -->
+ <string name="suggestions_title_v2">Suggested for You</string>
+
+ <!-- Title for the suggestions section on the dashboard [CHAR LIMIT=30] -->
<string name="suggestions_title">Suggestions</string>
<!-- Summary for the suggestions section on the dashboard, representing number of suggestions. [CHAR LIMIT=10] -->
@@ -8593,6 +8703,12 @@
<!-- Notification log debug tool: the word 'none' -->
<string name="notification_log_details_ranking_none">Ranking object doesn\'t contain this key.</string>
+ <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which turns on emulation of a display cutout. -->
+ <string name="display_cutout_emulation">Simulate a display with a cutout</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=60] Label for special access screen -->
<string name="special_access">Special app access</string>
@@ -8655,6 +8771,15 @@
<!-- [CHAR LIMIT=60] Name of dev option to enable extra quick settings tiles -->
<string name="quick_settings_developer_tiles">Quick settings developer tiles</string>
+ <!-- [CHAR LIMIT=25] Title of developer tile to toggle window trace -->
+ <string name="window_trace_quick_settings_title">Window Trace</string>
+
+ <!-- [CHAR LIMIT=25] Title of developer tile to toggle layer trace -->
+ <string name="layer_trace_quick_settings_title">Surface 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 -->
@@ -8692,6 +8817,9 @@
<!-- Preference title for the automatic storage manager toggle. [CHAR LIMIT=60]-->
<string name="automatic_storage_manager_preference_title">Storage manager</string>
+ <!-- Used in the storage manager settings screen to control turning on/off the feature entirely -->
+ <string name="automatic_storage_manager_master_switch_title">Use Storage manager</string>
+
<!-- Category title for the automatic settings in the storage manager settings. [CHAR LIMIT=40] -->
<string name="deletion_helper_automatic_title">Automatic</string>
@@ -8720,9 +8848,6 @@
<!-- Title for settings suggestion for double tap power for camera [CHAR LIMIT=60] -->
<string name="double_tap_power_for_camera_suggestion_title">Open camera quickly</string>
- <!-- Summary for settings suggestion for double tap power for camera [CHAR LIMIT=60] -->
- <string name="double_tap_power_for_camera_suggestion_summary">Press power button twice to open camera</string>
-
<!-- Title text for double twist for camera mode [CHAR LIMIT=60]-->
<string name="double_twist_for_camera_mode_title">Flip camera</string>
@@ -8732,13 +8857,6 @@
<!-- Title for settings suggestion for double twist for camera [CHAR LIMIT=60] -->
<string name="double_twist_for_camera_suggestion_title">Take selfies faster</string>
- <!-- Summary for settings suggestion for double twist for camera (phone) [CHAR LIMIT=60] -->
- <string name="double_twist_for_camera_suggestion_summary" product="default">Double-twist phone for selfie mode</string>
- <!-- Summary for settings suggestion for double twist for camera (tablet) [CHAR LIMIT=60] -->
- <string name="double_twist_for_camera_suggestion_summary" product="tablet">Double-twist tablet for selfie mode</string>
- <!-- Summary for settings suggestion for double twist for camera (device) [CHAR LIMIT=60] -->
- <string name="double_twist_for_camera_suggestion_summary" product="device">Double-twist device for selfie mode</string>
-
<!-- Preference and settings suggestion title text for ambient display double tap (phone) [CHAR LIMIT=60]-->
<string name="ambient_display_title" product="default">Double-tap to check phone</string>
<!-- Preference and settings suggestion title text for ambient display double tap (tablet) [CHAR LIMIT=60]-->
@@ -8749,9 +8867,6 @@
<!-- 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>
- <!-- Summary for settings suggestion for double tap power for camera [CHAR LIMIT=60] -->
- <string name="ambient_display_suggestion_summary">Check notifications when screen is off</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>
<!-- Preference and settings suggestion title text for ambient display pick up (tablet) [CHAR LIMIT=60]-->
@@ -8766,9 +8881,6 @@
<!-- 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>
- <!-- Summary for settings suggestion for ambient display pick up [CHAR LIMIT=60] -->
- <string name="ambient_display_pickup_suggestion_summary">Check notifications when screen is off</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>
<!-- Title text for fingerprint gesture preference screen [CHAR LIMIT=25] -->
@@ -8784,9 +8896,6 @@
<!-- Title for settings suggestion for fingerprint swipe for notifications [CHAR LIMIT=60] -->
<string name="fingerprint_swipe_for_notifications_suggestion_title">See notifications quickly</string>
- <!-- Summary for settings suggestion for fingerprint swipe for notifications [CHAR LIMIT=60] -->
- <string name="fingerprint_swipe_for_notifications_suggestion_summary">Swipe down on the fingerprint sensor</string>
-
<!-- Title text for the assist gesture [CHAR LIMIT=60] DO NOT TRANSLATE -->
<string name="assist_gesture_title" translatable="false"></string>
@@ -9092,4 +9201,45 @@
<!-- UI debug setting: preference summary - describes the behavior of forcing full raw GNSS satellite measurements [CHAR LIMIT=NONE] -->
<string name="enable_gnss_raw_meas_full_tracking_summary">Track all GNSS constellations and frequencies with no duty cycling</string>
+ <!-- UI debug setting: preference title - show all crash dialogs [CHAR LIMIT=60] -->
+ <string name="show_first_crash_dialog">Always show crash dialog</string>
+ <!-- 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>
+
+ <!-- Title for Directory Access settings -->
+ <string name="directory_access">Directory access</string>
+ <!-- Keywords for Directory Access settings -->
+ <string name="keywords_directory_access">directory access</string>
+
+ <!-- String used to describe the name of a directory in a volume; it must
+ show both names, with the directory name wrapped in parenthesis -->
+ <string name="directory_on_volume"><xliff:g id="volume" example="SD Card">%1$s</xliff:g> (<xliff:g id="directory" example="Movies">%2$s</xliff:g>)</string>
+
+ <!-- Account type associated with the backup account. Empty for AOSP. [DO NOT TRANSLATE] -->
+ <string name="account_type" translatable="false"></string>
+ <!-- Package to target for Account credential confirmation. This will allow users to
+ remind/rediscover their backup account password prior to a reset. Empty for AOSP.
+ [DO NOT TRANSLATE] -->
+ <string name="account_confirmation_package" translatable="false"></string>
+ <!-- Class to target for Account credential confirmation. This will allow users to
+ remind/rediscover their backup account password prior to a reset. Empty for AOSP.
+ [DO NOT TRANSLATE] -->
+ <string name="account_confirmation_class" translatable="false"></string>
+
+ <!-- Title for the new About Phone screen [CHAR LIMIT=40] -->
+ <string name="my_device_info_title" product="default">My Phone</string>
+ <!-- Title for the new About Phone screen [CHAR LIMIT=40] -->
+ <string name="my_device_info_title" product="tablet">My Tablet</string>
+ <!-- Title for the new About Phone screen [CHAR LIMIT=40] -->
+ <string name="my_device_info_title" product="device">My Device</string>
+ <!-- Title for preference showing the primary account on the device [CHAR LIMIT=60]-->
+ <string name="my_device_info_account_preference_title">Account</string>
+ <!-- Title for preference showing the name of the device. [CHAR LIMIT=60]-->
+ <string name="my_device_info_device_name_preference_title">Device name</string>
+
+ <!-- Settings item title for automatic Bluetooth on while driving preference [CHAR LIMIT=35] -->
+ <string name="bluetooth_on_while_driving_pref">Use Bluetooth when driving</string>
+ <!-- Settings item summary for automatic Bluetooth on while driving preference [CHAR LIMIT=100] -->
+ <string name="bluetooth_on_while_driving_summary">Turn on Bluetooth automatically when driving</string>
+
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 579ee48..b672247 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -316,11 +316,32 @@
<style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle" />
<style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle" />
+ <style name="TextAppearance.SuggestionHeader"
+ parent="@android:style/TextAppearance.Material.Subhead">
+ <item name="android:fontFamily">@config/config_headlineFontFamilyMedium</item>
+ <item name="android:textSize">14sp</item>
+ <item name="android:textColor">?android:attr/colorAccent</item>
+ </style>
+
+ <style name="SuggestionCardText">
+ <item name="android:textAlignment">viewStart</item>
+ </style>
+
+ <style name="SuggestionCardIcon">
+ <item name="android:layout_centerHorizontal">false</item>
+ <item name="android:layout_alignParentStart">true</item>
+ </style>
+
<style name="TextAppearance.SuggestionTitle"
parent="@android:style/TextAppearance.Material.Subhead">
<item name="android:fontFamily">sans-serif-medium</item>
</style>
+ <style name="TextAppearance.SuggestionTitleV2"
+ parent="@android:style/TextAppearance.Material.Subhead">
+ <item name="android:fontFamily">@config/config_headlineFontFamily</item>
+ </style>
+
<style name="TextAppearance.SuggestionSummary" parent="TextAppearance.Small">
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
@@ -453,6 +474,7 @@
<style name="TextAppearance.SearchBar" parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">
<item name="android:textSize">@dimen/search_bar_text_size</item>
+ <item name="android:fontFamily">@config/config_headlineFontFamily</item>
</style>
<style name="device_info_dialog_label">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e3010a6..d4ccdde 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -155,13 +155,7 @@
<item name="android:colorAccent">@color/material_blue_700</item>
<item name="android:titleTextColor">@color/material_blue_700</item>
<item name="preferenceTheme">@style/PreferenceTheme</item>
- <item name="switchBarTheme">@style/SetupWizardAccessibilitySwitchBarTheme</item>
- </style>
-
- <style name="SetupWizardAccessibilitySwitchBarTheme" parent="ThemeOverlay.SwitchBar.Settings">
- <item name="switchBarBackgroundColor">@color/material_grey_200</item>
- <item name="android:colorControlActivated">@color/material_blue_500</item>
- <item name="android:textColorPrimary">@android:color/black</item>
+ <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
</style>
<!-- Theme with no local references, used by AccountPreferenceBase where we have to inflate
@@ -205,7 +199,7 @@
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
- <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.SubSettings</item>
+ <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
</style>
<!-- Variant of the settings theme with no action bar. -->
@@ -233,15 +227,16 @@
</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">?android:attr/colorSecondary</item>
+ <item name="switchBarBackgroundColor">@color/switch_bar_background</item>
+ <item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
</style>
- <style name="ThemeOverlay.SwitchBar.SubSettings" parent="@android:style/ThemeOverlay.Material.ActionBar">
- <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
- <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
- <item name="switchBarBackgroundColor">?android:attr/colorSecondary</item>
+ <style name="Widget.SwitchBar.Switch" parent="@android:style/Widget.Material.CompoundButton.Switch">
+ <item name="android:trackTint">@color/switchbar_switch_track_tint</item>
+ <item name="android:thumbTint">@color/switchbar_switch_thumb_tint</item>
</style>
<style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.NoActionBar">
@@ -272,14 +267,6 @@
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>
</style>
- <style name="Theme.NotificationStation" parent="@style/Theme.Settings">
- <!-- Redefine the ActionBar style for contentInsetStart -->
- <item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
- <item name="*android:actionBarSize">@dimen/actionbar_size</item>
-
- <item name="preferenceBackgroundColor">@android:color/transparent</item>
- </style>
-
<style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
<item name="confirmDeviceCredentialsSideMargin">@dimen/confirm_credentials_side_margin</item>
<item name="confirmDeviceCredentialsTopMargin">@dimen/confirm_credentials_top_margin</item>
diff --git a/res/xml/accounts_dashboard_settings.xml b/res/xml/accounts_dashboard_settings.xml
new file mode 100644
index 0000000..1e29d0a
--- /dev/null
+++ b/res/xml/accounts_dashboard_settings.xml
@@ -0,0 +1,28 @@
+<?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:settings="http://schemas.android.com/apk/res-auto"
+ android:key="user_and_account_settings_screen"
+ android:title="@string/account_dashboard_title"
+ settings:keywords="@string/keywords_accounts">
+
+ <PreferenceCategory
+ android:key="dashboard_tile_placeholder"
+ android:order="200"/>
+
+</PreferenceScreen>
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index f08afa8..3548efb 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -20,7 +20,7 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="apps_and_notification_screen"
android:title="@string/app_and_notification_dashboard_title"
- settings:initialExpandedChildrenCount="4">
+ settings:initialExpandedChildrenCount="6">
<PreferenceCategory
android:key="recent_apps_category"
@@ -37,7 +37,6 @@
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.Settings$ManageApplicationsActivity">
- <extra android:name="show_drawer_menu" android:value="true" />
</intent>
</Preference>
</PreferenceCategory>
diff --git a/res/xml/app_data_usage.xml b/res/xml/app_data_usage.xml
index 3e94135..a4b2159 100644
--- a/res/xml/app_data_usage.xml
+++ b/res/xml/app_data_usage.xml
@@ -16,6 +16,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="app_data_usage_screen"
android:title="@string/data_usage_app_summary_title">
<com.android.settings.datausage.SpinnerPreference
@@ -50,15 +52,19 @@
android:key="app_settings"
android:title="@string/data_usage_app_settings" />
- <SwitchPreference
+ <com.android.settingslib.RestrictedSwitchPreference
android:key="restrict_background"
android:title="@string/data_usage_app_restrict_background"
- android:summary="@string/data_usage_app_restrict_background_summary" />
+ android:summary="@string/data_usage_app_restrict_background_summary"
+ settings:useAdditionalSummary="true"
+ settings:restrictedSwitchSummary="@string/disabled_by_admin" />
- <SwitchPreference
+ <com.android.settingslib.RestrictedSwitchPreference
android:key="unrestricted_data_saver"
android:title="@string/unrestricted_app_title"
- android:summary="@string/unrestricted_app_summary" />
+ android:summary="@string/unrestricted_app_summary"
+ settings:useAdditionalSummary="true"
+ settings:restrictedSwitchSummary="@string/disabled_by_admin" />
</PreferenceCategory>
diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml
index c799c8b..6d20571 100644
--- a/res/xml/channel_notification_settings.xml
+++ b/res/xml/channel_notification_settings.xml
@@ -53,7 +53,7 @@
settings:useAdditionalSummary="true" />
<!-- Visibility Override -->
- <com.android.settings.notification.RestrictedDropDownPreference
+ <com.android.settings.RestrictedListPreference
android:key="visibility_override"
android:title="@string/app_notification_visibility_override_title"/>
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 21904e6..e080be4 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -15,19 +15,27 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/configure_notification_settings"
android:key="configure_notification_settings">
- <PreferenceCategory
- android:key="dashboard_tile_placeholder"
- android:order="1"/>
-
<!-- When device is locked -->
- <com.android.settings.notification.RestrictedDropDownPreference
+ <com.android.settings.RestrictedListPreference
android:key="lock_screen_notifications"
android:title="@string/lock_screen_notifications_title"
android:summary="@string/summary_placeholder"/>
+ <PreferenceCategory
+ android:key="lock_screen_notifications_profile_header"
+ android:title="@string/profile_section_header">
+
+ <com.android.settings.RestrictedListPreference
+ android:key="lock_screen_notifications_profile"
+ android:title="@string/lock_screen_notifications_title"
+ android:summary="@string/summary_placeholder"/>
+
+ </PreferenceCategory>
+
<!-- Notification badging -->
<SwitchPreference
android:key="notification_badging"
@@ -51,14 +59,30 @@
android:title="@string/fingerprint_swipe_for_notifications_title"
android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" />
+ <!-- Empty category to draw divider -->
<PreferenceCategory
- android:key="lock_screen_notifications_profile_header"
- android:title="@string/profile_section_header">
+ android:key="all_notifications_divider"
+ android:order="20"/>
- <com.android.settings.notification.RestrictedDropDownPreference
- android:key="lock_screen_notifications_profile"
- android:title="@string/lock_screen_notifications_title"
- android:summary="@string/summary_placeholder"/>
+ <PreferenceCategory
+ android:key="recent_notifications_category"
+ android:title="@string/recent_notifications"
+ settings:allowDividerAbove="false"
+ android:order="21">
+ <!-- Placeholder for a list of recent apps -->
+ <!-- See all apps button -->
+ <Preference
+ android:title="@string/notifications_title"
+ android:key="all_notifications"
+ android:order="22">
+ <intent
+ android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.Settings$NotificationAppListActivity">
+ </intent>
+ </Preference>
</PreferenceCategory>
+
+
</PreferenceScreen>
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index dfe23df..8ca6b81 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="connected_devices_screen"
android:title="@string/connected_device_connections_title">
@@ -24,6 +25,7 @@
android:title="@string/bluetooth_settings_title"
android:icon="@drawable/ic_settings_bluetooth"
android:summary="@string/bluetooth_pref_summary"
+ settings:controller="com.android.settings.bluetooth.BluetoothSwitchPreferenceController"
android:order="-7"/>
<SwitchPreference
@@ -47,11 +49,18 @@
android:summary="@string/summary_placeholder"
android:order="-3"/>
+ <SwitchPreference
+ android:key="bluetooth_on_while_driving"
+ android:title="@string/bluetooth_on_while_driving_pref"
+ android:icon="@drawable/ic_settings_bluetooth"
+ android:summary="@string/bluetooth_on_while_driving_summary"
+ android:order="-2"/>
+
<Preference
android:key="usb_mode"
android:title="@string/usb_pref"
android:icon="@drawable/ic_usb"
- android:order="-2">
+ android:order="-1">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.deviceinfo.UsbModeChooserActivity"/>
diff --git a/res/xml/data_usage_wifi.xml b/res/xml/data_usage_wifi.xml
index 607cee1..905b15a 100644
--- a/res/xml/data_usage_wifi.xml
+++ b/res/xml/data_usage_wifi.xml
@@ -27,11 +27,6 @@
android:key="wifi_data_usage"
android:title="@string/wifi_data_usage" />
- <com.android.settings.datausage.NetworkRestrictionsPreference
- android:key="network_restrictions"
- android:title="@string/network_restrictions"
- android:fragment="com.android.settings.datausage.DataUsageMeteredSettings" />
-
</com.android.settings.datausage.TemplatePreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index aad5d23..5a0d249 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -15,109 +15,116 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="development_prefs_screen"
- android:title="@string/development_settings_title">
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="development_prefs_screen"
+ android:title="@string/development_settings_title">
- <Preference
- android:key="memory"
- android:icon="@drawable/ic_settings_memory"
- android:title="@string/memory_settings_title"
- android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.applications.ProcessStatsSummary" />
+ <PreferenceCategory
+ android:key="debug_misc_category"
+ android:order="100">
- <com.android.settings.BugreportPreference
+ <Preference
+ android:key="memory"
+ android:icon="@drawable/ic_settings_memory"
+ android:title="@string/memory_settings_title"
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.applications.ProcessStatsSummary" />
+
+ <com.android.settings.BugreportPreference
android:key="bugreport"
android:title="@*android:string/bugreport_title"
android:dialogTitle="@*android:string/bugreport_title" />
- <Preference
+ <Preference
android:key="local_backup_password"
android:title="@string/local_backup_password_title"
android:summary="@string/local_backup_password_summary_none"
- android:persistent="false" >
- <intent
+ android:persistent="false">
+ <intent
android:action="android.settings.privacy.SET_FULL_BACKUP_PASSWORD"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.SetFullBackupPassword" />
- </Preference>
+ </Preference>
- <com.android.settingslib.RestrictedSwitchPreference
- android:key="keep_screen_on"
- android:title="@string/keep_screen_on"
- android:summary="@string/keep_screen_on_summary"
- settings:useAdditionalSummary="true" />
+ <com.android.settingslib.RestrictedSwitchPreference
+ android:key="keep_screen_on"
+ android:title="@string/keep_screen_on"
+ android:summary="@string/keep_screen_on_summary"
+ settings:useAdditionalSummary="true" />
- <ListPreference
- android:key="hdcp_checking"
- android:title="@string/hdcp_checking_title"
- android:dialogTitle="@string/hdcp_checking_dialog_title"
- android:entries="@array/hdcp_checking_titles"
- android:entryValues="@array/hdcp_checking_values" />
+ <ListPreference
+ android:key="hdcp_checking"
+ android:title="@string/hdcp_checking_title"
+ android:dialogTitle="@string/hdcp_checking_dialog_title"
+ android:entries="@array/hdcp_checking_titles"
+ android:entryValues="@array/hdcp_checking_values" />
- <SwitchPreference
- android:key="bt_hci_snoop_log"
- android:title="@string/bt_hci_snoop_log"
- android:summary="@string/bt_hci_snoop_log_summary"/>
+ <SwitchPreference
+ android:key="bt_hci_snoop_log"
+ android:title="@string/bt_hci_snoop_log"
+ android:summary="@string/bt_hci_snoop_log_summary" />
- <com.android.settingslib.RestrictedSwitchPreference
- android:key="oem_unlock_enable"
- android:title="@string/oem_unlock_enable"
- android:summary="@string/oem_unlock_enable_summary"
- settings:useAdditionalSummary="true"/>
+ <com.android.settingslib.RestrictedSwitchPreference
+ android:key="oem_unlock_enable"
+ android:title="@string/oem_unlock_enable"
+ android:summary="@string/oem_unlock_enable_summary"
+ settings:useAdditionalSummary="true" />
- <Preference
- android:key="running_apps"
- android:title="@string/runningservices_settings_title"
- android:summary="@string/runningservices_settings_summary"
- android:fragment="com.android.settings.applications.RunningServices" />
+ <Preference
+ android:key="running_apps"
+ android:title="@string/runningservices_settings_title"
+ android:summary="@string/runningservices_settings_summary"
+ android:fragment="com.android.settings.applications.RunningServices" />
- <Preference
- android:key="convert_to_file_encryption"
- android:title="@string/convert_to_file_encryption"
- android:summary="@string/convert_to_file_encryption_enabled"
- android:fragment="com.android.settings.applications.ConvertToFbe" />
+ <Preference
+ android:key="convert_to_file_encryption"
+ android:title="@string/convert_to_file_encryption"
+ android:summary="@string/convert_to_file_encryption_enabled"
+ android:fragment="com.android.settings.applications.ConvertToFbe" />
- <com.android.settings.development.ColorModePreference
- android:key="picture_color_mode"
- android:title="@string/picture_color_mode"
- android:summary="@string/picture_color_mode_desc" />
+ <com.android.settings.development.ColorModePreference
+ android:key="picture_color_mode"
+ android:title="@string/picture_color_mode"
+ android:summary="@string/picture_color_mode_desc" />
- <Preference android:key="select_webview_provider"
- android:title="@string/select_webview_provider_title"
- android:dialogTitle="@string/select_webview_provider_dialog_title"
- android:fragment="com.android.settings.webview.WebViewAppPicker" />
+ <Preference android:key="select_webview_provider"
+ android:title="@string/select_webview_provider_title"
+ android:dialogTitle="@string/select_webview_provider_dialog_title"
+ android:fragment="com.android.settings.webview.WebViewAppPicker" />
- <SwitchPreference
- android:key="color_temperature"
- android:title="@string/color_temperature"
- android:summary="@string/color_temperature_desc" />
+ <SwitchPreference
+ android:key="color_temperature"
+ android:title="@string/color_temperature"
+ android:summary="@string/color_temperature_desc" />
- <SwitchPreference
- android:key="ota_disable_automatic_update"
- android:title="@string/ota_disable_automatic_update" />
+ <SwitchPreference
+ android:key="ota_disable_automatic_update"
+ android:title="@string/ota_disable_automatic_update" />
- <Preference
- android:key="demo_mode"
- android:title="@string/demo_mode">
- <intent android:action="com.android.settings.action.DEMO_MODE" />
- </Preference>
+ <Preference
+ android:key="demo_mode"
+ android:title="@string/demo_mode">
+ <intent android:action="com.android.settings.action.DEMO_MODE" />
+ </Preference>
- <Preference
- android:key="quick_settings_tiles"
- android:title="@string/quick_settings_developer_tiles"
- android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />
+ <Preference
+ android:key="quick_settings_tiles"
+ android:title="@string/quick_settings_developer_tiles"
+ android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />
+ </PreferenceCategory>
- <PreferenceCategory android:key="debug_debugging_category"
- android:title="@string/debug_debugging_category">
+ <PreferenceCategory
+ android:key="debug_debugging_category"
+ android:title="@string/debug_debugging_category"
+ android:order="200">
<SwitchPreference
android:key="enable_adb"
android:title="@string/enable_adb"
- android:summary="@string/enable_adb_summary"/>
+ android:summary="@string/enable_adb_summary" />
<Preference android:key="clear_adb_keys"
- android:title="@string/clear_adb_keys" />
+ android:title="@string/clear_adb_keys" />
<SwitchPreference
android:key="enable_terminal"
@@ -127,32 +134,32 @@
<SwitchPreference
android:key="bugreport_in_power"
android:title="@string/bugreport_in_power"
- android:summary="@string/bugreport_in_power_summary"/>
+ android:summary="@string/bugreport_in_power_summary" />
<Preference android:key="mock_location_app"
- android:title="@string/mock_location_app" />
+ android:title="@string/mock_location_app" />
<SwitchPreference
android:key="enable_gnss_raw_meas_full_tracking"
android:title="@string/enable_gnss_raw_meas_full_tracking"
- android:summary="@string/enable_gnss_raw_meas_full_tracking_summary"/>
+ android:summary="@string/enable_gnss_raw_meas_full_tracking_summary" />
<SwitchPreference
- android:key="debug_view_attributes"
- android:title="@string/debug_view_attributes" />
+ android:key="debug_view_attributes"
+ android:title="@string/debug_view_attributes" />
<Preference android:key="debug_app"
- android:title="@string/debug_app" />
+ android:title="@string/debug_app" />
<SwitchPreference
android:key="wait_for_debugger"
android:title="@string/wait_for_debugger"
- android:summary="@string/wait_for_debugger_summary"/>
+ android:summary="@string/wait_for_debugger_summary" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="verify_apps_over_usb"
android:title="@string/verify_apps_over_usb_title"
- android:summary="@string/verify_apps_over_usb_summary"/>
+ android:summary="@string/verify_apps_over_usb_summary" />
<ListPreference
android:key="select_logd_size"
@@ -171,7 +178,7 @@
<SwitchPreference
android:key="connectivity_monitor_switch"
android:title="@string/connectivity_monitor_switch"
- android:summary="@string/connectivity_monitor_switch_summary"/>
+ android:summary="@string/connectivity_monitor_switch_summary" />
<SwitchPreference
android:key="camera_laser_sensor_switch"
@@ -180,47 +187,48 @@
<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" />
<SwitchPreference
android:key="enable_gpu_debug_layers"
android:title="@string/enable_gpu_debug_layers"
- android:summary="@string/enable_gpu_debug_layers_summary"/>
+ android:summary="@string/enable_gpu_debug_layers_summary" />
</PreferenceCategory>
- <PreferenceCategory android:key="debug_networking_category"
- android:title="@string/debug_networking_category">
+ <PreferenceCategory
+ android:key="dashboard_tile_placeholder"
+ android:order="300" />
+
+ <PreferenceCategory
+ android:key="debug_networking_category"
+ android:title="@string/debug_networking_category"
+ android:order="400">
<SwitchPreference
android:key="wifi_display_certification"
android:title="@string/wifi_display_certification"
- android:summary="@string/wifi_display_certification_summary"/>
+ android:summary="@string/wifi_display_certification_summary" />
<SwitchPreference
android:key="wifi_verbose_logging"
android:title="@string/wifi_verbose_logging"
- android:summary="@string/wifi_verbose_logging_summary"/>
+ android:summary="@string/wifi_verbose_logging_summary" />
<SwitchPreference
- android:key="wifi_aggressive_handover"
- android:title="@string/wifi_aggressive_handover"
- android:summary="@string/wifi_aggressive_handover_summary"/>
-
- <SwitchPreference
- android:key="wifi_allow_scan_with_traffic"
- android:title="@string/wifi_allow_scan_with_traffic"
- android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
+ android:key="wifi_connected_mac_randomization"
+ android:title="@string/wifi_connected_mac_randomization"
+ android:summary="@string/wifi_connected_mac_randomization_summary" />
<SwitchPreference
android:key="mobile_data_always_on"
android:title="@string/mobile_data_always_on"
- android:summary="@string/mobile_data_always_on_summary"/>
+ android:summary="@string/mobile_data_always_on_summary" />
<SwitchPreference
android:key="tethering_hardware_offload"
android:title="@string/tethering_hardware_offload"
- android:summary="@string/tethering_hardware_offload_summary"/>
+ android:summary="@string/tethering_hardware_offload_summary" />
<ListPreference
android:key="select_usb_configuration"
@@ -232,17 +240,17 @@
<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"/>
+ android:summary="@string/bluetooth_show_devices_without_names_summary" />
<SwitchPreference
android:key="bluetooth_disable_absolute_volume"
android:title="@string/bluetooth_disable_absolute_volume"
- android:summary="@string/bluetooth_disable_absolute_volume_summary"/>
+ android:summary="@string/bluetooth_disable_absolute_volume_summary" />
<SwitchPreference
android:key="bluetooth_disable_inband_ringing"
android:title="@string/bluetooth_disable_inband_ringing"
- android:summary="@string/bluetooth_disable_inband_ringing_summary"/>
+ android:summary="@string/bluetooth_disable_inband_ringing_summary" />
<ListPreference
android:key="bluetooth_select_avrcp_version"
@@ -287,46 +295,50 @@
android:entryValues="@array/bluetooth_a2dp_codec_ldac_playback_quality_values" />
<ListPreference
- android:key="bluetooth_max_connected_audio_devices"
- android:title="@string/bluetooth_max_connected_audio_devices_string"
- android:dialogTitle="@string/bluetooth_max_connected_audio_devices_dialog_title"
- android:entries="@array/bluetooth_max_connected_audio_devices"
- android:entryValues="@array/bluetooth_max_connected_audio_devices_values" />
+ android:key="bluetooth_max_connected_audio_devices"
+ android:title="@string/bluetooth_max_connected_audio_devices_string"
+ android:dialogTitle="@string/bluetooth_max_connected_audio_devices_dialog_title"
+ android:entries="@array/bluetooth_max_connected_audio_devices"
+ android:entryValues="@array/bluetooth_max_connected_audio_devices_values" />
</PreferenceCategory>
- <PreferenceCategory android:key="debug_input_category"
- android:title="@string/debug_input_category">
+ <PreferenceCategory
+ android:key="debug_input_category"
+ android:title="@string/debug_input_category"
+ android:order="500">
<SwitchPreference
android:key="show_touches"
android:title="@string/show_touches"
- android:summary="@string/show_touches_summary"/>
+ android:summary="@string/show_touches_summary" />
<SwitchPreference
android:key="pointer_location"
android:title="@string/pointer_location"
- android:summary="@string/pointer_location_summary"/>
+ android:summary="@string/pointer_location_summary" />
</PreferenceCategory>
- <PreferenceCategory android:key="debug_drawing_category"
- android:title="@string/debug_drawing_category">
+ <PreferenceCategory
+ android:key="debug_drawing_category"
+ android:title="@string/debug_drawing_category"
+ android:order="600">
<SwitchPreference
android:key="show_screen_updates"
android:title="@string/show_screen_updates"
- android:summary="@string/show_screen_updates_summary"/>
+ android:summary="@string/show_screen_updates_summary" />
<SwitchPreference
android:key="debug_layout"
android:title="@string/debug_layout"
- android:summary="@string/debug_layout_summary"/>
+ android:summary="@string/debug_layout_summary" />
<SwitchPreference
android:key="force_rtl_layout_all_locales"
android:title="@string/force_rtl_layout_all_locales"
- android:summary="@string/force_rtl_layout_all_locales_summary"/>
+ android:summary="@string/force_rtl_layout_all_locales_summary" />
<ListPreference
android:key="window_animation_scale"
@@ -356,80 +368,84 @@
android:key="density"
android:title="@string/developer_smallest_width" />
- </PreferenceCategory>
-
- <PreferenceCategory android:key="debug_hw_drawing_category"
- android:title="@string/debug_hw_drawing_category">
-
- <SwitchPreference
- android:key="force_hw_ui"
- android:title="@string/force_hw_ui"
- android:summary="@string/force_hw_ui_summary"/>
-
- <SwitchPreference
- android:key="show_hw_screen_updates"
- android:title="@string/show_hw_screen_updates"
- android:summary="@string/show_hw_screen_updates_summary"/>
-
- <SwitchPreference
- android:key="show_hw_layers_updates"
- android:title="@string/show_hw_layers_updates"
- android:summary="@string/show_hw_layers_updates_summary"/>
-
<ListPreference
- android:key="debug_hw_overdraw"
- android:title="@string/debug_hw_overdraw"
- android:entries="@array/debug_hw_overdraw_entries"
- android:entryValues="@array/debug_hw_overdraw_values" />
-
- <ListPreference
- android:key="show_non_rect_clip"
- android:title="@string/show_non_rect_clip"
- android:entries="@array/show_non_rect_clip_entries"
- android:entryValues="@array/show_non_rect_clip_values" />
-
- <SwitchPreference
- android:key="force_msaa"
- android:title="@string/force_msaa"
- android:summary="@string/force_msaa_summary"/>
-
- <SwitchPreference
- android:key="disable_overlays"
- android:title="@string/disable_overlays"
- android:summary="@string/disable_overlays_summary"/>
-
- <ListPreference
- android:entries="@array/simulate_color_space_entries"
- android:entryValues="@array/simulate_color_space_values"
- android:key="simulate_color_space"
- android:summary="%s"
- android:title="@string/simulate_color_space" />
-
- <ListPreference
- android:key="debug_hw_renderer"
- android:title="@string/debug_hw_renderer"
- android:entries="@array/debug_hw_renderer_entries"
- android:entryValues="@array/debug_hw_renderer_values" />
+ android:key="display_cutout_emulation"
+ android:title="@string/display_cutout_emulation" />
</PreferenceCategory>
- <PreferenceCategory android:key="media_category"
- android:title="@string/media_category">
+ <PreferenceCategory
+ android:key="debug_hw_drawing_category"
+ android:title="@string/debug_hw_drawing_category"
+ android:order="700">
<SwitchPreference
- android:key="usb_audio"
- android:title="@string/usb_audio_disable_routing"
- android:summary="@string/usb_audio_disable_routing_summary" />
+ android:key="force_hw_ui"
+ android:title="@string/force_hw_ui"
+ android:summary="@string/force_hw_ui_summary" />
+
+ <SwitchPreference
+ android:key="show_hw_screen_updates"
+ android:title="@string/show_hw_screen_updates"
+ android:summary="@string/show_hw_screen_updates_summary" />
+
+ <SwitchPreference
+ android:key="show_hw_layers_updates"
+ android:title="@string/show_hw_layers_updates"
+ android:summary="@string/show_hw_layers_updates_summary" />
+
+ <ListPreference
+ android:key="debug_hw_overdraw"
+ android:title="@string/debug_hw_overdraw"
+ android:entries="@array/debug_hw_overdraw_entries"
+ android:entryValues="@array/debug_hw_overdraw_values" />
+
+ <ListPreference
+ android:key="show_non_rect_clip"
+ android:title="@string/show_non_rect_clip"
+ android:entries="@array/show_non_rect_clip_entries"
+ android:entryValues="@array/show_non_rect_clip_values" />
+
+ <SwitchPreference
+ android:key="force_msaa"
+ android:title="@string/force_msaa"
+ android:summary="@string/force_msaa_summary" />
+
+ <SwitchPreference
+ android:key="disable_overlays"
+ android:title="@string/disable_overlays"
+ android:summary="@string/disable_overlays_summary" />
+
+ <ListPreference
+ android:entries="@array/simulate_color_space_entries"
+ android:entryValues="@array/simulate_color_space_values"
+ android:key="simulate_color_space"
+ android:summary="%s"
+ android:title="@string/simulate_color_space" />
</PreferenceCategory>
- <PreferenceCategory android:key="debug_monitoring_category"
- android:title="@string/debug_monitoring_category">
+ <PreferenceCategory
+ android:key="media_category"
+ android:title="@string/media_category"
+ android:order="800">
+
+ <SwitchPreference
+ android:key="usb_audio"
+ android:title="@string/usb_audio_disable_routing"
+ android:summary="@string/usb_audio_disable_routing_summary" />
+
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:key="debug_monitoring_category"
+ android:title="@string/debug_monitoring_category"
+ android:order="900">
<SwitchPreference
android:key="strict_mode"
android:title="@string/strict_mode"
- android:summary="@string/strict_mode_summary"/>
+ android:summary="@string/strict_mode_summary" />
<ListPreference
android:key="track_frame_time"
@@ -439,13 +455,15 @@
</PreferenceCategory>
- <PreferenceCategory android:key="debug_applications_category"
- android:title="@string/debug_applications_category">
+ <PreferenceCategory
+ android:key="debug_applications_category"
+ android:title="@string/debug_applications_category"
+ android:order="1000">
<SwitchPreference
android:key="immediately_destroy_activities"
android:title="@string/immediately_destroy_activities"
- android:summary="@string/immediately_destroy_activities_summary"/>
+ android:summary="@string/immediately_destroy_activities_summary" />
<ListPreference
android:key="app_process_limit"
@@ -455,48 +473,48 @@
<Preference
- android:key="background_check"
- android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary"
- android:title="@string/background_check_pref" />
+ android:key="background_check"
+ android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary"
+ android:title="@string/background_check_pref" />
+ <SwitchPreference
+ android:key="show_first_crash_dialog"
+ android:title="@string/show_first_crash_dialog"
+ android:summary="@string/show_first_crash_dialog_summary" />
<SwitchPreference
android:key="show_all_anrs"
android:title="@string/show_all_anrs"
- android:summary="@string/show_all_anrs_summary"/>
+ android:summary="@string/show_all_anrs_summary" />
<SwitchPreference
android:key="show_notification_channel_warnings"
android:title="@string/show_notification_channel_warnings"
- android:summary="@string/show_notification_channel_warnings_summary"/>
+ android:summary="@string/show_notification_channel_warnings_summary" />
<Preference
- android:key="inactive_apps"
- android:title="@string/inactive_apps_title"
- android:fragment="com.android.settings.fuelgauge.InactiveApps"/>
+ android:key="inactive_apps"
+ android:title="@string/inactive_apps_title"
+ android:fragment="com.android.settings.fuelgauge.InactiveApps" />
<SwitchPreference
android:key="force_allow_on_external"
android:title="@string/force_allow_on_external"
- android:summary="@string/force_allow_on_external_summary"/>
+ android:summary="@string/force_allow_on_external_summary" />
<SwitchPreference
android:key="force_resizable_activities"
android:title="@string/force_resizable_activities"
- android:summary="@string/force_resizable_activities_summary"/>
+ android:summary="@string/force_resizable_activities_summary" />
<SwitchPreference
- android:key="enable_freeform_support"
- android:title="@string/enable_freeform_support"
- android:summary="@string/enable_freeform_support_summary"/>
+ android:key="enable_freeform_support"
+ android:title="@string/enable_freeform_support"
+ android:summary="@string/enable_freeform_support_summary" />
<Preference
android:key="reset_shortcut_manager_throttling"
android:title="@string/reset_shortcut_manager_throttling" />
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="dashboard_tile_placeholder"
- android:order="200"/>
+ </PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/device_info_settings_v2.xml b/res/xml/device_info_settings.xml
similarity index 100%
rename from res/xml/device_info_settings_v2.xml
rename to res/xml/device_info_settings.xml
diff --git a/res/xml/directory_access_details.xml b/res/xml/directory_access_details.xml
new file mode 100644
index 0000000..4448ba6
--- /dev/null
+++ b/res/xml/directory_access_details.xml
@@ -0,0 +1,20 @@
+<?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="directory_access_details"
+ android:title="@string/directory_access"/>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 2d9fd54..4d0c992 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -22,12 +22,14 @@
settings:keywords="@string/keywords_display"
settings:initialExpandedChildrenCount="4">
- <Preference
+ <com.android.settingslib.RestrictedPreference
android:key="brightness"
android:title="@string/brightness"
- settings:keywords="@string/keywords_display_brightness_level">
- <intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
- </Preference>
+ settings:keywords="@string/keywords_display_brightness_level"
+ settings:useAdminDisabledSummary="true"
+ settings:userRestriction="no_config_brightness">
+ <intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
+ </com.android.settingslib.RestrictedPreference>
<com.android.settings.display.NightDisplayPreference
android:key="night_display"
@@ -38,12 +40,13 @@
settings:keywords="@string/keywords_display_night_display" />
<!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
- <SwitchPreference
+ <com.android.settingslib.RestrictedSwitchPreference
android:key="auto_brightness"
android:title="@string/auto_brightness_title"
settings:keywords="@string/keywords_display_auto_brightness"
android:summary="@string/auto_brightness_summary"
- settings:controller="com.android.settings.display.AutoBrightnessPreferenceController" />
+ settings:useAdminDisabledSummary="true"
+ settings:userRestriction="no_config_brightness" />
<com.android.settingslib.RestrictedPreference
android:key="wallpaper"
@@ -96,10 +99,11 @@
android:fragment="com.android.settings.dream.DreamSettings" />
<!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
- <Preference
+ <com.android.settingslib.RestrictedPreference
android:key="ambient_display"
android:title="@string/ambient_display_screen_title"
- android:fragment="com.android.settings.display.AmbientDisplaySettings" />
+ android:fragment="com.android.settings.display.AmbientDisplaySettings"
+ settings:userRestriction="no_ambient_display" />
<!-- Hide night mode for now
<ListPreference
diff --git a/res/xml/location_mode.xml b/res/xml/location_mode.xml
deleted file mode 100644
index ac8e584..0000000
--- a/res/xml/location_mode.xml
+++ /dev/null
@@ -1,35 +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.
--->
-
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="location_mode_settings"
- android:title="@string/location_mode_screen_title">
-
- <com.android.settings.widget.RadioButtonPreference
- android:key="high_accuracy"
- android:title="@string/location_mode_high_accuracy_title"
- android:summary="@string/location_mode_high_accuracy_description" />
- <com.android.settings.widget.RadioButtonPreference
- android:key="battery_saving"
- android:title="@string/location_mode_battery_saving_title"
- android:summary="@string/location_mode_battery_saving_description" />
- <com.android.settings.widget.RadioButtonPreference
- android:key="sensors_only"
- android:title="@string/location_mode_sensors_only_title"
- android:summary="@string/location_mode_sensors_only_description" />
-
-</PreferenceScreen>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index f8ac192..267fce9 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -39,7 +39,7 @@
android:title="@string/location_scanning_screen_title"
android:fragment="com.android.settings.location.ScanningSettings"/>
- <!-- This preference category gets removed if there is no managed profile -->
+ <!-- This preference gets removed if there is no managed profile -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="managed_profile_location_switch"
android:title="@string/managed_profile_location_switch_title"
@@ -50,10 +50,4 @@
<PreferenceCategory
android:key="location_services"
android:title="@string/location_category_location_services" />
-
- <Preference
- android:key="location_mode"
- android:title="@string/location_mode_title"
- settings:keywords="@string/keywords_location_mode"
- android:summary="@string/summary_placeholder" />
</PreferenceScreen>
diff --git a/res/xml/managed_profile_settings.xml b/res/xml/managed_profile_settings.xml
index 58fcd88..c283e13 100644
--- a/res/xml/managed_profile_settings.xml
+++ b/res/xml/managed_profile_settings.xml
@@ -20,14 +20,13 @@
<SwitchPreference
android:key="work_mode"
- android:summary="@string/work_mode_summary"
- android:title="@string/work_mode_label"/>
+ android:title="@string/work_mode_label"
+ android:summary="@string/summary_placeholder"/>
<com.android.settingslib.RestrictedSwitchPreference
android:key="contacts_search"
android:summary="@string/managed_profile_contact_search_summary"
android:title="@string/managed_profile_contact_search_title"
- settings:useAdditionalSummary="true"
- />
+ settings:useAdditionalSummary="true"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
new file mode 100644
index 0000000..dabed8a
--- /dev/null
+++ b/res/xml/my_device_info.xml
@@ -0,0 +1,171 @@
+<?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="my_device_info_pref_screen"
+ android:title="@string/my_device_info_title"
+ settings:initialExpandedChildrenCount="7">
+
+ <com.android.settings.applications.LayoutPreference
+ android:key="my_device_info_header"
+ android:order="0"
+ android:layout="@layout/settings_entity_header"
+ android:selectable="false"/>
+
+ <!-- Account name -->
+ <Preference
+ android:key="branded_account"
+ android:order="1"
+ android:title="@string/my_device_info_account_preference_title"
+ android:summary="@string/summary_placeholder"/>
+
+ <!-- Phone number -->
+ <Preference
+ android:key="phone_number"
+ android:order="2"
+ android:title="@string/status_number"
+ android:summary="@string/summary_placeholder"/>
+
+ <!-- Device name -->
+ <com.android.settings.widget.ValidatedEditTextPreference
+ android:key="device_name"
+ android:order="3"
+ android:title="@string/my_device_info_device_name_preference_title"
+ android:summary="@string/summary_placeholder"/>
+
+ <Preference
+ android:key="emergency_info"
+ android:order="4"
+ android:title="@string/emergency_info_title"
+ android:summary="@string/summary_placeholder"/>
+
+ <!-- Legal information -->
+ <Preference
+ android:key="legal_container"
+ android:order="5"
+ android:title="@string/legal_information"
+ android:fragment="com.android.settings.LegalSettings" />
+
+ <!-- Regulatory labels -->
+ <Preference
+ android:key="regulatory_info"
+ android:order="6"
+ android:title="@string/regulatory_labels">
+ <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
+ </Preference>
+
+ <!-- SIM status -->
+ <Preference
+ android:key="sim_status"
+ android:order="7"
+ android:title="@string/sim_status_title"
+ settings:keywords="@string/keywords_sim_status"
+ android:summary="@string/summary_placeholder"/>
+
+ <!-- Model & hardware -->
+ <Preference
+ android:key="device_model"
+ android:order="21"
+ android:title="@string/hardware_info"
+ settings:keywords="@string/keywords_model_and_hardware"
+ android:summary="@string/summary_placeholder"/>
+
+ <!-- IMEI -->
+ <Preference
+ android:key="imei_info"
+ android:order="22"
+ android:title="@string/status_imei"
+ settings:keywords="@string/keywords_imei_info"
+ android:summary="@string/summary_placeholder"/>
+
+ <!-- Android version -->
+ <Preference
+ android:key="firmware_version"
+ android:order="32"
+ android:title="@string/firmware_version"
+ settings:keywords="@string/keywords_android_version"
+ android:summary="@string/summary_placeholder"/>
+
+ <!-- IMS registration -->
+ <Preference
+ android:key="ims_reg_state"
+ android:order="33"
+ android:title="@string/ims_reg_title"
+ android:summary="@string/summary_placeholder"/>
+
+ <!--IP address -->
+ <Preference
+ android:key="wifi_ip_address"
+ android:order="34"
+ android:title="@string/wifi_ip_address"
+ android:summary="@string/summary_placeholder"
+ settings:allowDividerAbove="true"/>
+
+ <!-- Wi-Fi MAC address -->
+ <Preference
+ android:key="wifi_mac_address"
+ android:order="35"
+ android:title="@string/status_wifi_mac_address"
+ android:summary="@string/summary_placeholder"/>
+
+ <!-- Bluetooth address -->
+ <Preference
+ android:key="bt_address"
+ android:order="36"
+ android:title="@string/status_bt_address"
+ android:summary="@string/summary_placeholder"/>
+
+ <!-- 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"
+ android:order="40"
+ android:title="@string/manual">
+ <intent android:action="android.settings.SHOW_MANUAL"/>
+ </Preference>
+
+ <!-- Feedback on the device -->
+ <Preference
+ android:key="device_feedback"
+ android:order="41"
+ android:title="@string/device_feedback"/>
+
+ <!-- Device FCC equipment id -->
+ <Preference
+ android:key="fcc_equipment_id"
+ android:order="42"
+ android:title="@string/fcc_equipment_id"
+ android:summary="@string/summary_placeholder"/>
+
+ <!-- Build number -->
+ <Preference
+ android:key="build_number"
+ android:order="43"
+ android:title="@string/build_number"
+ android:summary="@string/summary_placeholder"
+ settings:allowDividerAbove="true"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index bc027d3..134f5b3 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -75,12 +75,13 @@
settings:userRestriction="no_config_mobile_networks"
settings:useAdminDisabledSummary="true" />
- <SwitchPreference
+ <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" />
+ android:order="5"
+ settings:userRestriction="no_airplane_mode"/>
<Preference
android:fragment="com.android.settings.ProxySelector"
diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml
index acd6367..acc62b6 100644
--- a/res/xml/power_usage_detail.xml
+++ b/res/xml/power_usage_detail.xml
@@ -27,6 +27,22 @@
android:key="action_buttons"
android:order="-9999"/>
+ <PreferenceCategory
+ android:title="@string/battery_detail_manage_title">
+
+ <Preference
+ android:key="background_activity"
+ android:title="@string/background_activity_title"
+ android:selectable="true"/>
+
+ <Preference
+ android:key="battery_optimization"
+ android:title="@string/high_power_apps"
+ android:summary="@string/high_power_off"
+ android:selectable="true"/>
+
+ </PreferenceCategory>
+
<Preference
android:key="high_usage"
android:icon="@drawable/ic_battery_alert_24dp"
@@ -52,20 +68,4 @@
</PreferenceCategory>
- <PreferenceCategory
- android:title="@string/battery_detail_manage_title">
-
- <SwitchPreference
- android:key="background_activity"
- android:title="@string/background_activity_title"
- android:selectable="true"/>
-
- <Preference
- android:key="battery_optimization"
- android:title="@string/high_power_apps"
- android:summary="@string/high_power_off"
- android:selectable="true"/>
-
- </PreferenceCategory>
-
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 5d6c9e9..d7c3c39 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -38,6 +38,11 @@
android:key="battery_saver_summary"
android:title="@string/battery_saver"/>
+ <Preference
+ android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
+ android:key="smart_battery_manager"
+ android:title="@string/smart_battery_manager_title"/>
+
<SwitchPreference
android:key="battery_percentage"
android:title="@string/battery_percentage"
diff --git a/res/xml/power_usage_summary_legacy.xml b/res/xml/power_usage_summary_legacy.xml
index 80179c0..0038cc0 100644
--- a/res/xml/power_usage_summary_legacy.xml
+++ b/res/xml/power_usage_summary_legacy.xml
@@ -61,11 +61,13 @@
android:summary="@string/battery_percentage_description"/>
<!-- Cross-listed item, if you change this, also change it in display_settings.xml -->
- <SwitchPreference
+ <com.android.settingslib.RestrictedSwitchPreference
android:key="auto_brightness_battery"
android:title="@string/auto_brightness_title"
android:summary="@string/auto_brightness_summary"
- settings:keywords="@string/keywords_display_auto_brightness"/>
+ settings:keywords="@string/keywords_display_auto_brightness"
+ settings:useAdminDisabledSummary="true"
+ settings:userRestriction="no_config_brightness" />
<!-- Cross-listed item, if you change this, also change it in display_settings.xml -->
<com.android.settings.TimeoutListPreference
@@ -76,10 +78,11 @@
android:entryValues="@array/screen_timeout_values"/>
<!-- Cross-listed item, if you change this, also change it in display_settings.xml -->
- <Preference
+ <com.android.settingslib.RestrictedPreference
android:key="ambient_display_battery"
android:title="@string/ambient_display_screen_title"
- android:fragment="com.android.settings.display.AmbientDisplaySettings" />
+ android:fragment="com.android.settings.display.AmbientDisplaySettings"
+ settings:userRestriction="no_ambient_display" />
</PreferenceCategory>
diff --git a/res/xml/restricted_apps_detail.xml b/res/xml/restricted_apps_detail.xml
new file mode 100644
index 0000000..1e08a7e
--- /dev/null
+++ b/res/xml/restricted_apps_detail.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.
+-->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/restricted_app_title">
+
+ <PreferenceCategory
+ android:key="restrict_app_list"/>
+
+</PreferenceScreen>
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index 7a45bec..1da1de5 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -19,7 +19,7 @@
android:key="security_lockscreen_settings_screen"
android:title="@string/lockscreen_settings_title">
- <com.android.settings.notification.RestrictedDropDownPreference
+ <com.android.settings.RestrictedListPreference
android:key="security_setting_lock_screen_notif"
android:title="@string/lock_screen_notifications_title"
android:summary="@string/summary_placeholder" />
@@ -33,11 +33,16 @@
android:title="@string/owner_info_settings_title"
android:summary="@string/owner_info_settings_summary" />
+ <SwitchPreference
+ android:key="security_setting_lockdown_enabled"
+ android:title="@string/lockdown_settings_title"
+ android:summary="@string/lockdown_settings_summary" />
+
<PreferenceCategory
android:key="security_setting_lock_screen_notif_work_header"
android:title="@string/profile_section_header">
- <com.android.settings.notification.RestrictedDropDownPreference
+ <com.android.settings.RestrictedListPreference
android:key="security_setting_lock_screen_notif_work"
android:title="@string/lock_screen_notifications_title"
android:summary="@string/summary_placeholder" />
diff --git a/res/xml/security_settings_v2.xml b/res/xml/security_settings_v2.xml
index 571e51f..dafd36c 100644
--- a/res/xml/security_settings_v2.xml
+++ b/res/xml/security_settings_v2.xml
@@ -158,14 +158,4 @@
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.security.ScreenPinningSettings" />
- <Preference
- android:order="90"
- android:key="security_misc_usage_access"
- android:title="@string/usage_access_title"
- android:fragment="com.android.settings.applications.manageapplications.ManageApplications">
- <extra
- android:name="classname"
- android:value="com.android.settings.Settings$UsageAccessSettingsActivity" />
- </Preference>
-
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml
new file mode 100644
index 0000000..a236cb8
--- /dev/null
+++ b/res/xml/smart_battery_detail.xml
@@ -0,0 +1,39 @@
+<?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="smart_battery_detail"
+ android:title="@string/smart_battery_manager_title">
+
+ <!-- TODO(b/71722498): Add header back, otherwise also remove smart_battery_header
+ <com.android.settings.applications.LayoutPreference
+ android:key="header_view"
+ android:layout="@layout/smart_battery_header"
+ android:selectable="false"
+ android:order="-10000"/>
+ -->
+
+ <SwitchPreference
+ android:key="smart_battery"
+ android:title="@string/smart_battery_title"
+ android:summary="@string/smart_battery_summary"/>
+
+ <Preference
+ android:key="restricted_app"
+ android:title="@string/restricted_app_title"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 616a08c..b5bfc49 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -149,18 +149,6 @@
android:summary="%s" />
</PreferenceCategory>
- <com.android.settingslib.RestrictedPreference
- android:key="cell_broadcast_settings"
- android:title="@string/cell_broadcast_settings"
- settings:useAdminDisabledSummary="true"
- settings:allowDividerAbove="true"
- android:order="-1">
- <intent
- android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.cellbroadcastreceiver"
- android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
- </com.android.settingslib.RestrictedPreference>
-
<com.android.settings.widget.WorkOnlyCategory
android:key="sound_work_settings_section"
android:title="@string/sound_work_settings"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 829bc53..7205eaf 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -111,4 +111,14 @@
android:value="com.android.settings.Settings$VrListenersSettingsActivity" />
</Preference>
+ <Preference
+ android:key="special_app_directory_access"
+ android:title="@string/directory_access"
+ android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
+ settings:keywords="@string/keywords_directory_access">
+ <extra
+ android:name="classname"
+ android:value="com.android.settings.Settings$DirectoryAccessSettingsActivity" />
+ </Preference>
+
</PreferenceScreen>
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 1dfa6fb..73aab4b 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -40,6 +40,14 @@
<intent android:action="android.settings.BACKUP_AND_RESET_SETTINGS" />
</Preference>
+ <Preference
+ android:key="reset_dashboard"
+ android:title="@string/reset_dashboard_title"
+ android:summary="@string/reset_dashboard_summary"
+ android:icon="@drawable/ic_restore"
+ android:order="-50"
+ android:fragment="com.android.settings.system.ResetDashboardFragment" />
+
<!-- System updates -->
<Preference
android:key="system_update_settings"
@@ -61,12 +69,4 @@
android:targetClass="@string/additional_system_update_menu" />
</Preference>
- <Preference
- android:key="reset_dashboard"
- android:title="@string/reset_dashboard_title"
- android:summary="@string/reset_dashboard_summary"
- android:icon="@drawable/ic_restore"
- android:order="-20"
- android:fragment="com.android.settings.system.ResetDashboardFragment" />
-
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/user_and_accounts_settings.xml b/res/xml/user_and_accounts_settings.xml
deleted file mode 100644
index 7f82f43..0000000
--- a/res/xml/user_and_accounts_settings.xml
+++ /dev/null
@@ -1,59 +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:settings="http://schemas.android.com/apk/res-auto"
- android:key="user_and_account_settings_screen"
- android:title="@string/account_dashboard_title"
- settings:keywords="@string/keywords_accounts">
-
- <Preference
- android:key="emergency_info"
- android:title="@string/emergency_info_title"
- android:order="100"
- settings:allowDividerAbove="true"/>
-
- <SwitchPreference
- android:key="auto_sync_account_data"
- android:title="@string/auto_sync_account_title"
- android:summary="@string/auto_sync_account_summary"
- android:order="102"
- settings:allowDividerAbove="true"/>
-
- <SwitchPreference
- android:key="auto_sync_work_account_data"
- android:title="@string/account_settings_menu_auto_sync_work"
- android:summary="@string/auto_sync_account_summary"
- android:order="103"/>
-
- <SwitchPreference
- android:key="auto_sync_personal_account_data"
- android:title="@string/account_settings_menu_auto_sync_personal"
- android:summary="@string/auto_sync_account_summary"
- android:order="104"/>
-
- <com.android.settingslib.RestrictedSwitchPreference
- android:key="user_settings_add_users_when_locked"
- android:title="@string/user_add_on_lockscreen_menu"
- android:singleLineTitle="false"
- android:order="105"/>
-
- <PreferenceCategory
- android:key="dashboard_tile_placeholder"
- android:order="200"/>
-
-</PreferenceScreen>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index cf68344..32b46d9 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -14,18 +14,47 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/user_settings_title">
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="user_settings_screen"
+ android:title="@string/user_settings_title">
<PreferenceCategory
- android:key="user_list"
- android:title="@string/user_list_title">
+ android:key="user_list"
+ android:title="@string/user_list_title"
+ android:order="10">
</PreferenceCategory>
<com.android.settingslib.RestrictedPreference
- android:key="user_add"
- android:title="@string/user_add_user_or_profile_menu"
- android:icon="@drawable/ic_menu_add" />
+ android:key="user_add"
+ android:title="@string/user_add_user_or_profile_menu"
+ android:icon="@drawable/ic_menu_add"
+ android:order="20"/>
+
+ <SwitchPreference
+ android:key="auto_sync_account_data"
+ android:title="@string/auto_sync_account_title"
+ android:summary="@string/auto_sync_account_summary"
+ android:order="102"
+ settings:allowDividerAbove="true"/>
+
+ <SwitchPreference
+ android:key="auto_sync_work_account_data"
+ android:title="@string/account_settings_menu_auto_sync_work"
+ android:summary="@string/auto_sync_account_summary"
+ android:order="103"/>
+
+ <SwitchPreference
+ android:key="auto_sync_personal_account_data"
+ android:title="@string/account_settings_menu_auto_sync_personal"
+ android:summary="@string/auto_sync_account_summary"
+ android:order="104"/>
+
+ <com.android.settingslib.RestrictedSwitchPreference
+ android:key="user_settings_add_users_when_locked"
+ android:title="@string/user_add_on_lockscreen_menu"
+ android:singleLineTitle="false"
+ android:order="105"/>
</PreferenceScreen>
diff --git a/res/xml/wifi_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
index 8203bec..5e2745a 100644
--- a/res/xml/wifi_network_details_fragment.xml
+++ b/res/xml/wifi_network_details_fragment.xml
@@ -49,6 +49,13 @@
android:icon="@drawable/ic_security_lock_24dp"
android:title="@string/wifi_security"
android:selectable="false"/>
+
+ <DropDownPreference
+ android:key="metered"
+ android:icon="@drawable/ic_attach_money_black_24dp"
+ android:title="@string/data_usage_metered_yes"
+ android:entries="@array/wifi_metered_entries"
+ android:entryValues="@array/wifi_metered_values"/>
</PreferenceCategory>
<!-- Network Details -->
diff --git a/res/xml/zen_mode_behavior_settings.xml b/res/xml/zen_mode_behavior_settings.xml
index 31d429b..8d2c28c 100644
--- a/res/xml/zen_mode_behavior_settings.xml
+++ b/res/xml/zen_mode_behavior_settings.xml
@@ -47,21 +47,24 @@
android:key="zen_mode_events"
android:title="@string/zen_mode_events"/>
- <Preference
+ <!-- Messages -->
+ <ListPreference
android:key="zen_mode_messages"
android:title="@string/zen_mode_messages"
- android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
+ android:entries="@array/zen_mode_contacts_entries"
+ android:entryValues="@array/zen_mode_contacts_values"/>
<!-- Calls -->
- <Preference
+ <ListPreference
android:key="zen_mode_calls"
android:title="@string/zen_mode_calls"
- android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
+ android:entries="@array/zen_mode_contacts_entries"
+ android:entryValues="@array/zen_mode_contacts_values"/>
<!-- Repeat callers -->
<SwitchPreference
android:key="zen_mode_repeat_callers"
- android:title="@string/zen_mode_repeat_callers"/>
+ android:title="@string/zen_mode_repeat_callers" />
</PreferenceCategory>
diff --git a/res/xml/zen_mode_event_rule_settings.xml b/res/xml/zen_mode_event_rule_settings.xml
index 159dbe0..ea37855 100644
--- a/res/xml/zen_mode_event_rule_settings.xml
+++ b/res/xml/zen_mode_event_rule_settings.xml
@@ -28,12 +28,6 @@
android:key="zen_automatic_rule_switch"
android:layout="@layout/styled_switch_bar" />
- <!-- Rule name -->
- <Preference
- android:key="rule_name"
- android:title="@string/zen_mode_rule_name"
- android:persistent="false" />
-
<!-- During events for -->
<DropDownPreference
android:key="calendar"
diff --git a/res/xml/zen_mode_schedule_rule_settings.xml b/res/xml/zen_mode_schedule_rule_settings.xml
index a0c52c0..e201b87 100644
--- a/res/xml/zen_mode_schedule_rule_settings.xml
+++ b/res/xml/zen_mode_schedule_rule_settings.xml
@@ -28,12 +28,6 @@
android:key="zen_automatic_rule_switch"
android:layout="@layout/styled_switch_bar" />
- <!-- Rule name -->
- <Preference
- android:key="rule_name"
- android:title="@string/zen_mode_rule_name"
- android:persistent="false" />
-
<!-- Days -->
<Preference
android:key="days"
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index 4fc205d..5f93589 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -30,8 +30,8 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneStateIntentReceiver;
import com.android.internal.telephony.TelephonyProperties;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.WirelessUtils;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/ApnPreference.java b/src/com/android/settings/ApnPreference.java
index 0111b26..9a6eeaf 100755
--- a/src/com/android/settings/ApnPreference.java
+++ b/src/com/android/settings/ApnPreference.java
@@ -16,11 +16,13 @@
package com.android.settings;
+import static android.provider.Telephony.Carriers.CONTENT_URI;
+import static android.provider.Telephony.Carriers.FILTERED_URI;
+
import android.content.ContentUris;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
-import android.provider.Telephony;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.telephony.SubscriptionManager;
@@ -35,6 +37,7 @@
public class ApnPreference extends Preference implements
CompoundButton.OnCheckedChangeListener, OnClickListener {
final static String TAG = "ApnPreference";
+ private boolean mDpcEnforced = false;
private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@@ -118,7 +121,8 @@
Context context = getContext();
if (context != null) {
int pos = Integer.parseInt(getKey());
- Uri url = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, pos);
+ Uri url = ContentUris.withAppendedId(
+ mDpcEnforced ? FILTERED_URI : CONTENT_URI, pos);
Intent editIntent = new Intent(Intent.ACTION_EDIT, url);
editIntent.putExtra(ApnSettings.SUB_ID, mSubId);
context.startActivity(editIntent);
@@ -137,4 +141,8 @@
public void setSubId(int subId) {
mSubId = subId;
}
+
+ public void setDpcEnforced(boolean enforced) {
+ mDpcEnforced = enforced;
+ }
}
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index d554301..2c22a79 100755
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -16,6 +16,10 @@
package com.android.settings;
+import static android.provider.Telephony.Carriers.CONTENT_URI;
+import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;
+import static android.provider.Telephony.Carriers.FILTERED_URI;
+
import android.app.Activity;
import android.app.Dialog;
import android.app.ProgressDialog;
@@ -39,7 +43,6 @@
import android.provider.Telephony;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -50,7 +53,6 @@
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
-import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -246,6 +248,17 @@
return null;
}
+ private boolean isDpcApnEnforced() {
+ try (Cursor enforceCursor = getContentResolver().query(ENFORCE_MANAGED_URI,
+ null, null, null, null)) {
+ if (enforceCursor == null || enforceCursor.getCount() != 1) {
+ return false;
+ }
+ enforceCursor.moveToFirst();
+ return enforceCursor.getInt(0) > 0;
+ }
+ }
+
private void fillList() {
final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
@@ -259,9 +272,9 @@
where.append(" AND NOT (type='ims')");
}
- Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] {
- "_id", "name", "apn", "type", "mvno_type", "mvno_match_data"}, where.toString(),
- null, Telephony.Carriers.DEFAULT_SORT_ORDER);
+ Cursor cursor = getContentResolver().query(FILTERED_URI,
+ new String[] {"_id", "name", "apn", "type", "mvno_type", "mvno_match_data"},
+ where.toString(), null, Telephony.Carriers.DEFAULT_SORT_ORDER);
if (cursor != null) {
IccRecords r = null;
@@ -279,6 +292,7 @@
mSelectedKey = getSelectedApnKey();
cursor.moveToFirst();
+ boolean enforced = isDpcApnEnforced();
while (!cursor.isAfterLast()) {
String name = cursor.getString(NAME_INDEX);
String apn = cursor.getString(APN_INDEX);
@@ -295,6 +309,7 @@
pref.setPersistent(false);
pref.setOnPreferenceChangeListener(this);
pref.setSubId(subId);
+ pref.setDpcEnforced(enforced);
boolean selectable = ((type == null) || !type.equals("mms"));
pref.setSelectable(selectable);
@@ -343,15 +358,14 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- if (!mUnavailable) {
+ if (!mUnavailable && !isDpcApnEnforced()) {
if (mAllowAddingApns) {
menu.add(0, MENU_NEW, 0,
getResources().getString(R.string.menu_new))
.setIcon(R.drawable.ic_menu_add_white)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
- menu.add(0, MENU_RESTORE, 0,
- getResources().getString(R.string.menu_restore))
+ menu.add(0, MENU_RESTORE, 0, getResources().getString(R.string.menu_restore))
.setIcon(android.R.drawable.ic_menu_upload);
}
@@ -387,7 +401,7 @@
@Override
public boolean onPreferenceTreeClick(Preference preference) {
int pos = Integer.parseInt(preference.getKey());
- Uri url = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, pos);
+ Uri url = ContentUris.withAppendedId(isDpcApnEnforced() ? FILTERED_URI : CONTENT_URI, pos);
startActivity(new Intent(Intent.ACTION_EDIT, url));
return true;
}
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 9391439..bb53018 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -49,8 +49,9 @@
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.core.instrumentation.Instrumentable;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import org.xmlpull.v1.XmlPullParserException;
@@ -63,8 +64,7 @@
public class DeviceAdminSettings extends ListFragment implements Instrumentable {
static final String TAG = "DeviceAdminSettings";
- private final VisibilityLoggerMixin mVisibilityLoggerMixin =
- new VisibilityLoggerMixin(getMetricsCategory());
+ private VisibilityLoggerMixin mVisibilityLoggerMixin;
private DevicePolicyManager mDPM;
private UserManager mUm;
@@ -85,12 +85,6 @@
}
}
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
- mVisibilityLoggerMixin.onAttach(context);
- }
-
/**
* Internal collection of device admin info objects for all profiles associated with the current
* user.
@@ -121,6 +115,8 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
+ mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
+ FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider());
}
@Override
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 7a6f966..687e645 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -28,6 +28,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
@@ -39,6 +40,7 @@
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.telephony.euicc.EuiccManager;
+import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -73,7 +75,11 @@
public class MasterClear extends InstrumentedPreferenceFragment {
private static final String TAG = "MasterClear";
- private static final int KEYGUARD_REQUEST = 55;
+ @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";
static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
static final String ERASE_ESIMS_EXTRA = "erase_esim";
@@ -82,6 +88,8 @@
private Button mInitiateButton;
private View mExternalStorageContainer;
@VisibleForTesting CheckBox mExternalStorage;
+ private View mEsimStorageContainer;
+ @VisibleForTesting CheckBox mEsimStorage;
private ScrollView mScrollView;
private final OnGlobalLayoutListener mOnGlobalLayoutListener = new OnGlobalLayoutListener() {
@@ -110,17 +118,26 @@
request, res.getText(R.string.master_clear_title));
}
+ @VisibleForTesting
+ boolean isValidRequestCode(int requestCode) {
+ return !((requestCode != KEYGUARD_REQUEST) && (requestCode != CREDENTIAL_CONFIRM_REQUEST));
+ }
+
+ @VisibleForTesting
+ boolean isShowFinalConfirmation(int requestCode, int resultCode) {
+ return (resultCode == Activity.RESULT_OK) || (requestCode == CREDENTIAL_CONFIRM_REQUEST);
+ }
+
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
-
- if (requestCode != KEYGUARD_REQUEST) {
+ if (!isValidRequestCode(requestCode)) {
return;
}
// If the user entered a valid keyguard trace, present the final
// confirmation prompt; otherwise, go back to the initial state.
- if (resultCode == Activity.RESULT_OK) {
+ if (isShowFinalConfirmation(requestCode, resultCode)) {
showFinalConfirmation();
} else {
establishInitialState();
@@ -131,13 +148,45 @@
void showFinalConfirmation() {
Bundle args = new Bundle();
args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
- // TODO: Offer the user a choice to wipe eSIMs when it is technically feasible to do so.
- args.putBoolean(ERASE_ESIMS_EXTRA, true);
+ args.putBoolean(ERASE_ESIMS_EXTRA, mEsimStorage.isChecked());
((SettingsActivity) getActivity()).startPreferencePanel(
this, MasterClearConfirm.class.getName(),
args, R.string.master_clear_confirm_title, null, null, 0);
}
+ @VisibleForTesting
+ boolean tryShowAccountConfirmation() {
+ final Context context = getActivity();
+ final String accountType = context.getString(R.string.account_type);
+ final String packageName = context.getString(R.string.account_confirmation_package);
+ final String className = context.getString(R.string.account_confirmation_class);
+ if (TextUtils.isEmpty(accountType)
+ || TextUtils.isEmpty(packageName)
+ || TextUtils.isEmpty(className)) {
+ return false;
+ }
+ final AccountManager am = AccountManager.get(context);
+ Account[] accounts = am.getAccountsByType(accountType);
+ if (accounts != null && accounts.length > 0) {
+ final Intent requestAccountConfirmation = new Intent()
+ .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);
+ if (resolution != null
+ && resolution.activityInfo != null
+ && packageName.equals(resolution.activityInfo.packageName)) {
+ // Note that we need to check the packagename to make sure that an Activity resolver
+ // wasn't returned.
+ startActivityForResult(
+ requestAccountConfirmation, CREDENTIAL_CONFIRM_REQUEST);
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* If the user clicks to begin the reset sequence, we next require a
* keyguard confirmation if the user has currently enabled one. If there
@@ -158,7 +207,10 @@
.setAction(Intent.ACTION_FACTORY_RESET);
context.startActivity(requestFactoryReset);
}
- } else if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+ return;
+ }
+
+ if (!tryShowAccountConfirmation() && !runKeyguardConfirmation(KEYGUARD_REQUEST)) {
showFinalConfirmation();
}
}
@@ -181,6 +233,8 @@
mInitiateButton.setOnClickListener(mInitiateListener);
mExternalStorageContainer = mContentView.findViewById(R.id.erase_external_container);
mExternalStorage = (CheckBox) mContentView.findViewById(R.id.erase_external);
+ mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+ mEsimStorage = (CheckBox) mContentView.findViewById(R.id.erase_esim);
mScrollView = (ScrollView) mContentView.findViewById(R.id.master_clear_scrollview);
/*
@@ -215,11 +269,25 @@
}
if (showWipeEuicc()) {
- final View esimAlsoErased = mContentView.findViewById(R.id.also_erases_esim);
- esimAlsoErased.setVisibility(View.VISIBLE);
+ if (showWipeEuiccCheckbox()) {
+ TextView title = mContentView.findViewById(R.id.erase_esim_title);
+ title.setText(R.string.erase_esim_storage);
+ mEsimStorageContainer.setVisibility(View.VISIBLE);
+ mEsimStorageContainer.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mEsimStorage.toggle();
+ }
+ });
+ } else {
+ final View esimAlsoErased = mContentView.findViewById(R.id.also_erases_esim);
+ esimAlsoErased.setVisibility(View.VISIBLE);
- final View noCancelMobilePlan = mContentView.findViewById(R.id.no_cancel_mobile_plan);
- noCancelMobilePlan.setVisibility(View.VISIBLE);
+ final View noCancelMobilePlan = mContentView.findViewById(
+ R.id.no_cancel_mobile_plan);
+ noCancelMobilePlan.setVisibility(View.VISIBLE);
+ mEsimStorage.setChecked(true /* checked */);
+ }
}
final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
@@ -261,6 +329,12 @@
}
@VisibleForTesting
+ boolean showWipeEuiccCheckbox() {
+ return SystemProperties
+ .getBoolean(KEY_SHOW_ESIM_RESET_CHECKBOX, false /* def */);
+ }
+
+ @VisibleForTesting
protected boolean isEuiccEnabled(Context context) {
EuiccManager euiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
return euiccManager.isEnabled();
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 0f08c26..f64f6dc 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -18,20 +18,28 @@
import android.annotation.Nullable;
import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
+import android.provider.Settings;
+import android.provider.Settings.Global;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import android.telephony.euicc.EuiccManager;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
+import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.Button;
+import android.widget.CheckBox;
import android.widget.Spinner;
+import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
@@ -64,6 +72,8 @@
private View mContentView;
private Spinner mSubscriptionSpinner;
private Button mInitiateButton;
+ private View mEsimContainer;
+ private CheckBox mEsimCheckbox;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -107,6 +117,7 @@
SubscriptionInfo subscription = mSubscriptions.get(selectedIndex);
args.putInt(PhoneConstants.SUBSCRIPTION_KEY, subscription.getSubscriptionId());
}
+ args.putBoolean(MasterClear.ERASE_ESIMS_EXTRA, mEsimCheckbox.isChecked());
((SettingsActivity) getActivity()).startPreferencePanel(
this, ResetNetworkConfirm.class.getName(),
args, R.string.reset_network_confirm_title, null, null, 0);
@@ -141,6 +152,8 @@
*/
private void establishInitialState() {
mSubscriptionSpinner = (Spinner) mContentView.findViewById(R.id.reset_network_subscription);
+ mEsimContainer = mContentView.findViewById(R.id.erase_esim_container);
+ mEsimCheckbox = mContentView.findViewById(R.id.erase_esim);
mSubscriptions = SubscriptionManager.from(getActivity()).getActiveSubscriptionInfoList();
if (mSubscriptions != null && mSubscriptions.size() > 0) {
@@ -192,6 +205,30 @@
}
mInitiateButton = (Button) mContentView.findViewById(R.id.initiate_reset_network);
mInitiateButton.setOnClickListener(mInitiateListener);
+ if (showEuiccSettings(getContext())) {
+ mEsimContainer.setVisibility(View.VISIBLE);
+ TextView title = mContentView.findViewById(R.id.erase_esim_title);
+ title.setText(R.string.reset_esim_title);
+ mEsimContainer.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mEsimCheckbox.toggle();
+ }
+ });
+ } else {
+ mEsimCheckbox.setChecked(false /* checked */);
+ }
+ }
+
+ private boolean showEuiccSettings(Context context) {
+ EuiccManager euiccManager =
+ (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
+ if (!euiccManager.isEnabled()) {
+ return false;
+ }
+ ContentResolver resolver = context.getContentResolver();
+ return Settings.Global.getInt(resolver, Global.EUICC_PROVISIONED, 0) != 0
+ || Settings.Global.getInt(resolver, Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
}
@Override
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 58b8289..bc0fa77 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -16,6 +16,7 @@
package com.android.settings;
+import android.app.AlertDialog;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothManager;
import android.content.ContentResolver;
@@ -24,9 +25,12 @@
import android.net.NetworkPolicyManager;
import android.net.Uri;
import android.net.wifi.WifiManager;
+import android.os.AsyncTask;
import android.os.Bundle;
+import android.os.RecoverySystem;
import android.os.UserHandle;
import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.view.LayoutInflater;
@@ -39,6 +43,7 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.wrapper.RecoverySystemWrapper;
import com.android.settingslib.RestrictedLockUtils;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -57,6 +62,42 @@
private View mContentView;
private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ @VisibleForTesting boolean mEraseEsim;
+ @VisibleForTesting EraseEsimAsyncTask mEraseEsimTask;
+ @VisibleForTesting static RecoverySystemWrapper mRecoverySystem;
+
+ /**
+ * Async task used to erase all the eSIM profiles from the phone. If error happens during
+ * erasing eSIM profiles or timeout, an error msg is shown.
+ */
+ private static class EraseEsimAsyncTask extends AsyncTask<Void, Void, Boolean> {
+ private final Context mContext;
+ private final String mPackageName;
+
+ EraseEsimAsyncTask(Context context, String packageName) {
+ mContext = context;
+ mPackageName = packageName;
+ }
+
+ @Override
+ protected Boolean doInBackground(Void... params) {
+ return mRecoverySystem.wipeEuiccData(mContext, mPackageName);
+ }
+
+ @Override
+ protected void onPostExecute(Boolean succeeded) {
+ if (succeeded) {
+ Toast.makeText(mContext, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
+ .show();
+ } else {
+ new AlertDialog.Builder(mContext)
+ .setTitle(R.string.reset_esim_error_title)
+ .setMessage(R.string.reset_esim_error_msg)
+ .setPositiveButton(android.R.string.ok, null /* listener */)
+ .show();
+ }
+ }
+ }
/**
* The user has gone through the multiple confirmation, so now we go ahead
@@ -69,7 +110,8 @@
if (Utils.isMonkeyRunning()) {
return;
}
- // TODO maybe show a progress dialog if this ends up taking a while
+ // TODO maybe show a progress screen if this ends up taking a while and won't let user
+ // go back until the tasks finished.
Context context = getActivity();
ConnectivityManager connectivityManager = (ConnectivityManager)
@@ -108,11 +150,20 @@
ImsManager.factoryReset(context);
restoreDefaultApn(context);
+ esimFactoryReset(context, context.getPackageName());
+ }
+ };
+ @VisibleForTesting
+ void esimFactoryReset(Context context, String packageName) {
+ if (mEraseEsim) {
+ mEraseEsimTask = new EraseEsimAsyncTask(context, packageName);
+ mEraseEsimTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ } else {
Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
.show();
}
- };
+ }
/**
* Restore APN settings to default.
@@ -163,6 +214,16 @@
if (args != null) {
mSubId = args.getInt(PhoneConstants.SUBSCRIPTION_KEY,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ mEraseEsim = args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA);
+ }
+ mRecoverySystem = new RecoverySystemWrapper();
+ }
+
+ @Override
+ public void onDestroy() {
+ if (mEraseEsimTask != null) {
+ mEraseEsimTask.cancel(true /* mayInterruptIfRunning */);
+ mEraseEsimTask = null;
}
}
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 505977d..0b6fe89 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -16,7 +16,6 @@
package com.android.settings;
-import static com.android.settings.core.FeatureFlags.BATTERY_SETTINGS_V2;
import static com.android.settings.core.FeatureFlags.CONNECTED_DEVICE_V2;
import android.os.Bundle;
@@ -55,6 +54,7 @@
public static class NightDisplaySettingsActivity extends SettingsActivity { /* empty */ }
public static class NightDisplaySuggestionActivity extends NightDisplaySettingsActivity { /* empty */ }
public static class DeviceInfoSettingsActivity extends SettingsActivity { /* empty */ }
+ public static class MyDeviceInfoActivity extends SettingsActivity { /* empty */ }
public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }
public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }
public static class ManageAssistActivity extends SettingsActivity { /* empty */ }
@@ -120,6 +120,7 @@
public static class PhotosStorageActivity extends SettingsActivity {
/* empty */
}
+ public static class DirectoryAccessSettingsActivity extends SettingsActivity { /* empty */ }
public static class TopLevelSettings extends SettingsActivity { /* empty */ }
public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }
@@ -132,16 +133,8 @@
public static class AppWriteSettingsActivity extends SettingsActivity { /* empty */ }
public static class AdvancedAppsActivity extends SettingsActivity { /* empty */ }
- public static class ManageExternalSourcesActivity extends SettingsActivity {
- /* empty */ }
+ public static class ManageExternalSourcesActivity extends SettingsActivity {/* empty */ }
public static class ManageAppExternalSourcesActivity extends SettingsActivity { /* empty */ }
- public static class DoubleTapPowerSuggestionActivity extends SettingsActivity { /* empty */ }
- public static class DoubleTwistSuggestionActivity extends SettingsActivity { /* empty */ }
- public static class AmbientDisplaySuggestionActivity extends SettingsActivity { /* empty */ }
- public static class AmbientDisplayPickupSuggestionActivity extends SettingsActivity {
- /* empty */ }
- public static class SwipeToNotificationSuggestionActivity extends SettingsActivity {
- /* empty */ }
public static class WallpaperSettingsActivity extends SettingsActivity { /* empty */ }
public static class ManagedProfileSettingsActivity extends SettingsActivity { /* empty */ }
public static class DeletionHelperActivity extends SettingsActivity { /* empty */ }
@@ -175,7 +168,12 @@
public static class PowerUsageSummaryLegacyActivity extends SettingsActivity { /* empty */ }
public static class AppAndNotificationDashboardActivity extends SettingsActivity {}
public static class StorageDashboardActivity extends SettingsActivity {}
- public static class UserAndAccountDashboardActivity extends SettingsActivity {}
+ public static class AccountDashboardActivity extends SettingsActivity {}
public static class SystemDashboardActivity extends SettingsActivity {}
+ public static class AdvancedConnectedDeviceActivity extends SettingsActivity {
+ public static final boolean isEnabled() {
+ return FeatureFlagUtils.isEnabled(null /* context */, CONNECTED_DEVICE_V2);
+ }
+ }
}
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index d3580d1..d4584b7 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -56,13 +56,13 @@
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.backup.BackupSettingsActivity;
import com.android.settings.core.gateway.SettingsGateway;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.instrumentation.SharedPreferencesLogger;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.DashboardSummary;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wfd.WifiDisplaySettings;
import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.core.instrumentation.SharedPreferencesLogger;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.SettingsDrawerActivity;
@@ -93,11 +93,6 @@
public static final String EXTRA_SHOW_FRAGMENT = ":settings:show_fragment";
/**
- * The metrics category constant for logging source when a setting fragment is opened.
- */
- public static final String EXTRA_SOURCE_METRICS_CATEGORY = ":settings:source_metrics";
-
- /**
* When starting this activity and using {@link #EXTRA_SHOW_FRAGMENT},
* this extra can also be specified to supply a Bundle of arguments to pass
* to that fragment when it is instantiated during the initial creation
@@ -220,7 +215,8 @@
@Override
public SharedPreferences getSharedPreferences(String name, int mode) {
if (name.equals(getPackageName() + "_preferences")) {
- return new SharedPreferencesLogger(this, getMetricsTag());
+ return new SharedPreferencesLogger(this, getMetricsTag(),
+ FeatureFactory.getFactory(this).getMetricsFeatureProvider());
}
return super.getSharedPreferences(name, mode);
}
@@ -877,6 +873,19 @@
WifiDisplaySettings.isAvailable(this), isAdmin)
|| somethingChanged;
+ // Enable/disable the Me Card page.
+ final boolean isMeCardEnabled = featureFactory
+ .getAccountFeatureProvider()
+ .isMeCardEnabled(this);
+ somethingChanged = setTileEnabled(new ComponentName(packageName,
+ Settings.MyDeviceInfoActivity.class.getName()),
+ isMeCardEnabled, isAdmin)
+ || somethingChanged;
+ somethingChanged = setTileEnabled(new ComponentName(packageName,
+ Settings.DeviceInfoSettingsActivity.class.getName()),
+ !isMeCardEnabled, isAdmin)
+ || somethingChanged;
+
if (UserHandle.MU_ENABLED && !isAdmin) {
// When on restricted users, disable all extra categories (but only the settings ones).
diff --git a/src/com/android/settings/SettingsInitialize.java b/src/com/android/settings/SettingsInitialize.java
index 6b15770..9f2bdcc 100644
--- a/src/com/android/settings/SettingsInitialize.java
+++ b/src/com/android/settings/SettingsInitialize.java
@@ -34,6 +34,8 @@
import static android.content.pm.PackageManager.GET_RESOLVED_FILTER;
import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
+import com.android.settings.shortcut.CreateShortcut;
+
/**
* 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/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index d9e264b..c5d477a 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -45,7 +45,6 @@
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.core.instrumentation.Instrumentable;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.search.actionbar.SearchMenuController;
import com.android.settings.support.actionbar.HelpMenuController;
@@ -53,6 +52,7 @@
import com.android.settings.widget.LoadingViewController;
import com.android.settingslib.CustomDialogPreference;
import com.android.settingslib.CustomEditTextPreference;
+import com.android.settingslib.core.instrumentation.Instrumentable;
import com.android.settingslib.widget.FooterPreferenceMixin;
import java.util.UUID;
diff --git a/src/com/android/settings/ShowAdminSupportDetailsDialog.java b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
index c1cd6f5..321f93d 100644
--- a/src/com/android/settings/ShowAdminSupportDetailsDialog.java
+++ b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
@@ -150,6 +150,9 @@
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;
default:
// Use general text if no specialized title applies
titleView.setText(R.string.disabled_by_policy_title);
diff --git a/src/com/android/settings/SummaryPreference.java b/src/com/android/settings/SummaryPreference.java
index d129661..23965ee 100644
--- a/src/com/android/settings/SummaryPreference.java
+++ b/src/com/android/settings/SummaryPreference.java
@@ -21,7 +21,8 @@
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;
-import com.android.settings.applications.LinearColorBar;
+
+import com.android.settings.widget.LinearColorBar;
/**
* Provides a summary of a setting page in a preference. Such as memory or data usage.
@@ -92,7 +93,7 @@
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
- LinearColorBar colorBar = (LinearColorBar) holder.itemView.findViewById(R.id.color_bar);
+ final LinearColorBar colorBar = holder.itemView.findViewById(R.id.color_bar);
if (mChartEnabled) {
colorBar.setVisibility(View.VISIBLE);
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index cd64799..f45ac5e 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -94,6 +94,7 @@
import android.text.format.DateUtils;
import android.text.style.TtsSpan;
import android.util.ArraySet;
+import android.util.IconDrawableFactory;
import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
@@ -109,6 +110,7 @@
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
import com.android.settings.wrapper.FingerprintManagerWrapper;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import java.net.InetAddress;
import java.util.ArrayList;
@@ -513,7 +515,8 @@
Fragment resultTo, int resultRequestCode, String titleResPackageName, int titleResId,
CharSequence title, boolean isShortcut, int metricsCategory) {
startWithFragment(context, fragmentName, args, resultTo, resultRequestCode,
- titleResPackageName, titleResId, title, isShortcut, metricsCategory, 0);
+ titleResPackageName, titleResId, title, isShortcut, metricsCategory,
+ Intent.FLAG_ACTIVITY_NEW_TASK);
}
@@ -575,7 +578,7 @@
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, titleResId);
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, title);
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, isShortcut);
- intent.putExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY, sourceMetricsCategory);
+ intent.putExtra(VisibilityLoggerMixin.EXTRA_SOURCE_METRICS_CATEGORY, sourceMetricsCategory);
return intent;
}
@@ -1382,4 +1385,18 @@
}
return new BitmapDrawable(null, bitmap);
}
+
+ /**
+ * Get the {@link Drawable} that represents the app icon
+ */
+ public static Drawable getBadgedIcon(IconDrawableFactory iconDrawableFactory,
+ PackageManager packageManager, String packageName, int userId) {
+ try {
+ final ApplicationInfo appInfo = packageManager.getApplicationInfo(packageName,
+ PackageManager.GET_META_DATA);
+ return iconDrawableFactory.getBadgedIcon(appInfo, userId);
+ } catch (PackageManager.NameNotFoundException e) {
+ return packageManager.getDefaultActivityIcon();
+ }
+ }
}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index cc72280..df8d4c8 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -90,8 +90,6 @@
// Preferences
private static final String TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE =
"toggle_high_text_contrast_preference";
- private static final String TOGGLE_INVERSION_PREFERENCE =
- "toggle_inversion_preference";
private static final String TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE =
"toggle_power_button_ends_call_preference";
private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE =
@@ -113,9 +111,11 @@
"tts_settings_preference";
private static final String AUTOCLICK_PREFERENCE_SCREEN =
"autoclick_preference_screen";
- private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
- "daltonizer_preference_screen";
+ @VisibleForTesting static final String TOGGLE_INVERSION_PREFERENCE =
+ "toggle_inversion_preference";
+ @VisibleForTesting static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
+ "daltonizer_preference_screen";
@VisibleForTesting static final String ACCESSIBILITY_SHORTCUT_PREFERENCE =
"accessibility_shortcut_preference";
@@ -619,6 +619,8 @@
displayCategory.addPreference(mToggleInversionPreference);
displayCategory.addPreference(mDisplayDaltonizerPreferenceScreen);
}
+ checkColorCorrectionVisibility(mDisplayDaltonizerPreferenceScreen);
+ checkColorInversionVisibility(mToggleInversionPreference);
// Text contrast.
mToggleHighTextContrastPreference.setChecked(
@@ -769,6 +771,20 @@
}
}
+ @VisibleForTesting void checkColorCorrectionVisibility(Preference preference) {
+ if (!getContext().getResources().getBoolean(
+ R.bool.config_show_color_correction_preference)) {
+ removePreference(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
+ }
+ }
+
+ @VisibleForTesting void checkColorInversionVisibility(Preference preference) {
+ if (!getContext().getResources().getBoolean(
+ R.bool.config_show_color_inversion_preference)) {
+ removePreference(TOGGLE_INVERSION_PREFERENCE);
+ }
+ }
+
@VisibleForTesting void checkAccessibilityShortcutVisibility(Preference preference) {
if (!getContext().getResources().getBoolean(
R.bool.config_show_accessibility_shortcut_preference)) {
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index 3606b8e..fbbdfad 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -158,6 +158,8 @@
final boolean enabled = mCaptioningManager.isEnabled();
SettingsActivity activity = (SettingsActivity) getActivity();
mSwitchBar = activity.getSwitchBar();
+ mSwitchBar.setSwitchBarText(R.string.accessibility_caption_master_switch_title,
+ R.string.accessibility_caption_master_switch_title);
mSwitchBar.setCheckedInternal(enabled);
mToggleSwitch = mSwitchBar.getSwitch();
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 146f697..69044aa 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -93,6 +93,12 @@
mSwitchBar.removeOnSwitchChangeListener(this);
}
+ @Override
+ protected void updateSwitchBarText(SwitchBar switchBar) {
+ switchBar.setSwitchBarText(R.string.accessibility_daltonizer_master_switch_title,
+ R.string.accessibility_daltonizer_master_switch_title);
+ }
+
private void initPreferences() {
final String value = Integer.toString(
Settings.Secure.getInt(getContentResolver(), TYPE, DEFAULT_TYPE));
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 85d3a2f..7dacbb0 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -23,6 +23,7 @@
import android.support.v7.preference.PreferenceScreen;
import android.view.View;
+import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.SwitchBar;
@@ -55,6 +56,7 @@
SettingsActivity activity = (SettingsActivity) getActivity();
mSwitchBar = activity.getSwitchBar();
+ updateSwitchBarText(mSwitchBar);
mToggleSwitch = mSwitchBar.getSwitch();
onProcessArguments(getArguments());
@@ -83,6 +85,12 @@
removeActionBarToggleSwitch();
}
+ protected void updateSwitchBarText(SwitchBar switchBar) {
+ // Implement this to provide meaningful text in switch bar
+ switchBar.setSwitchBarText(R.string.accessibility_service_master_switch_title,
+ R.string.accessibility_service_master_switch_title);
+ }
+
protected abstract void onPreferenceToggled(String preferenceKey, boolean enabled);
protected void onInstallSwitchBarToggleSwitch() {
diff --git a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java
similarity index 70%
rename from src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
rename to src/com/android/settings/accounts/AccountDashboardFragment.java
index 37584fc..65a5ff0 100644
--- a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDashboardFragment.java
@@ -19,26 +19,26 @@
import android.app.Activity;
import android.content.Context;
-import android.content.pm.UserInfo;
import android.os.UserHandle;
-import android.os.UserManager;
import android.provider.SearchIndexableResource;
+import android.text.BidiFormatter;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
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.accounts.AuthenticatorHelper;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-public class UserAndAccountDashboardFragment extends DashboardFragment {
+public class AccountDashboardFragment extends DashboardFragment {
- private static final String TAG = "UserAndAccountDashboard";
- private static final String KEY_ADD_USER_WHEN_LOCKED = "user_settings_add_users_when_locked";
+ private static final String TAG = "AccountDashboardFrag";
+
@Override
public int getMetricsCategory() {
@@ -52,7 +52,7 @@
@Override
protected int getPreferenceScreenResId() {
- return R.xml.user_and_accounts_settings;
+ return R.xml.accounts_dashboard_settings;
}
@Override
@@ -63,16 +63,7 @@
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new EmergencyInfoPreferenceController(context));
- AddUserWhenLockedPreferenceController addUserWhenLockedPrefController =
- new AddUserWhenLockedPreferenceController(
- context, KEY_ADD_USER_WHEN_LOCKED);
- controllers.add(addUserWhenLockedPrefController);
- getLifecycle().addObserver(addUserWhenLockedPrefController);
- controllers.add(new AutoSyncDataPreferenceController(context, this));
- controllers.add(new AutoSyncPersonalDataPreferenceController(context, this));
- controllers.add(new AutoSyncWorkDataPreferenceController(context, this));
- String[] authorities = getIntent().getStringArrayExtra(EXTRA_AUTHORITIES);
+ final String[] authorities = getIntent().getStringArrayExtra(EXTRA_AUTHORITIES);
final AccountPreferenceController accountPrefController =
new AccountPreferenceController(context, this, authorities);
getLifecycle().addObserver(accountPrefController);
@@ -93,10 +84,27 @@
@Override
public void setListening(boolean listening) {
if (listening) {
- UserInfo info = mContext.getSystemService(UserManager.class).getUserInfo(
- UserHandle.myUserId());
- mSummaryLoader.setSummary(this,
- mContext.getString(R.string.users_and_accounts_summary, info.name));
+ final AuthenticatorHelper authHelper = new AuthenticatorHelper(mContext,
+ UserHandle.of(UserHandle.myUserId()), null /* OnAccountsUpdateListener */);
+ final String[] types = authHelper.getEnabledAccountTypes();
+
+ final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
+
+ CharSequence summary = null;
+
+ // Show up to 3 account types
+ final int size = Math.min(3, types.length);
+
+ for (int i = 0; i < size; i++) {
+ final CharSequence label = authHelper.getLabelForType(mContext, types[i]);
+ if (summary == null) {
+ summary = bidiFormatter.unicodeWrap(label);
+ } else {
+ summary = mContext.getString(R.string.join_many_items_middle, summary,
+ bidiFormatter.unicodeWrap(label));
+ }
+ }
+ mSummaryLoader.setSummary(this, summary);
}
}
}
@@ -116,7 +124,7 @@
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.user_and_accounts_settings;
+ sir.xmlResId = R.xml.accounts_dashboard_settings;
return Arrays.asList(sir);
}
};
diff --git a/src/com/android/settings/accounts/AccountFeatureProvider.java b/src/com/android/settings/accounts/AccountFeatureProvider.java
new file mode 100644
index 0000000..bbfc48a
--- /dev/null
+++ b/src/com/android/settings/accounts/AccountFeatureProvider.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.util.FeatureFlagUtils;
+
+import com.android.settings.core.FeatureFlags;
+
+public interface AccountFeatureProvider {
+ String getAccountType();
+ Account[] getAccounts(Context context);
+ /**
+ * Checks whether or not to display the new About Phone page.
+ */
+ default boolean isMeCardEnabled(Context context) {
+ return FeatureFlagUtils.isEnabled(context, FeatureFlags.ABOUT_PHONE_V2);
+ }
+}
diff --git a/src/com/android/settings/accounts/AccountFeatureProviderImpl.java b/src/com/android/settings/accounts/AccountFeatureProviderImpl.java
new file mode 100644
index 0000000..90b581b
--- /dev/null
+++ b/src/com/android/settings/accounts/AccountFeatureProviderImpl.java
@@ -0,0 +1,16 @@
+package com.android.settings.accounts;
+
+import android.accounts.Account;
+import android.content.Context;
+
+public class AccountFeatureProviderImpl implements AccountFeatureProvider {
+ @Override
+ public String getAccountType() {
+ return null;
+ }
+
+ @Override
+ public Account[] getAccounts(Context context) {
+ return new Account[0];
+ }
+}
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index c0bf7d2..6127ab9 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -51,12 +51,12 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java
index 50b9ecc..0933042 100644
--- a/src/com/android/settings/accounts/ManagedProfileSettings.java
+++ b/src/com/android/settings/accounts/ManagedProfileSettings.java
@@ -104,8 +104,7 @@
private void loadDataAndPopulateUi() {
if (mWorkModePreference != null) {
- mWorkModePreference.setChecked(
- !mUserManager.isQuietModeEnabled(mManagedUser));
+ updateWorkModePreference();
}
if (mContactPrefrence != null) {
@@ -124,12 +123,20 @@
return MetricsProto.MetricsEvent.ACCOUNTS_WORK_PROFILE_SETTINGS;
}
+ private void updateWorkModePreference() {
+ boolean isWorkModeOn = !mUserManager.isQuietModeEnabled(mManagedUser);
+ mWorkModePreference.setChecked(isWorkModeOn);
+ mWorkModePreference.setSummary(isWorkModeOn
+ ? R.string.work_mode_on_summary
+ : R.string.work_mode_off_summary);
+ }
+
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (preference == mWorkModePreference) {
boolean quietModeEnabled = !(boolean) newValue;
- mUserManager.trySetQuietModeEnabled(quietModeEnabled, mManagedUser);
+ mUserManager.requestQuietModeEnabled(quietModeEnabled, mManagedUser);
return true;
}
if (preference == mContactPrefrence) {
@@ -159,8 +166,7 @@
|| action.equals(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE)) {
if (intent.getIntExtra(Intent.EXTRA_USER_HANDLE,
UserHandle.USER_NULL) == mManagedUser.getIdentifier()) {
- mWorkModePreference.setChecked(
- !mUserManager.isQuietModeEnabled(mManagedUser));
+ updateWorkModePreference();
}
return;
}
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index f20944d..0c96171 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -131,7 +131,7 @@
if (mPackageName == null) {
Intent intent = (args == null) ?
getActivity().getIntent() : (Intent) args.getParcelable("intent");
- if (intent != null) {
+ if (intent != null && intent.getData() != null) {
mPackageName = intent.getData().getSchemeSpecificPart();
}
}
diff --git a/src/com/android/settings/applications/AppStateDirectoryAccessBridge.java b/src/com/android/settings/applications/AppStateDirectoryAccessBridge.java
new file mode 100644
index 0000000..1c2a0af
--- /dev/null
+++ b/src/com/android/settings/applications/AppStateDirectoryAccessBridge.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.applications;
+
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.AUTHORITY;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PACKAGES;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PACKAGES_COLUMNS;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PACKAGES_COL_PACKAGE;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.ArraySet;
+import android.util.Log;
+
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+
+import java.util.Set;
+
+// TODO(b/72055774): add unit tests
+public class AppStateDirectoryAccessBridge extends AppStateBaseBridge {
+
+ private static final String TAG = "DirectoryAccessBridge";
+
+ // TODO(b/72055774): set to false once feature is ready (or use Log.isLoggable)
+ static final boolean DEBUG = true;
+ static final boolean VERBOSE = true;
+
+ public AppStateDirectoryAccessBridge(ApplicationsState appState, Callback callback) {
+ super(appState, callback);
+ }
+
+ @Override
+ protected void loadAllExtraInfo() { }
+
+ @Override
+ protected void updateExtraInfo(AppEntry app, String pkg, int uid) { }
+
+ public static final AppFilter FILTER_APP_HAS_DIRECTORY_ACCESS = new AppFilter() {
+
+ private Set<String> mPackages;
+
+ @Override
+ public void init() {
+ throw new UnsupportedOperationException("Need to call constructor that takes context");
+ }
+
+ @Override
+ public void init(Context context) {
+ mPackages = null;
+ final Uri providerUri = new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(AUTHORITY).appendPath(TABLE_PACKAGES).appendPath("*")
+ .build();
+ try (Cursor cursor = context.getContentResolver().query(providerUri,
+ TABLE_PACKAGES_COLUMNS, null, null)) {
+ if (cursor == null) {
+ Log.w(TAG, "Didn't get cursor for " + providerUri);
+ return;
+ }
+ final int count = cursor.getCount();
+ if (count == 0) {
+ if (DEBUG) {
+ Log.d(TAG, "No packages anymore (was " + mPackages + ")");
+ }
+ return;
+ }
+ mPackages = new ArraySet<>(count);
+ while (cursor.moveToNext()) {
+ mPackages.add(cursor.getString(TABLE_PACKAGES_COL_PACKAGE));
+ }
+ if (DEBUG) {
+ Log.d(TAG, "init(): " + mPackages);
+ }
+ }
+ }
+
+
+ @Override
+ public boolean filterApp(AppEntry info) {
+ return mPackages != null && mPackages.contains(info.info.packageName);
+ }
+ };
+}
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 78a5050..ff036bb 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -22,6 +22,7 @@
import android.app.ActivityManager;
import android.app.AlertDialog;
import android.app.AppGlobals;
+import android.app.GrantedUriPermission;
import android.app.LoaderManager;
import android.content.Context;
import android.content.DialogInterface;
@@ -399,7 +400,7 @@
// Gets all URI permissions from am.
ActivityManager am = (ActivityManager) getActivity().getSystemService(
Context.ACTIVITY_SERVICE);
- List<UriPermission> perms =
+ List<GrantedUriPermission> perms =
am.getGrantedUriPermissions(mAppEntry.info.packageName).getList();
if (perms.isEmpty()) {
@@ -411,8 +412,8 @@
// Group number of URIs by app.
Map<CharSequence, MutableInt> uriCounters = new TreeMap<>();
- for (UriPermission perm : perms) {
- String authority = perm.getUri().getAuthority();
+ for (GrantedUriPermission perm : perms) {
+ String authority = perm.uri.getAuthority();
ProviderInfo provider = pm.resolveContentProvider(authority, 0);
CharSequence app = provider.applicationInfo.loadLabel(pm);
MutableInt count = uriCounters.get(app);
diff --git a/src/com/android/settings/applications/DirectoryAccessDetails.java b/src/com/android/settings/applications/DirectoryAccessDetails.java
new file mode 100644
index 0000000..3e9bf47
--- /dev/null
+++ b/src/com/android/settings/applications/DirectoryAccessDetails.java
@@ -0,0 +1,308 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.os.storage.StorageVolume.ScopedAccessProviderContract.AUTHORITY;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_DIRECTORY;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_GRANTED;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_PACKAGE;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_VOLUME_UUID;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COLUMNS;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_DIRECTORY;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_GRANTED;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.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;
+
+import android.annotation.Nullable;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
+import android.text.TextUtils;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.ArrayMap;
+import android.util.ArraySet;
+import android.util.IconDrawableFactory;
+import android.util.Log;
+import android.util.Pair;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settings.widget.EntityHeaderController.ActionType;
+import com.android.settingslib.applications.AppUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Detailed settings for an app's directory access permissions (A.K.A Scoped Directory Access).
+ *
+ * <p>Currently, it shows the entry for which the user denied access with the "Do not ask again"
+ * flag checked on: the user than can use the settings toggle to reset that deniel.
+ *
+ * <p>This fragments dynamically lists all such permissions, starting with one preference per
+ * directory in the primary storage, then adding additional entries for the external volumes (one
+ * entry for the whole volume).
+ */
+// TODO(b/72055774): add unit tests
+public class DirectoryAccessDetails extends AppInfoBase {
+
+ @SuppressWarnings("hiding")
+ private static final String TAG = "DirectoryAccessDetails";
+
+ private boolean mCreated;
+
+ @Override
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+
+ if (mCreated) {
+ Log.w(TAG, "onActivityCreated(): ignoring duplicate call");
+ return;
+ }
+ mCreated = true;
+ if (mPackageInfo == null) {
+ Log.w(TAG, "onActivityCreated(): no package info");
+ return;
+ }
+ final Activity activity = getActivity();
+ final Preference pref = EntityHeaderController
+ .newInstance(activity, this, /* header= */ null )
+ .setRecyclerView(getListView(), getLifecycle())
+ .setIcon(IconDrawableFactory.newInstance(getPrefContext())
+ .getBadgedIcon(mPackageInfo.applicationInfo))
+ .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
+ .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
+ .setPackageName(mPackageName)
+ .setUid(mPackageInfo.applicationInfo.uid)
+ .setHasAppInfoLink(false)
+ .setButtonActions(ActionType.ACTION_NONE, ActionType.ACTION_NONE)
+ .done(activity, getPrefContext());
+ getPreferenceScreen().addPreference(pref);
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ final Context context = getPrefContext();
+ addPreferencesFromResource(R.xml.directory_access_details);
+ final PreferenceScreen prefsGroup = getPreferenceScreen();
+
+ final Map<String, ExternalVolume> externalVolumes = new HashMap<>();
+
+ final Uri providerUri = new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(AUTHORITY).appendPath(TABLE_PERMISSIONS).appendPath("*")
+ .build();
+ // Query provider for entries.
+ try (Cursor cursor = context.getContentResolver().query(providerUri,
+ TABLE_PERMISSIONS_COLUMNS, null, new String[] { mPackageName }, null)) {
+ if (cursor == null) {
+ Log.w(TAG, "Didn't get cursor for " + mPackageName);
+ return;
+ }
+ final int count = cursor.getCount();
+ if (count == 0) {
+ if (DEBUG) {
+ Log.d(TAG, "No permissions for " + mPackageName);
+ }
+ // TODO(b/72055774): display empty message
+ return;
+ }
+
+ while (cursor.moveToNext()) {
+ final String pkg = cursor.getString(TABLE_PERMISSIONS_COL_PACKAGE);
+ final String uuid = cursor.getString(TABLE_PERMISSIONS_COL_VOLUME_UUID);
+ final String dir = cursor.getString(TABLE_PERMISSIONS_COL_DIRECTORY);
+ final boolean granted = cursor.getInt(TABLE_PERMISSIONS_COL_GRANTED) == 1;
+ if (VERBOSE) {
+ Log.v(TAG, "Pkg:" + pkg + " uuid: " + uuid + " dir: " + dir
+ + " granted:" + granted);
+ }
+
+ if (!mPackageName.equals(pkg)) {
+ // Sanity check, shouldn't happen
+ Log.w(TAG, "Ignoring " + uuid + "/" + dir + " due to package mismatch: "
+ + "expected " + mPackageName + ", got " + pkg);
+ continue;
+ }
+
+ if (uuid == null) {
+ // Primary storage entry: add right away
+ prefsGroup.addPreference(newPreference(context, dir, providerUri,
+ /* uuid= */ null, dir, granted));
+ } else {
+ // External volume entry: save it for later.
+ ExternalVolume externalVolume = externalVolumes.get(uuid);
+ if (externalVolume == null) {
+ externalVolume = new ExternalVolume(uuid);
+ externalVolumes.put(uuid, externalVolume);
+ }
+ if (dir == null) {
+ // Whole volume
+ externalVolume.granted = granted;
+ } else {
+ // Directory only
+ externalVolume.children.add(new Pair<>(dir, granted));
+ }
+ }
+ }
+ }
+
+ if (VERBOSE) {
+ Log.v(TAG, "external volumes: " + externalVolumes);
+ }
+
+ if (externalVolumes.isEmpty()) {
+ // We're done!
+ return;
+ }
+
+ // Add entries from external volumes
+
+ // Query StorageManager to get the user-friendly volume names.
+ final StorageManager sm = context.getSystemService(StorageManager.class);
+ final List<VolumeInfo> volumes = sm.getVolumes();
+ if (volumes.isEmpty()) {
+ Log.w(TAG, "StorageManager returned no secondary volumes");
+ return;
+ }
+ final Map<String, String> volumeNames = new HashMap<>(volumes.size());
+ for (VolumeInfo volume : volumes) {
+ final String uuid = volume.getFsUuid();
+ if (uuid == null) continue; // Primary storage; not used.
+
+ String name = sm.getBestVolumeDescription(volume);
+ if (name == null) {
+ Log.w(TAG, "No description for " + volume + "; using uuid instead: " + uuid);
+ name = uuid;
+ }
+ volumeNames.put(uuid, name);
+ }
+ if (VERBOSE) {
+ Log.v(TAG, "UUID -> name mapping: " + volumeNames);
+ }
+
+ for (ExternalVolume volume : externalVolumes.values()) {
+ final String volumeName = volumeNames.get(volume.uuid);
+ if (volumeName == null) {
+ Log.w(TAG, "Ignoring entry for invalid UUID: " + volume.uuid);
+ continue;
+ }
+ // First add the pref for the whole volume...
+ // TODO(b/72055774): add separator
+ prefsGroup.addPreference(newPreference(context, volumeName, providerUri, volume.uuid,
+ /* dir= */ null, volume.granted));
+ // TODO(b/72055774): make sure children are gone when parent is toggled on - should be
+ // handled automatically if we're refreshing the activity on change, otherwise we'll
+ // need to explicitly remove them
+
+ // ... then the children prefs
+ volume.children.forEach((pair) -> {
+ final String dir = pair.first;
+ final String name = context.getResources()
+ .getString(R.string.directory_on_volume, volumeName, dir);
+ prefsGroup
+ .addPreference(newPreference(context, name, providerUri, volume.uuid,
+ dir, pair.second));
+ });
+ }
+ }
+
+ private SwitchPreference newPreference(Context context, String title, Uri providerUri,
+ String uuid, String dir, boolean granted) {
+ final SwitchPreference pref = new SwitchPreference(context);
+ pref.setKey(String.format("%s:%s", uuid, dir));
+ pref.setTitle(title);
+ pref.setChecked(granted);
+ pref.setOnPreferenceChangeListener((unused, value) -> {
+ resetDoNotAskAgain(context, value, providerUri, uuid, dir);
+ return true;
+ });
+ return pref;
+ }
+
+ private void resetDoNotAskAgain(Context context, Object value, Uri providerUri,
+ @Nullable String uuid, @Nullable String directory) {
+ if (!Boolean.class.isInstance(value)) {
+ // Sanity check
+ Log.wtf(TAG, "Invalid value from switch: " + value);
+ return;
+ }
+ final boolean newValue = ((Boolean) value).booleanValue();
+ if (DEBUG) {
+ Log.d(TAG, "Asking " + providerUri + " to update " + uuid + "/" + directory + " to "
+ + newValue);
+ }
+ final ContentValues values = new ContentValues(1);
+ values.put(COL_GRANTED, newValue);
+ final int updated = context.getContentResolver().update(providerUri, values,
+ null, new String[] { mPackageName, uuid, directory });
+ if (DEBUG) {
+ Log.d(TAG, "Updated " + updated + " entries for " + uuid + "/" + directory);
+ }
+ }
+
+ @Override
+ protected boolean refreshUi() {
+ return true;
+ }
+
+ @Override
+ protected AlertDialog createDialog(int id, int errorCode) {
+ return null;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsEvent.APPLICATIONS_DIRECTORY_ACCESS_DETAIL;
+ }
+
+ private static class ExternalVolume {
+ final String uuid;
+ final List<Pair<String, Boolean>> children = new ArrayList<>();
+ boolean granted;
+
+ ExternalVolume(String uuid) {
+ this.uuid = uuid;
+ }
+
+ @Override
+ public String toString() {
+ return "ExternalVolume: [uuid=" + uuid + ", granted=" + granted +
+ ", children=" + children + "]";
+ }
+ }
+}
diff --git a/src/com/android/settings/applications/LinearColorBar.java b/src/com/android/settings/applications/LinearColorBar.java
deleted file mode 100644
index b637671..0000000
--- a/src/com/android/settings/applications/LinearColorBar.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/**
- *
- */
-package com.android.settings.applications;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.LinearGradient;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Rect;
-import android.graphics.Shader;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.MotionEvent;
-import android.widget.LinearLayout;
-import com.android.settings.Utils;
-
-public class LinearColorBar extends LinearLayout {
-
- static final int RIGHT_COLOR = 0xffced7db;
- static final int GRAY_COLOR = 0xff555555;
- static final int WHITE_COLOR = 0xffffffff;
-
- private float mRedRatio;
- private float mYellowRatio;
- private float mGreenRatio;
-
- private int mLeftColor;
- private int mMiddleColor;
- private int mRightColor = RIGHT_COLOR;
-
- private boolean mShowIndicator = true;
- private boolean mShowingGreen;
-
- private OnRegionTappedListener mOnRegionTappedListener;
- private int mColoredRegions = REGION_RED | REGION_YELLOW | REGION_GREEN;
-
- final Rect mRect = new Rect();
- final Paint mPaint = new Paint();
-
- int mLastInterestingLeft, mLastInterestingRight;
- int mLineWidth;
-
- int mLastLeftDiv, mLastRightDiv;
- int mLastRegion;
-
- final Path mColorPath = new Path();
- final Path mEdgePath = new Path();
- final Paint mColorGradientPaint = new Paint();
- final Paint mEdgeGradientPaint = new Paint();
-
- public static final int REGION_RED = 1<<0;
- public static final int REGION_YELLOW = 1<<1;
- public static final int REGION_GREEN = 1<<2;
- public static final int REGION_ALL = REGION_RED | REGION_YELLOW | REGION_GREEN;
-
- public interface OnRegionTappedListener {
- public void onRegionTapped(int region);
- }
-
- public LinearColorBar(Context context, AttributeSet attrs) {
- super(context, attrs);
- setWillNotDraw(false);
- mPaint.setStyle(Paint.Style.FILL);
- mColorGradientPaint.setStyle(Paint.Style.FILL);
- mColorGradientPaint.setAntiAlias(true);
- mEdgeGradientPaint.setStyle(Paint.Style.STROKE);
- mLineWidth = getResources().getDisplayMetrics().densityDpi >= DisplayMetrics.DENSITY_HIGH
- ? 2 : 1;
- mEdgeGradientPaint.setStrokeWidth(mLineWidth);
- mEdgeGradientPaint.setAntiAlias(true);
- mLeftColor = mMiddleColor = Utils.getColorAccent(context);
- }
-
- public void setOnRegionTappedListener(OnRegionTappedListener listener) {
- if (listener != mOnRegionTappedListener) {
- mOnRegionTappedListener = listener;
- setClickable(listener != null);
- }
- }
-
- public void setColoredRegions(int regions) {
- mColoredRegions = regions;
- invalidate();
- }
-
- public void setRatios(float red, float yellow, float green) {
- mRedRatio = red;
- mYellowRatio = yellow;
- mGreenRatio = green;
- invalidate();
- }
-
- public void setColors(int red, int yellow, int green) {
- mLeftColor = red;
- mMiddleColor = yellow;
- mRightColor = green;
- updateIndicator();
- invalidate();
- }
-
- public void setShowIndicator(boolean showIndicator) {
- mShowIndicator = showIndicator;
- updateIndicator();
- invalidate();
- }
-
- public void setShowingGreen(boolean showingGreen) {
- if (mShowingGreen != showingGreen) {
- mShowingGreen = showingGreen;
- updateIndicator();
- invalidate();
- }
- }
-
- private void updateIndicator() {
- int off = getPaddingTop() - getPaddingBottom();
- if (off < 0) off = 0;
- mRect.top = off;
- mRect.bottom = getHeight();
- if (!mShowIndicator) {
- return;
- }
- if (mShowingGreen) {
- mColorGradientPaint.setShader(new LinearGradient(
- 0, 0, 0, off-2, mRightColor &0xffffff, mRightColor, Shader.TileMode.CLAMP));
- } else {
- mColorGradientPaint.setShader(new LinearGradient(
- 0, 0, 0, off-2, mMiddleColor&0xffffff, mMiddleColor, Shader.TileMode.CLAMP));
- }
- mEdgeGradientPaint.setShader(new LinearGradient(
- 0, 0, 0, off/2, 0x00a0a0a0, 0xffa0a0a0, Shader.TileMode.CLAMP));
- }
-
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- super.onSizeChanged(w, h, oldw, oldh);
- updateIndicator();
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- if (mOnRegionTappedListener != null) {
- switch (event.getAction()) {
- case MotionEvent.ACTION_DOWN: {
- final int x = (int) event.getX();
- if (x < mLastLeftDiv) {
- mLastRegion = REGION_RED;
- } else if (x < mLastRightDiv) {
- mLastRegion = REGION_YELLOW;
- } else {
- mLastRegion = REGION_GREEN;
- }
- invalidate();
- } break;
- }
- }
- return super.onTouchEvent(event);
- }
-
- @Override
- protected void dispatchSetPressed(boolean pressed) {
- invalidate();
- }
-
- @Override
- public boolean performClick() {
- if (mOnRegionTappedListener != null && mLastRegion != 0) {
- mOnRegionTappedListener.onRegionTapped(mLastRegion);
- mLastRegion = 0;
- }
- return super.performClick();
- }
-
- private int pickColor(int color, int region) {
- if (isPressed() && (mLastRegion®ion) != 0) {
- return WHITE_COLOR;
- }
- if ((mColoredRegions®ion) == 0) {
- return GRAY_COLOR;
- }
- return color;
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
-
- int width = getWidth();
-
- int left = 0;
-
- int right = left + (int)(width*mRedRatio);
- int right2 = right + (int)(width*mYellowRatio);
- int right3 = right2 + (int)(width*mGreenRatio);
-
- int indicatorLeft, indicatorRight;
- if (mShowingGreen) {
- indicatorLeft = right2;
- indicatorRight = right3;
- } else {
- indicatorLeft = right;
- indicatorRight = right2;
- }
-
- if (mLastInterestingLeft != indicatorLeft || mLastInterestingRight != indicatorRight) {
- mColorPath.reset();
- mEdgePath.reset();
- if (mShowIndicator && indicatorLeft < indicatorRight) {
- final int midTopY = mRect.top;
- final int midBottomY = 0;
- final int xoff = 2;
- mColorPath.moveTo(indicatorLeft, mRect.top);
- mColorPath.cubicTo(indicatorLeft, midBottomY,
- -xoff, midTopY,
- -xoff, 0);
- mColorPath.lineTo(width+xoff-1, 0);
- mColorPath.cubicTo(width+xoff-1, midTopY,
- indicatorRight, midBottomY,
- indicatorRight, mRect.top);
- mColorPath.close();
- final float lineOffset = mLineWidth+.5f;
- mEdgePath.moveTo(-xoff+lineOffset, 0);
- mEdgePath.cubicTo(-xoff+lineOffset, midTopY,
- indicatorLeft+lineOffset, midBottomY,
- indicatorLeft+lineOffset, mRect.top);
- mEdgePath.moveTo(width+xoff-1-lineOffset, 0);
- mEdgePath.cubicTo(width+xoff-1-lineOffset, midTopY,
- indicatorRight-lineOffset, midBottomY,
- indicatorRight-lineOffset, mRect.top);
- }
- mLastInterestingLeft = indicatorLeft;
- mLastInterestingRight = indicatorRight;
- }
-
- if (!mEdgePath.isEmpty()) {
- canvas.drawPath(mEdgePath, mEdgeGradientPaint);
- canvas.drawPath(mColorPath, mColorGradientPaint);
- }
-
- if (left < right) {
- mRect.left = left;
- mRect.right = right;
- mPaint.setColor(pickColor(mLeftColor, REGION_RED));
- canvas.drawRect(mRect, mPaint);
- width -= (right-left);
- left = right;
- }
-
- mLastLeftDiv = right;
- mLastRightDiv = right2;
-
- right = right2;
-
- if (left < right) {
- mRect.left = left;
- mRect.right = right;
- mPaint.setColor(pickColor(mMiddleColor, REGION_YELLOW));
- canvas.drawRect(mRect, mPaint);
- width -= (right-left);
- left = right;
- }
-
-
- right = left + width;
- if (left < right) {
- mRect.left = left;
- mRect.right = right;
- mPaint.setColor(pickColor(mRightColor, REGION_GREEN));
- canvas.drawRect(mRect, mPaint);
- }
- }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java
index ee954ac..3859081 100644
--- a/src/com/android/settings/applications/RecentAppsPreferenceController.java
+++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java
@@ -44,6 +44,7 @@
import com.android.settings.core.FeatureFlags;
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.wrapper.PackageManagerWrapper;
@@ -321,9 +322,13 @@
.setPackage(pkgName);
if (mPm.resolveActivity(launchIntent, 0) == null) {
- // Not visible on launcher -> likely not a user visible app, skip
- Log.d(TAG, "Not a user visible app, skipping " + pkgName);
- return false;
+ // Not visible on launcher -> likely not a user visible app, skip if non-instant.
+ final ApplicationsState.AppEntry appEntry =
+ mApplicationsState.getEntry(pkgName, mUserId);
+ if (appEntry == null || appEntry.info == null || !AppUtils.isInstant(appEntry.info)) {
+ Log.d(TAG, "Not a user visible or instant app, skipping " + pkgName);
+ return false;
+ }
}
return true;
}
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index b365435..dd8bcf8 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -43,6 +43,7 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
+import com.android.settings.widget.LinearColorBar;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java
index c10fb55..c172137 100644
--- a/src/com/android/settings/applications/UsageAccessDetails.java
+++ b/src/com/android/settings/applications/UsageAccessDetails.java
@@ -37,8 +37,8 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppStateUsageBridge.UsageState;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
OnPreferenceClickListener {
diff --git a/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java b/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java
index b10d06c..130138c 100644
--- a/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java
@@ -93,7 +93,8 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return AppUtils.isInstant(mParent.getPackageInfo().applicationInfo)
+ ? DISABLED_FOR_USER : AVAILABLE;
}
@Override
diff --git a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
index c644648..4b7631a 100644
--- a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
@@ -29,9 +29,11 @@
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
public class AppHeaderViewPreferenceController extends BasePreferenceController
- implements AppInfoDashboardFragment.Callback {
+ implements AppInfoDashboardFragment.Callback, LifecycleObserver, OnStart {
private static final String KEY_HEADER = "header_view";
@@ -40,12 +42,17 @@
private final String mPackageName;
private final Lifecycle mLifecycle;
+ private EntityHeaderController mEntityHeaderController;
+
public AppHeaderViewPreferenceController(Context context, AppInfoDashboardFragment parent,
String packageName, Lifecycle lifecycle) {
super(context, KEY_HEADER);
mParent = parent;
mPackageName = packageName;
mLifecycle = lifecycle;
+ if (mLifecycle != null) {
+ mLifecycle.addObserver(this);
+ }
}
@Override
@@ -58,18 +65,22 @@
super.displayPreference(screen);
mHeader = (LayoutPreference) screen.findPreference(KEY_HEADER);
final Activity activity = mParent.getActivity();
- EntityHeaderController
+ mEntityHeaderController = EntityHeaderController
.newInstance(activity, mParent, mHeader.findViewById(R.id.entity_header))
- .setRecyclerView(mParent.getListView(), mLifecycle)
.setPackageName(mPackageName)
- .setHasAppInfoLink(false)
.setButtonActions(EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
EntityHeaderController.ActionType.ACTION_NONE)
- .styleActionBar(activity)
.bindHeaderButtons();
}
@Override
+ public void onStart() {
+ mEntityHeaderController
+ .setRecyclerView(mParent.getListView(), mLifecycle)
+ .styleActionBar(mParent.getActivity());
+ }
+
+ @Override
public void refreshUi() {
setAppLabelAndIcon(mParent.getPackageInfo(), mParent.getAppEntry());
}
@@ -80,13 +91,11 @@
final boolean isInstantApp = AppUtils.isInstant(pkgInfo.applicationInfo);
final CharSequence summary = isInstantApp
? null : mContext.getString(Utils.getInstallationStatus(appEntry.info));
- EntityHeaderController
- .newInstance(activity, mParent, mHeader.findViewById(R.id.entity_header))
+ mEntityHeaderController
.setLabel(appEntry)
.setIcon(appEntry)
.setSummary(summary)
.setIsInstantApp(isInstantApp)
.done(activity, false /* rebindActions */);
}
-
}
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index 01d2cb8..fb5caf7 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -23,6 +23,7 @@
import com.android.settings.applications.AppStateNotificationBridge;
import com.android.settings.applications.AppStateOverlayBridge;
import com.android.settings.applications.AppStatePowerBridge;
+import com.android.settings.applications.AppStateDirectoryAccessBridge;
import com.android.settings.applications.AppStateUsageBridge;
import com.android.settings.applications.AppStateWriteSettingsBridge;
import com.android.settingslib.applications.ApplicationsState;
@@ -65,14 +66,15 @@
public static final int FILTER_APPS_WITH_OVERLAY = 10;
public static final int FILTER_APPS_WRITE_SETTINGS = 11;
public static final int FILTER_APPS_INSTALL_SOURCES = 12;
- // Next id: 13
+ public static final int FILTER_APP_HAS_DIRECTORY_ACCESS = 13;
+ // Next id: 14
private static AppFilterRegistry sRegistry;
private final AppFilterItem[] mFilters;
private AppFilterRegistry() {
- mFilters = new AppFilterItem[13];
+ mFilters = new AppFilterItem[14];
// High power whitelist, on
mFilters[FILTER_APPS_POWER_WHITELIST] = new AppFilterItem(
@@ -155,6 +157,12 @@
AppStateInstallAppsBridge.FILTER_APP_SOURCES,
FILTER_APPS_INSTALL_SOURCES,
R.string.filter_install_sources_apps);
+
+ // Apps that interacted with directory access permissions (A.K.A. Scoped Directory Access)
+ mFilters[FILTER_APP_HAS_DIRECTORY_ACCESS] = new AppFilterItem(
+ AppStateDirectoryAccessBridge.FILTER_APP_HAS_DIRECTORY_ACCESS,
+ FILTER_APP_HAS_DIRECTORY_ACCESS,
+ R.string.filter_install_sources_apps);
}
public static AppFilterRegistry getInstance() {
@@ -177,6 +185,8 @@
return FILTER_APPS_WRITE_SETTINGS;
case ManageApplications.LIST_TYPE_MANAGE_SOURCES:
return FILTER_APPS_INSTALL_SOURCES;
+ case ManageApplications.LIST_TYPE_DIRECTORY_ACCESS:
+ return FILTER_APP_HAS_DIRECTORY_ACCESS;
default:
return FILTER_APPS_ALL;
}
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index d19c472..09896dc 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -84,6 +84,7 @@
import com.android.settings.applications.AppStateNotificationBridge;
import com.android.settings.applications.AppStateOverlayBridge;
import com.android.settings.applications.AppStatePowerBridge;
+import com.android.settings.applications.AppStateDirectoryAccessBridge;
import com.android.settings.applications.AppStateUsageBridge;
import com.android.settings.applications.AppStateUsageBridge.UsageState;
import com.android.settings.applications.AppStateWriteSettingsBridge;
@@ -92,6 +93,7 @@
import com.android.settings.applications.InstalledAppCounter;
import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.applications.NotificationApps;
+import com.android.settings.applications.DirectoryAccessDetails;
import com.android.settings.applications.UsageAccessDetails;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.applications.appinfo.DrawOverlayDetails;
@@ -204,6 +206,7 @@
public static final int LIST_TYPE_GAMES = 9;
public static final int LIST_TYPE_MOVIES = 10;
public static final int LIST_TYPE_PHOTOGRAPHY = 11;
+ public static final int LIST_TYPE_DIRECTORY_ACCESS = 12;
// List types that should show instant apps.
public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
@@ -232,7 +235,7 @@
Intent intent = activity.getIntent();
Bundle args = getArguments();
int screenTitle = intent.getIntExtra(
- SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.notifications_label);
+ SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.application_info_label);
String className = args != null ? args.getString(EXTRA_CLASSNAME) : null;
if (className == null) {
className = intent.getComponent().getClassName();
@@ -279,6 +282,9 @@
mListType = LIST_TYPE_PHOTOGRAPHY;
mSortOrder = R.id.sort_order_size;
mStorageType = args.getInt(EXTRA_STORAGE_TYPE, STORAGE_TYPE_DEFAULT);
+ } else if (className.equals(Settings.DirectoryAccessSettingsActivity.class.getName())) {
+ mListType = LIST_TYPE_DIRECTORY_ACCESS;
+ screenTitle = R.string.directory_access;
} else {
mListType = LIST_TYPE_MAIN;
}
@@ -443,6 +449,8 @@
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
case LIST_TYPE_MANAGE_SOURCES:
return MetricsEvent.MANAGE_EXTERNAL_SOURCES;
+ case LIST_TYPE_DIRECTORY_ACCESS:
+ return MetricsEvent.DIRECTORY_ACCESS;
default:
return MetricsEvent.VIEW_UNKNOWN;
}
@@ -537,6 +545,10 @@
case LIST_TYPE_PHOTOGRAPHY:
startAppInfoFragment(AppStorageSettings.class, R.string.storage_photos_videos);
break;
+ case LIST_TYPE_DIRECTORY_ACCESS:
+ startAppInfoFragment(DirectoryAccessDetails.class, R.string.directory_access);
+ break;
+
// TODO: Figure out if there is a way where we can spin up the profile's settings
// process ahead of time, to avoid a long load of data when user clicks on a managed
// app. Maybe when they load the list of apps that contains managed profile apps.
@@ -840,6 +852,8 @@
mExtraInfoBridge = new AppStateWriteSettingsBridge(mContext, mState, this);
} else if (mManageApplications.mListType == LIST_TYPE_MANAGE_SOURCES) {
mExtraInfoBridge = new AppStateInstallAppsBridge(mContext, mState, this);
+ } else if (mManageApplications.mListType == LIST_TYPE_DIRECTORY_ACCESS) {
+ mExtraInfoBridge = new AppStateDirectoryAccessBridge(mState, this);
} else {
mExtraInfoBridge = null;
}
@@ -1241,6 +1255,9 @@
case LIST_TYPE_MANAGE_SOURCES:
holder.setSummary(ExternalSourcesDetails.getPreferenceSummary(mContext, entry));
break;
+ case LIST_TYPE_DIRECTORY_ACCESS:
+ holder.setSummary(null);
+ break;
default:
holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);
break;
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index a0ce733..3fd7ced 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -33,10 +33,10 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.GearPreference;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
index a12d1a8..cea0147 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
@@ -23,9 +23,9 @@
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class BluetoothDeviceRenamePreferenceController extends
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index 9898c33..2862083 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -27,14 +27,19 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.widget.GearPreference;
+import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.BluetoothCallback;
import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.HeadsetProfile;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
+
+import android.util.Log;
/**
* Update the bluetooth devices. It gets bluetooth event from {@link LocalBluetoothManager} using
@@ -45,6 +50,7 @@
* whether the {@link CachedBluetoothDevice} is relevant.
*/
public abstract class BluetoothDeviceUpdater implements BluetoothCallback {
+ private static final String TAG = "BluetoothDeviceUpdater";
private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
"persist.bluetooth.showdeviceswithoutnames";
@@ -55,6 +61,7 @@
private final boolean mShowDeviceWithoutNames;
private DashboardFragment mFragment;
+ private Preference.OnPreferenceClickListener mDevicePreferenceClickListener = null;
@VisibleForTesting
final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> {
@@ -73,6 +80,38 @@
};
+ private class PreferenceClickListener implements
+ Preference.OnPreferenceClickListener {
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ final CachedBluetoothDevice device =
+ ((BluetoothDevicePreference) preference).getBluetoothDevice();
+ if (device == null) {
+ return false;
+ }
+
+ // Set the device as active per profile only if the device supports that profile
+ // TODO: The active device selector location might change in the future
+ Log.i(TAG, "OnPreferenceClickListener: device=" + device);
+ boolean result = false;
+ A2dpProfile a2dpProfile = mLocalManager.getProfileManager().getA2dpProfile();
+ if ((a2dpProfile != null) && device.isConnectedProfile(a2dpProfile)) {
+ if (a2dpProfile.setActiveDevice(device.getDevice())) {
+ Log.i(TAG, "OnPreferenceClickListener: A2DP active device=" + device);
+ result = true;
+ }
+ }
+ HeadsetProfile headsetProfile = mLocalManager.getProfileManager().getHeadsetProfile();
+ if ((headsetProfile != null) && device.isConnectedProfile(headsetProfile)) {
+ if (headsetProfile.setActiveDevice(device.getDevice())) {
+ Log.i(TAG, "OnPreferenceClickListener: Headset active device=" + device);
+ result = true;
+ }
+ }
+ return result;
+ }
+ }
+
public BluetoothDeviceUpdater(DashboardFragment fragment,
DevicePreferenceCallback devicePreferenceCallback) {
this(fragment, devicePreferenceCallback, Utils.getLocalBtManager(fragment.getContext()));
@@ -87,6 +126,7 @@
BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false);
mPreferenceMap = new HashMap<>();
mLocalManager = localManager;
+ mDevicePreferenceClickListener = new PreferenceClickListener();
}
/**
@@ -141,6 +181,18 @@
@Override
public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {}
+ @Override
+ public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
+ Collection<CachedBluetoothDevice> cachedDevices =
+ mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
+ // TODO: The state update of the Cached Bluetooth Devices should be
+ // moved to the device manager: b/72316092
+ for (CachedBluetoothDevice cachedBluetoothDevice : cachedDevices) {
+ boolean isActive = Objects.equals(cachedBluetoothDevice, activeDevice);
+ cachedBluetoothDevice.setActiveDevice(isActive, bluetoothProfile);
+ }
+ }
+
/**
* Set the context to generate the {@link Preference}, so it could get the correct theme.
*/
@@ -176,7 +228,7 @@
new BluetoothDevicePreference(mPrefContext, cachedDevice,
mShowDeviceWithoutNames);
btPreference.setOnGearClickListener(mDeviceProfilesListener);
- btPreference.setSummary(R.string.summary_placeholder);
+ btPreference.setOnPreferenceClickListener(mDevicePreferenceClickListener);
mPreferenceMap.put(device, btPreference);
mDevicePreferenceCallback.onDeviceAdded(btPreference);
}
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index 87fa43d..0f294bd 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -27,12 +27,12 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.WirelessUtils;
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* BluetoothEnabler is a helper to manage the Bluetooth on/off checkbox
diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
index 450c7b2..1ecfed4 100644
--- a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
@@ -23,9 +23,9 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Controller that shows received files
diff --git a/src/com/android/settings/bluetooth/BluetoothLengthDeviceNameFilter.java b/src/com/android/settings/bluetooth/BluetoothLengthDeviceNameFilter.java
new file mode 100644
index 0000000..cdf5310
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothLengthDeviceNameFilter.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.bluetooth;
+
+/**
+ * Filter to max the length of a Bluetotoh device name to 248 bytes, as defined by the spec.
+ */
+public class BluetoothLengthDeviceNameFilter extends Utf8ByteLengthFilter {
+ private static final int BLUETOOTH_NAME_MAX_LENGTH_BYTES = 248;
+
+ public BluetoothLengthDeviceNameFilter() {
+ super(BLUETOOTH_NAME_MAX_LENGTH_BYTES);
+ }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
index 576e656..134bb97 100644
--- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -43,8 +43,6 @@
*/
abstract class BluetoothNameDialogFragment extends InstrumentedDialogFragment
implements TextWatcher {
- private static final int BLUETOOTH_NAME_MAX_LENGTH_BYTES = 248;
-
private AlertDialog mAlertDialog;
private Button mOkButton;
@@ -109,7 +107,7 @@
View view = layoutInflater.inflate(R.layout.dialog_edittext, null);
mDeviceNameView = (EditText) view.findViewById(R.id.edittext);
mDeviceNameView.setFilters(new InputFilter[] {
- new Utf8ByteLengthFilter(BLUETOOTH_NAME_MAX_LENGTH_BYTES)
+ new BluetoothLengthDeviceNameFilter()
});
mDeviceNameView.setText(deviceName); // set initial value before adding listener
if (!TextUtils.isEmpty(deviceName)) {
diff --git a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
index 662cd70..43d25e7 100644
--- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
@@ -77,6 +77,10 @@
}
@Override
+ public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
+ }
+
+ @Override
public void register(boolean listening) {
if (mBluetoothAdapter == null) {
return;
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index 0a90edc..207a4b0 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -277,6 +277,9 @@
public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }
+ @Override
+ public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) { }
+
/**
* Return the key of the {@link PreferenceGroup} that contains the bluetooth devices
*/
diff --git a/src/com/android/settings/bluetooth/OWNERS b/src/com/android/settings/bluetooth/OWNERS
index 2b82978..2c8d8b7 100644
--- a/src/com/android/settings/bluetooth/OWNERS
+++ b/src/com/android/settings/bluetooth/OWNERS
@@ -2,6 +2,7 @@
asargent@google.com
eisenbach@google.com
jackqdyulei@google.com
+pavlin@google.com
siyuanh@google.com
-# Emergency approvers in case the above are not available
\ No newline at end of file
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/bluetooth/Utf8ByteLengthFilter.java b/src/com/android/settings/bluetooth/Utf8ByteLengthFilter.java
index bae6e56..ab49818 100644
--- a/src/com/android/settings/bluetooth/Utf8ByteLengthFilter.java
+++ b/src/com/android/settings/bluetooth/Utf8ByteLengthFilter.java
@@ -37,7 +37,7 @@
* pairs are encoded as 4 bytes, with the caveat that the maximum
* length will be constrained more conservatively than necessary.
*/
-class Utf8ByteLengthFilter implements InputFilter {
+public class Utf8ByteLengthFilter implements InputFilter {
private final int mMaxBytes;
Utf8ByteLengthFilter(int maxBytes) {
diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
index 02b1012..2a136bc 100644
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -21,11 +21,9 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.SettingsActivity;
import com.android.settings.bluetooth.BluetoothFilesPreferenceController;
import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
import com.android.settings.bluetooth.BluetoothSwitchPreferenceController;
-import com.android.settings.bluetooth.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.deviceinfo.UsbBackend;
import com.android.settings.nfc.NfcPreferenceController;
@@ -33,7 +31,6 @@
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.drawer.CategoryKey;
import java.util.ArrayList;
import java.util.Arrays;
@@ -89,6 +86,7 @@
smsMirroringFeatureProvider.getController(context);
controllers.add(smsMirroringController);
controllers.add(new BluetoothFilesPreferenceController(context));
+ controllers.add(new BluetoothOnWhileDrivingPreferenceController(context));
return controllers;
}
diff --git a/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java b/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java
new file mode 100644
index 0000000..072de75
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context;
+import android.provider.Settings;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.core.TogglePreferenceController;
+
+/** Handles a toggle for a setting to turn on Bluetooth while driving. * */
+public class BluetoothOnWhileDrivingPreferenceController extends TogglePreferenceController
+ implements PreferenceControllerMixin {
+ static final String KEY_BLUETOOTH_ON_DRIVING = "bluetooth_on_while_driving";
+
+ public BluetoothOnWhileDrivingPreferenceController(Context context) {
+ super(context, KEY_BLUETOOTH_ON_DRIVING);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.BLUETOOTH_WHILE_DRIVING)) {
+ return AVAILABLE;
+ }
+ return DISABLED_UNSUPPORTED;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return Settings.Secure.getInt(
+ mContext.getContentResolver(),
+ Settings.Secure.BLUETOOTH_ON_WHILE_DRIVING,
+ 0)
+ != 0;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ final int value = isChecked ? 1 : 0;
+ return Settings.Secure.putInt(
+ mContext.getContentResolver(), Settings.Secure.BLUETOOTH_ON_WHILE_DRIVING, value);
+ }
+}
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index e88fb11..e1636b4 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -20,10 +20,13 @@
* This class keeps track of all feature flags in Settings.
*/
public class FeatureFlags {
- public static final String SEARCH_V2 = "settings_search_v2";
public static final String APP_INFO_V2 = "settings_app_info_v2";
public static final String CONNECTED_DEVICE_V2 = "settings_connected_device_v2";
public static final String BATTERY_SETTINGS_V2 = "settings_battery_v2";
public static final String BATTERY_DISPLAY_APP_LIST = "settings_battery_display_app_list";
public static final String SECURITY_SETTINGS_V2 = "settings_security_settings_v2";
+ public static final String ZONE_PICKER_V2 = "settings_zone_picker_v2";
+ public static final String SUGGESTION_UI_V2 = "settings_suggestion_ui_v2";
+ public static final String ABOUT_PHONE_V2 = "settings_about_phone_v2";
+ public static final String BLUETOOTH_WHILE_DRIVING = "settings_bluetooth_while_driving";
}
diff --git a/src/com/android/settings/core/InstrumentedActivity.java b/src/com/android/settings/core/InstrumentedActivity.java
index 9b24756..5ec8505 100644
--- a/src/com/android/settings/core/InstrumentedActivity.java
+++ b/src/com/android/settings/core/InstrumentedActivity.java
@@ -16,8 +16,11 @@
package com.android.settings.core;
-import com.android.settings.core.instrumentation.Instrumentable;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
+import android.os.Bundle;
+
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.core.lifecycle.ObservableActivity;
/**
@@ -25,9 +28,11 @@
*/
public abstract class InstrumentedActivity extends ObservableActivity implements Instrumentable {
- public InstrumentedActivity() {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
// Mixin that logs visibility change for activity.
- getLifecycle().addObserver(new VisibilityLoggerMixin(getMetricsCategory()));
+ getLifecycle().addObserver(new VisibilityLoggerMixin(getMetricsCategory(),
+ FeatureFactory.getFactory(this).getMetricsFeatureProvider()));
}
-
}
diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java
index 45db836..b1215b9 100644
--- a/src/com/android/settings/core/InstrumentedFragment.java
+++ b/src/com/android/settings/core/InstrumentedFragment.java
@@ -18,30 +18,28 @@
import android.content.Context;
-import com.android.settings.core.instrumentation.Instrumentable;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.survey.SurveyMixin;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.core.lifecycle.ObservableFragment;
public abstract class InstrumentedFragment extends ObservableFragment implements Instrumentable {
protected MetricsFeatureProvider mMetricsFeatureProvider;
- private final VisibilityLoggerMixin mVisibilityLoggerMixin;
-
- public InstrumentedFragment() {
- // Mixin that logs visibility change for activity.
- mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory());
- getLifecycle().addObserver(mVisibilityLoggerMixin);
- getLifecycle().addObserver(new SurveyMixin(this, getClass().getSimpleName()));
- }
+ private VisibilityLoggerMixin mVisibilityLoggerMixin;
@Override
public void onAttach(Context context) {
- super.onAttach(context);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+ mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
+ mMetricsFeatureProvider);
+ // Mixin that logs visibility change for activity.
+ getLifecycle().addObserver(mVisibilityLoggerMixin);
+ getLifecycle().addObserver(new SurveyMixin(this, getClass().getSimpleName()));
+ super.onAttach(context);
}
@Override
diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index 7e37115..278676c 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -23,11 +23,11 @@
import android.text.TextUtils;
import android.util.Log;
-import com.android.settings.core.instrumentation.Instrumentable;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.survey.SurveyMixin;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
/**
@@ -44,19 +44,17 @@
// metrics placeholder value. Only use this for development.
protected final int PLACEHOLDER_METRIC = 10000;
- private final VisibilityLoggerMixin mVisibilityLoggerMixin;
-
- public InstrumentedPreferenceFragment() {
- // Mixin that logs visibility change for activity.
- mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory());
- getLifecycle().addObserver(mVisibilityLoggerMixin);
- getLifecycle().addObserver(new SurveyMixin(this, getClass().getSimpleName()));
- }
+ private VisibilityLoggerMixin mVisibilityLoggerMixin;
@Override
public void onAttach(Context context) {
- super.onAttach(context);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+ // Mixin that logs visibility change for activity.
+ mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
+ mMetricsFeatureProvider);
+ getLifecycle().addObserver(mVisibilityLoggerMixin);
+ getLifecycle().addObserver(new SurveyMixin(this, getClass().getSimpleName()));
+ super.onAttach(context);
}
@Override
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 664dda8..ecf0584 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -20,7 +20,6 @@
import com.android.settings.ApnSettings;
import com.android.settings.DateTimeSettings;
import com.android.settings.DeviceAdminSettings;
-import com.android.settings.DeviceInfoSettings;
import com.android.settings.DisplaySettings;
import com.android.settings.IccLockSettings;
import com.android.settings.MasterClear;
@@ -37,7 +36,7 @@
import com.android.settings.accounts.AccountSyncSettings;
import com.android.settings.accounts.ChooseAccountActivity;
import com.android.settings.accounts.ManagedProfileSettings;
-import com.android.settings.accounts.UserAndAccountDashboardFragment;
+import com.android.settings.accounts.AccountDashboardFragment;
import com.android.settings.applications.AppAndNotificationDashboardFragment;
import com.android.settings.applications.DefaultAppSettings;
import com.android.settings.applications.InstalledAppDetails;
@@ -45,6 +44,7 @@
import com.android.settings.applications.NotificationApps;
import com.android.settings.applications.ProcessStatsSummary;
import com.android.settings.applications.ProcessStatsUi;
+import com.android.settings.applications.DirectoryAccessDetails;
import com.android.settings.applications.UsageAccessDetails;
import com.android.settings.applications.VrListenerSettings;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
@@ -57,6 +57,7 @@
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld;
import com.android.settings.datausage.DataPlanUsageSummary;
@@ -64,6 +65,7 @@
import com.android.settings.datausage.DataUsageSummary;
import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.deviceinfo.DeviceInfoSettings;
import com.android.settings.deviceinfo.PrivateVolumeForget;
import com.android.settings.deviceinfo.PrivateVolumeSettings;
import com.android.settings.deviceinfo.PublicVolumeSettings;
@@ -247,12 +249,14 @@
ConnectedDeviceDashboardFragment.class.getName(),
ConnectedDeviceDashboardFragmentOld.class.getName(),
AppAndNotificationDashboardFragment.class.getName(),
- UserAndAccountDashboardFragment.class.getName(),
+ AccountDashboardFragment.class.getName(),
EnterprisePrivacySettings.class.getName(),
WebViewAppPicker.class.getName(),
LockscreenDashboardFragment.class.getName(),
BluetoothDeviceDetailsFragment.class.getName(),
- DataUsageList.class.getName()
+ DataUsageList.class.getName(),
+ DirectoryAccessDetails.class.getName(),
+ AdvancedConnectedDeviceDashboardFragment.class.getName()
};
public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -266,7 +270,7 @@
Settings.StorageDashboardActivity.class.getName(),
Settings.PowerUsageSummaryActivity.class.getName(),
Settings.PowerUsageSummaryLegacyActivity.class.getName(),
- Settings.UserAndAccountDashboardActivity.class.getName(),
+ Settings.AccountDashboardActivity.class.getName(),
Settings.SecuritySettingsActivity.class.getName(),
Settings.SecuritySettingsActivityV2.class.getName(),
Settings.AccessibilitySettingsActivity.class.getName(),
@@ -294,5 +298,6 @@
Settings.DateTimeSettingsActivity.class.getName(),
Settings.DeviceInfoSettingsActivity.class.getName(),
Settings.EnterprisePrivacySettingsActivity.class.getName(),
+ Settings.MyDeviceInfoActivity.class.getName(),
};
}
diff --git a/src/com/android/settings/core/instrumentation/EventLogWriter.java b/src/com/android/settings/core/instrumentation/EventLogWriter.java
deleted file mode 100644
index 3196f76..0000000
--- a/src/com/android/settings/core/instrumentation/EventLogWriter.java
+++ /dev/null
@@ -1,110 +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.core.instrumentation;
-
-import android.content.Context;
-import android.metrics.LogMaker;
-import android.util.Log;
-import android.util.Pair;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto;
-
-/**
- * {@link LogWriter} that writes data to eventlog.
- */
-public class EventLogWriter implements LogWriter {
-
- private final MetricsLogger mMetricsLogger = new MetricsLogger();
-
- public void visible(Context context, int source, int category) {
- final LogMaker logMaker = new LogMaker(category)
- .setType(MetricsProto.MetricsEvent.TYPE_OPEN)
- .addTaggedData(MetricsProto.MetricsEvent.FIELD_CONTEXT, source);
- MetricsLogger.action(logMaker);
- }
-
- public void hidden(Context context, int category) {
- MetricsLogger.hidden(context, category);
- }
-
- public void action(int category, int value, Pair<Integer, Object>... taggedData) {
- if (taggedData == null || taggedData.length == 0) {
- mMetricsLogger.action(category, value);
- } else {
- final LogMaker logMaker = new LogMaker(category)
- .setType(MetricsProto.MetricsEvent.TYPE_ACTION)
- .setSubtype(value);
- for (Pair<Integer, Object> pair : taggedData) {
- logMaker.addTaggedData(pair.first, pair.second);
- }
- mMetricsLogger.write(logMaker);
- }
- }
-
- public void action(int category, boolean value, Pair<Integer, Object>... taggedData) {
- action(category, value ? 1 : 0, taggedData);
- }
-
- public void action(Context context, int category, Pair<Integer, Object>... taggedData) {
- action(context, category, "", taggedData);
- }
-
- public void actionWithSource(Context context, int source, int category) {
- final LogMaker logMaker = new LogMaker(category)
- .setType(MetricsProto.MetricsEvent.TYPE_ACTION);
- if (source != MetricsProto.MetricsEvent.VIEW_UNKNOWN) {
- logMaker.addTaggedData(MetricsProto.MetricsEvent.FIELD_CONTEXT, source);
- }
- MetricsLogger.action(logMaker);
- }
-
- /** @deprecated use {@link #action(int, int, Pair[])} */
- @Deprecated
- public void action(Context context, int category, int value) {
- MetricsLogger.action(context, category, value);
- }
-
- /** @deprecated use {@link #action(int, boolean, Pair[])} */
- @Deprecated
- public void action(Context context, int category, boolean value) {
- MetricsLogger.action(context, category, value);
- }
-
- public void action(Context context, int category, String pkg,
- Pair<Integer, Object>... taggedData) {
- if (taggedData == null || taggedData.length == 0) {
- MetricsLogger.action(context, category, pkg);
- } else {
- final LogMaker logMaker = new LogMaker(category)
- .setType(MetricsProto.MetricsEvent.TYPE_ACTION)
- .setPackageName(pkg);
- for (Pair<Integer, Object> pair : taggedData) {
- logMaker.addTaggedData(pair.first, pair.second);
- }
- MetricsLogger.action(logMaker);
- }
- }
-
- public void count(Context context, String name, int value) {
- MetricsLogger.count(context, name, value);
- }
-
- public void histogram(Context context, String name, int bucket) {
- MetricsLogger.histogram(context, name, bucket);
- }
-}
diff --git a/src/com/android/settings/core/instrumentation/Instrumentable.java b/src/com/android/settings/core/instrumentation/Instrumentable.java
deleted file mode 100644
index f58e140..0000000
--- a/src/com/android/settings/core/instrumentation/Instrumentable.java
+++ /dev/null
@@ -1,28 +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.core.instrumentation;
-
-public interface Instrumentable {
-
- int METRICS_CATEGORY_UNKNOWN = 0;
-
- /**
- * Instrumented name for a view as defined in
- * {@link com.android.internal.logging.nano.MetricsProto.MetricsEvent}.
- */
- int getMetricsCategory();
-}
diff --git a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
index 5a9ab56..0a214f1 100644
--- a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
+++ b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
@@ -19,6 +19,9 @@
import com.android.settings.DialogCreatable;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.core.lifecycle.ObservableDialogFragment;
public abstract class InstrumentedDialogFragment extends ObservableDialogFragment
@@ -38,13 +41,15 @@
public InstrumentedDialogFragment(DialogCreatable dialogCreatable, int dialogId) {
mDialogCreatable = dialogCreatable;
mDialogId = dialogId;
- mLifecycle.addObserver(new VisibilityLoggerMixin(getMetricsCategory()));
}
-
@Override
public void onAttach(Context context) {
super.onAttach(context);
- mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+ mMetricsFeatureProvider = FeatureFactory.getFactory(context)
+ .getMetricsFeatureProvider();
+ mLifecycle.addObserver(new VisibilityLoggerMixin(getMetricsCategory(),
+ mMetricsFeatureProvider));
+ mLifecycle.onAttach(context);
}
}
diff --git a/src/com/android/settings/core/instrumentation/LogWriter.java b/src/com/android/settings/core/instrumentation/LogWriter.java
deleted file mode 100644
index 062d46f..0000000
--- a/src/com/android/settings/core/instrumentation/LogWriter.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.core.instrumentation;
-
-import android.content.Context;
-import android.util.Pair;
-
-/**
- * Generic log writer interface.
- */
-public interface LogWriter {
-
- /**
- * Logs a visibility event when view becomes visible.
- */
- void visible(Context context, int source, int category);
-
- /**
- * Logs a visibility event when view becomes hidden.
- */
- void hidden(Context context, int category);
-
- /**
- * Logs a user action.
- */
- void action(int category, int value, Pair<Integer, Object>... taggedData);
-
- /**
- * Logs a user action.
- */
- void action(int category, boolean value, Pair<Integer, Object>... taggedData);
-
- /**
- * Logs an user action.
- */
- void action(Context context, int category, Pair<Integer, Object>... taggedData);
-
- /**
- * Logs an user action.
- */
- void actionWithSource(Context context, int source, int category);
-
- /**
- * Logs an user action.
- * @deprecated use {@link #action(int, int, Pair[])}
- */
- @Deprecated
- void action(Context context, int category, int value);
-
- /**
- * Logs an user action.
- * @deprecated use {@link #action(int, boolean, Pair[])}
- */
- @Deprecated
- void action(Context context, int category, boolean value);
-
- /**
- * Logs an user action.
- */
- void action(Context context, int category, String pkg, Pair<Integer, Object>... taggedData);
-
- /**
- * Logs a count.
- */
- void count(Context context, String name, int value);
-
- /**
- * Logs a histogram event.
- */
- void histogram(Context context, String name, int bucket);
-}
diff --git a/src/com/android/settings/core/instrumentation/MetricsFeatureProvider.java b/src/com/android/settings/core/instrumentation/MetricsFeatureProvider.java
deleted file mode 100644
index 166cbb8..0000000
--- a/src/com/android/settings/core/instrumentation/MetricsFeatureProvider.java
+++ /dev/null
@@ -1,159 +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.core.instrumentation;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.text.TextUtils;
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * FeatureProvider for metrics.
- */
-public class MetricsFeatureProvider {
- private List<LogWriter> mLoggerWriters;
-
- public MetricsFeatureProvider() {
- mLoggerWriters = new ArrayList<>();
- installLogWriters();
- }
-
- protected void installLogWriters() {
- mLoggerWriters.add(new EventLogWriter());
- }
-
- public void visible(Context context, int source, int category) {
- for (LogWriter writer : mLoggerWriters) {
- writer.visible(context, source, category);
- }
- }
-
- public void hidden(Context context, int category) {
- for (LogWriter writer : mLoggerWriters) {
- writer.hidden(context, category);
- }
- }
-
- public void actionWithSource(Context context, int source, int category) {
- for (LogWriter writer : mLoggerWriters) {
- writer.actionWithSource(context, source, category);
- }
- }
-
- /**
- * Logs a user action. Includes the elapsed time since the containing
- * fragment has been visible.
- */
- public void action(VisibilityLoggerMixin visibilityLogger, int category, int value) {
- for (LogWriter writer : mLoggerWriters) {
- writer.action(category, value,
- sinceVisibleTaggedData(visibilityLogger.elapsedTimeSinceVisible()));
- }
- }
-
- /**
- * Logs a user action. Includes the elapsed time since the containing
- * fragment has been visible.
- */
- public void action(VisibilityLoggerMixin visibilityLogger, int category, boolean value) {
- for (LogWriter writer : mLoggerWriters) {
- writer.action(category, value,
- sinceVisibleTaggedData(visibilityLogger.elapsedTimeSinceVisible()));
- }
- }
-
- public void action(Context context, int category, Pair<Integer, Object>... taggedData) {
- for (LogWriter writer : mLoggerWriters) {
- writer.action(context, category, taggedData);
- }
- }
-
- /** @deprecated use {@link #action(VisibilityLoggerMixin, int, int)} */
- @Deprecated
- public void action(Context context, int category, int value) {
- for (LogWriter writer : mLoggerWriters) {
- writer.action(context, category, value);
- }
- }
-
- /** @deprecated use {@link #action(VisibilityLoggerMixin, int, boolean)} */
- @Deprecated
- public void action(Context context, int category, boolean value) {
- for (LogWriter writer : mLoggerWriters) {
- writer.action(context, category, value);
- }
- }
-
- public void action(Context context, int category, String pkg,
- Pair<Integer, Object>... taggedData) {
- for (LogWriter writer : mLoggerWriters) {
- writer.action(context, category, pkg, taggedData);
- }
- }
-
- public void count(Context context, String name, int value) {
- for (LogWriter writer : mLoggerWriters) {
- writer.count(context, name, value);
- }
- }
-
- public void histogram(Context context, String name, int bucket) {
- for (LogWriter writer : mLoggerWriters) {
- writer.histogram(context, name, bucket);
- }
- }
-
- public int getMetricsCategory(Object object) {
- if (object == null || !(object instanceof Instrumentable)) {
- return MetricsEvent.VIEW_UNKNOWN;
- }
- return ((Instrumentable) object).getMetricsCategory();
- }
-
- public void logDashboardStartIntent(Context context, Intent intent,
- int sourceMetricsCategory) {
- if (intent == null) {
- return;
- }
- final ComponentName cn = intent.getComponent();
- if (cn == null) {
- final String action = intent.getAction();
- if (TextUtils.isEmpty(action)) {
- // Not loggable
- return;
- }
- action(context, MetricsEvent.ACTION_SETTINGS_TILE_CLICK, action,
- Pair.create(MetricsEvent.FIELD_CONTEXT, sourceMetricsCategory));
- return;
- } else if (TextUtils.equals(cn.getPackageName(), context.getPackageName())) {
- // Going to a Setting internal page, skip click logging in favor of page's own
- // visibility logging.
- return;
- }
- action(context, MetricsEvent.ACTION_SETTINGS_TILE_CLICK, cn.flattenToString(),
- Pair.create(MetricsEvent.FIELD_CONTEXT, sourceMetricsCategory));
- }
-
- private Pair<Integer, Object> sinceVisibleTaggedData(long timestamp) {
- return Pair.create(MetricsEvent.NOTIFICATION_SINCE_VISIBLE_MILLIS, timestamp);
- }
-}
diff --git a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
deleted file mode 100644
index dee40c0..0000000
--- a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
+++ /dev/null
@@ -1,259 +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.core.instrumentation;
-
-import android.annotation.Nullable;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.os.AsyncTask;
-import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.overlay.FeatureFactory;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentSkipListSet;
-
-public class SharedPreferencesLogger implements SharedPreferences {
-
- private static final String LOG_TAG = "SharedPreferencesLogger";
-
- private final String mTag;
- private final Context mContext;
- private final MetricsFeatureProvider mMetricsFeature;
- private final Set<String> mPreferenceKeySet;
-
- public SharedPreferencesLogger(Context context, String tag) {
- mContext = context;
- mTag = tag;
- mMetricsFeature = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
- mPreferenceKeySet = new ConcurrentSkipListSet<>();
- }
-
- @Override
- public Map<String, ?> getAll() {
- return null;
- }
-
- @Override
- public String getString(String key, @Nullable String defValue) {
- return defValue;
- }
-
- @Override
- public Set<String> getStringSet(String key, @Nullable Set<String> defValues) {
- return defValues;
- }
-
- @Override
- public int getInt(String key, int defValue) {
- return defValue;
- }
-
- @Override
- public long getLong(String key, long defValue) {
- return defValue;
- }
-
- @Override
- public float getFloat(String key, float defValue) {
- return defValue;
- }
-
- @Override
- public boolean getBoolean(String key, boolean defValue) {
- return defValue;
- }
-
- @Override
- public boolean contains(String key) {
- return false;
- }
-
- @Override
- public Editor edit() {
- return new EditorLogger();
- }
-
- @Override
- public void registerOnSharedPreferenceChangeListener(
- OnSharedPreferenceChangeListener listener) {
- }
-
- @Override
- public void unregisterOnSharedPreferenceChangeListener(
- OnSharedPreferenceChangeListener listener) {
- }
-
- private void logValue(String key, Object value) {
- logValue(key, value, false /* forceLog */);
- }
-
- private void logValue(String key, Object value, boolean forceLog) {
- final String prefKey = buildPrefKey(mTag, key);
- if (!forceLog && !mPreferenceKeySet.contains(prefKey)) {
- // Pref key doesn't exist in set, this is initial display so we skip metrics but
- // keeps track of this key.
- mPreferenceKeySet.add(prefKey);
- return;
- }
- // TODO: Remove count logging to save some resource.
- mMetricsFeature.count(mContext, buildCountName(prefKey, value), 1);
-
- final Pair<Integer, Object> valueData;
- if (value instanceof Long) {
- final Long longVal = (Long) value;
- final int intVal;
- if (longVal > Integer.MAX_VALUE) {
- intVal = Integer.MAX_VALUE;
- } else if (longVal < Integer.MIN_VALUE) {
- intVal = Integer.MIN_VALUE;
- } else {
- intVal = longVal.intValue();
- }
- valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE,
- intVal);
- } else if (value instanceof Integer) {
- valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE,
- value);
- } else if (value instanceof Boolean) {
- valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE,
- (Boolean) value ? 1 : 0);
- } else if (value instanceof Float) {
- valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE,
- value);
- } else if (value instanceof String) {
- Log.d(LOG_TAG, "Tried to log string preference " + prefKey + " = " + value);
- valueData = null;
- } else {
- Log.w(LOG_TAG, "Tried to log unloggable object" + value);
- valueData = null;
- }
- if (valueData != null) {
- // Pref key exists in set, log it's change in metrics.
- mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE,
- Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, prefKey),
- valueData);
- }
- }
-
- @VisibleForTesting
- void logPackageName(String key, String value) {
- final String prefKey = mTag + "/" + key;
- mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE, value,
- Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, prefKey));
- }
-
- private void safeLogValue(String key, String value) {
- new AsyncPackageCheck().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, key, value);
- }
-
- public static String buildCountName(String prefKey, Object value) {
- return prefKey + "|" + value;
- }
-
- public static String buildPrefKey(String tag, String key) {
- return tag + "/" + key;
- }
-
- private class AsyncPackageCheck extends AsyncTask<String, Void, Void> {
- @Override
- protected Void doInBackground(String... params) {
- String key = params[0];
- String value = params[1];
- PackageManager pm = mContext.getPackageManager();
- try {
- // Check if this might be a component.
- ComponentName name = ComponentName.unflattenFromString(value);
- if (value != null) {
- value = name.getPackageName();
- }
- } catch (Exception e) {
- }
- try {
- pm.getPackageInfo(value, PackageManager.MATCH_ANY_USER);
- logPackageName(key, value);
- } catch (PackageManager.NameNotFoundException e) {
- // Clearly not a package, and it's unlikely this preference is in prefSet, so
- // lets force log it.
- logValue(key, value, true /* forceLog */);
- }
- return null;
- }
- }
-
- public class EditorLogger implements Editor {
- @Override
- public Editor putString(String key, @Nullable String value) {
- safeLogValue(key, value);
- return this;
- }
-
- @Override
- public Editor putStringSet(String key, @Nullable Set<String> values) {
- safeLogValue(key, TextUtils.join(",", values));
- return this;
- }
-
- @Override
- public Editor putInt(String key, int value) {
- logValue(key, value);
- return this;
- }
-
- @Override
- public Editor putLong(String key, long value) {
- logValue(key, value);
- return this;
- }
-
- @Override
- public Editor putFloat(String key, float value) {
- logValue(key, value);
- return this;
- }
-
- @Override
- public Editor putBoolean(String key, boolean value) {
- logValue(key, value);
- return this;
- }
-
- @Override
- public Editor remove(String key) {
- return this;
- }
-
- @Override
- public Editor clear() {
- return this;
- }
-
- @Override
- public boolean commit() {
- return true;
- }
-
- @Override
- public void apply() {
- }
- }
-}
diff --git a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
deleted file mode 100644
index 2fe2a3b..0000000
--- a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
+++ /dev/null
@@ -1,100 +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.core.instrumentation;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-
-import android.os.SystemClock;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsActivity;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnAttach;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-
-import static com.android.settings.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
-
-/**
- * Logs visibility change of a fragment.
- */
-public class VisibilityLoggerMixin implements LifecycleObserver, OnResume, OnPause, OnAttach {
-
- private static final String TAG = "VisibilityLoggerMixin";
-
- private final int mMetricsCategory;
-
- private MetricsFeatureProvider mMetricsFeature;
- private int mSourceMetricsCategory = MetricsProto.MetricsEvent.VIEW_UNKNOWN;
- private long mVisibleTimestamp;
-
- public VisibilityLoggerMixin(int metricsCategory) {
- // MetricsFeature will be set during onAttach.
- this(metricsCategory, null /* metricsFeature */);
- }
-
- public VisibilityLoggerMixin(int metricsCategory, MetricsFeatureProvider metricsFeature) {
- mMetricsCategory = metricsCategory;
- mMetricsFeature = metricsFeature;
- }
-
- @Override
- public void onAttach(Context context) {
- mMetricsFeature = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
- }
-
- @Override
- public void onResume() {
- mVisibleTimestamp = SystemClock.elapsedRealtime();
- if (mMetricsFeature != null && mMetricsCategory != METRICS_CATEGORY_UNKNOWN) {
- mMetricsFeature.visible(null /* context */, mSourceMetricsCategory, mMetricsCategory);
- }
- }
-
- @Override
- public void onPause() {
- mVisibleTimestamp = 0;
- if (mMetricsFeature != null && mMetricsCategory != METRICS_CATEGORY_UNKNOWN) {
- mMetricsFeature.hidden(null /* context */, mMetricsCategory);
- }
- }
-
- /**
- * Sets source metrics category for this logger. Source is the caller that opened this UI.
- */
- public void setSourceMetricsCategory(Activity activity) {
- if (mSourceMetricsCategory != MetricsProto.MetricsEvent.VIEW_UNKNOWN || activity == null) {
- return;
- }
- final Intent intent = activity.getIntent();
- if (intent == null) {
- return;
- }
- mSourceMetricsCategory = intent.getIntExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY,
- MetricsProto.MetricsEvent.VIEW_UNKNOWN);
- }
-
- /** Returns elapsed time since onResume() */
- public long elapsedTimeSinceVisible() {
- if (mVisibleTimestamp == 0) {
- return 0;
- }
- return SystemClock.elapsedRealtime() - mVisibleTimestamp;
- }
-}
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 97eef13..9b23417 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -41,17 +41,17 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.R.id;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardData.SuggestionConditionHeaderData;
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.dashboard.suggestions.SuggestionControllerMixin;
import com.android.settings.dashboard.suggestions.SuggestionDismissController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.Utils;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionControllerMixin;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/settings/dashboard/DashboardAdapterV2.java b/src/com/android/settings/dashboard/DashboardAdapterV2.java
new file mode 100644
index 0000000..7cd4f38
--- /dev/null
+++ b/src/com/android/settings/dashboard/DashboardAdapterV2.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.dashboard;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+import android.os.Bundle;
+import android.service.settings.suggestions.Suggestion;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.util.DiffUtil;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+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 com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.R.id;
+import com.android.settings.dashboard.DashboardDataV2.ConditionHeaderData;
+import com.android.settings.dashboard.conditional.Condition;
+import com.android.settings.dashboard.conditional.ConditionAdapterV2;
+import com.android.settings.dashboard.suggestions.SuggestionAdapterV2;
+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.suggestions.SuggestionControllerMixin;
+
+import java.util.List;
+
+public class DashboardAdapterV2 extends RecyclerView.Adapter<DashboardAdapterV2.DashboardItemHolder>
+ implements SummaryLoader.SummaryConsumer, SuggestionAdapterV2.Callback, LifecycleObserver,
+ OnSaveInstanceState {
+ public static final String TAG = "DashboardAdapterV2";
+ private static final String STATE_CATEGORY_LIST = "category_list";
+
+ @VisibleForTesting
+ static final String STATE_CONDITION_EXPANDED = "condition_expanded";
+
+ private final IconCache mCache;
+ private final Context mContext;
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
+ private final DashboardFeatureProvider mDashboardFeatureProvider;
+ private boolean mFirstFrameDrawn;
+ private RecyclerView mRecyclerView;
+ private SuggestionAdapterV2 mSuggestionAdapter;
+
+ @VisibleForTesting
+ DashboardDataV2 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 DashboardAdapterV2(Context context, Bundle savedInstanceState,
+ List<Condition> conditions, SuggestionControllerMixin 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 SuggestionAdapterV2(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 DashboardDataV2.Builder()
+ .setConditions(conditions)
+ .setSuggestions(mSuggestionAdapter.getSuggestions())
+ .setCategory(category)
+ .setConditionExpanded(conditionExpanded)
+ .build();
+ }
+
+ public void setSuggestions(List<Suggestion> data) {
+ final DashboardDataV2 prevData = mDashboardData;
+ mDashboardData = new DashboardDataV2.Builder(prevData)
+ .setSuggestions(data)
+ .build();
+ notifyDashboardDataChanged(prevData);
+ }
+
+ public void setCategory(DashboardCategory category) {
+ final DashboardDataV2 prevData = mDashboardData;
+ Log.d(TAG, "adapter setCategory called");
+ mDashboardData = new DashboardDataV2.Builder(prevData)
+ .setCategory(category)
+ .build();
+ notifyDashboardDataChanged(prevData);
+ }
+
+ public void setConditions(List<Condition> conditions) {
+ final DashboardDataV2 prevData = mDashboardData;
+ Log.d(TAG, "adapter setConditions called");
+ mDashboardData = new DashboardDataV2.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) {
+ return;
+ }
+ if (list.size() == 1) {
+ // The only suggestion is dismissed, and the the empty suggestion container will
+ // remain as the dashboard item. Need to refresh the dashboard list.
+ final DashboardDataV2 prevData = mDashboardData;
+ mDashboardData = new DashboardDataV2.Builder(prevData)
+ .setSuggestions(null)
+ .build();
+ notifyDashboardDataChanged(prevData);
+ } else {
+ mSuggestionAdapter.removeSuggestion(suggestion);
+ }
+ }
+
+ @Override
+ public void notifySummaryChanged(Tile tile) {
+ final int position = mDashboardData.getPositionByTile(tile);
+ if (position != DashboardDataV2.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.suggestion_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.suggestion_condition_header:
+ onBindConditionHeader((ConditionHeaderHolder) holder,
+ (ConditionHeaderData) mDashboardData.getItemEntityByPosition(position));
+ break;
+ case R.layout.suggestion_condition_footer:
+ holder.itemView.setOnClickListener(v -> {
+ mMetricsFeatureProvider.action(mContext,
+ MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, false);
+ DashboardDataV2 prevData = mDashboardData;
+ mDashboardData = new DashboardDataV2.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(DashboardDataV2 prevData) {
+ if (mFirstFrameDrawn && prevData != null) {
+ final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new DashboardDataV2
+ .ItemsDataDiffCallback(prevData.getItemList(), mDashboardData.getItemList()));
+ diffResult.dispatchUpdatesTo(this);
+ } else {
+ mFirstFrameDrawn = true;
+ notifyDataSetChanged();
+ }
+ }
+
+ @VisibleForTesting
+ void onBindConditionHeader(final ConditionHeaderHolder holder, ConditionHeaderData data) {
+ holder.icon.setImageIcon(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 DashboardDataV2 prevData = mDashboardData;
+ mDashboardData = new DashboardDataV2.Builder(prevData)
+ .setConditionExpanded(true).build();
+ notifyDashboardDataChanged(prevData);
+ scrollToTopOfConditions();
+ });
+ }
+
+ @VisibleForTesting
+ void onBindCondition(final ConditionContainerHolder holder, int position) {
+ final ConditionAdapterV2 adapter = new ConditionAdapterV2(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);
+ final int suggestionCount = suggestions.size();
+ if (suggestions != null && suggestionCount > 0) {
+ holder.summary.setText("" + suggestionCount);
+ 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) {
+ Drawable icon = mCache.getIcon(tile.icon);
+ if (!TextUtils.equals(tile.icon.getResPackage(), mContext.getPackageName())) {
+ icon = new RoundedHomepageIcon(mContext, icon);
+ mCache.updateIcon(tile.icon, 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<Icon> 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.setImageIcon(icons.get(i));
+ parent.addView(icon);
+ }
+ parent.setVisibility(View.VISIBLE);
+ }
+
+ private void scrollToTopOfConditions() {
+ mRecyclerView.scrollToPosition(mDashboardData.hasSuggestion() ? 1 : 0);
+ }
+
+ public static class IconCache {
+ private final Context mContext;
+ private final ArrayMap<Icon, Drawable> mMap = new ArrayMap<>();
+
+ public IconCache(Context context) {
+ mContext = context;
+ }
+
+ public Drawable getIcon(Icon icon) {
+ if (icon == null) {
+ return null;
+ }
+ Drawable drawable = mMap.get(icon);
+ if (drawable == null) {
+ drawable = icon.loadDrawable(mContext);
+ updateIcon(icon, drawable);
+ }
+ return drawable;
+ }
+
+ public void updateIcon(Icon icon, Drawable drawable) {
+ mMap.put(icon, drawable);
+ }
+ }
+
+ 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/DashboardDataV2.java b/src/com/android/settings/dashboard/DashboardDataV2.java
new file mode 100644
index 0000000..e25ee05
--- /dev/null
+++ b/src/com/android/settings/dashboard/DashboardDataV2.java
@@ -0,0 +1,446 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Icon;
+import android.service.settings.suggestions.Suggestion;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.util.DiffUtil;
+import android.text.TextUtils;
+
+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 DashboardDataV2 {
+ public static final int POSITION_NOT_FOUND = -1;
+ public static final int MAX_SUGGESTION_COUNT = 4;
+
+ // 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 DashboardDataV2(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(suggestions, 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.suggestion_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.suggestion_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;
+ }
+ return suggestions.subList(0, MAX_SUGGESTION_COUNT);
+ }
+
+ /**
+ * 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(DashboardDataV2 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 DashboardDataV2 build() {
+ return new DashboardDataV2(this);
+ }
+ }
+
+ /**
+ * A DiffCallback to calculate the difference between old and new Item
+ * List in DashboardDataV2
+ */
+ 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 DashboardDataV2.
+ */
+ 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.suggestion_condition_header;
+ private static final int TYPE_CONDITION_FOOTER =
+ R.layout.suggestion_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:
+ // If entity is suggestion and contains remote view, force refresh
+ final List entities = (List) entity;
+ if (!entities.isEmpty()) {
+ Object firstEntity = entities.get(0);
+ if (firstEntity instanceof Tile
+ && ((Tile) firstEntity).remoteViews != null) {
+ return false;
+ }
+ }
+ // Otherwise 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<Icon> 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());
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
index 3ca146b..e0873f5 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
@@ -56,7 +56,9 @@
/**
* Whether or not we should tint icons in setting pages.
+ * @deprecated in favor of color icons in homepage
*/
+ @Deprecated
boolean shouldTintIcon();
/**
@@ -88,4 +90,9 @@
*/
void openTileIntent(Activity activity, Tile tile);
+ /**
+ * Whether or not we should use the v2 of suggestions UI.
+ */
+ boolean useSuggestionUiV2();
+
}
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 048f6ed..a14d9e9 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -33,14 +33,17 @@
import android.support.v7.preference.Preference;
import android.text.TextUtils;
import android.util.ArrayMap;
+import android.util.FeatureFlagUtils;
import android.util.Log;
import android.util.Pair;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.drawer.CategoryManager;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.ProfileSelectDialog;
@@ -157,7 +160,8 @@
pref.setFragment(clsName);
} else if (tile.intent != null) {
final Intent intent = new Intent(tile.intent);
- intent.putExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY, sourceMetricsCategory);
+ intent.putExtra(VisibilityLoggerMixin.EXTRA_SOURCE_METRICS_CATEGORY,
+ sourceMetricsCategory);
if (action != null) {
intent.setAction(action);
}
@@ -206,13 +210,18 @@
return;
}
final Intent intent = new Intent(tile.intent)
- .putExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY,
+ .putExtra(VisibilityLoggerMixin.EXTRA_SOURCE_METRICS_CATEGORY,
MetricsEvent.DASHBOARD_SUMMARY)
.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true)
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
launchIntentOrSelectProfile(activity, tile, intent, MetricsEvent.DASHBOARD_SUMMARY);
}
+ @Override
+ public boolean useSuggestionUiV2() {
+ return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SUGGESTION_UI_V2);
+ }
+
private void bindSummary(Preference preference, Tile tile) {
if (tile.summary != null) {
preference.setSummary(tile.summary);
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index 0536403..bb575ea 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -20,7 +20,7 @@
import com.android.settings.DisplaySettings;
import com.android.settings.accounts.AccountDetailDashboardFragment;
-import com.android.settings.accounts.UserAndAccountDashboardFragment;
+import com.android.settings.accounts.AccountDashboardFragment;
import com.android.settings.applications.AppAndNotificationDashboardFragment;
import com.android.settings.applications.DefaultAppSettings;
import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
@@ -81,7 +81,7 @@
CategoryKey.CATEGORY_SECURITY);
PARENT_TO_CATEGORY_KEY_MAP.put(AccountDetailDashboardFragment.class.getName(),
CategoryKey.CATEGORY_ACCOUNT_DETAIL);
- PARENT_TO_CATEGORY_KEY_MAP.put(UserAndAccountDashboardFragment.class.getName(),
+ PARENT_TO_CATEGORY_KEY_MAP.put(AccountDashboardFragment.class.getName(),
CategoryKey.CATEGORY_ACCOUNT);
PARENT_TO_CATEGORY_KEY_MAP.put(
SystemDashboardFragment.class.getName(), CategoryKey.CATEGORY_SYSTEM);
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 61c202e..fc82d41 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -38,7 +38,6 @@
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.SuggestionControllerMixin;
import com.android.settings.dashboard.suggestions.SuggestionDismissController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.ActionBarShadowController;
@@ -46,6 +45,7 @@
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.SettingsDrawerActivity;
import com.android.settingslib.drawer.SettingsDrawerActivity.CategoryListener;
+import com.android.settingslib.suggestions.SuggestionControllerMixin;
import com.android.settingslib.utils.ThreadUtils;
import java.util.List;
@@ -65,6 +65,7 @@
private FocusRecyclerView mDashboard;
private DashboardAdapter mAdapter;
+ private DashboardAdapterV2 mAdapterV2;
private SummaryLoader mSummaryLoader;
private ConditionManager mConditionManager;
private LinearLayoutManager mLayoutManager;
@@ -86,7 +87,9 @@
super.onAttach(context);
Log.d(TAG, "Creating SuggestionControllerMixin");
mSuggestionControllerMixin = new SuggestionControllerMixin(context, this /* host */,
- getLifecycle());
+ getLifecycle(), FeatureFactory.getFactory(context)
+ .getSuggestionFeatureProvider(context)
+ .getSuggestionServiceComponent());
}
@Override
@@ -175,8 +178,10 @@
super.onSaveInstanceState(outState);
if (mLayoutManager == null) return;
outState.putInt(EXTRA_SCROLL_POSITION, mLayoutManager.findFirstVisibleItemPosition());
- if (mAdapter != null) {
- mAdapter.onSaveInstanceState(outState);
+ if (!mDashboardFeatureProvider.useSuggestionUiV2()) {
+ if (mAdapter != null) {
+ mAdapter.onSaveInstanceState(outState);
+ }
}
}
@@ -194,11 +199,18 @@
mDashboard.setLayoutManager(mLayoutManager);
mDashboard.setHasFixedSize(true);
mDashboard.setListener(this);
- mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions(),
- mSuggestionControllerMixin, this /* SuggestionDismissController.Callback */);
- mDashboard.setAdapter(mAdapter);
mDashboard.setItemAnimator(new DashboardItemAnimator());
- mSummaryLoader.setSummaryConsumer(mAdapter);
+ if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+ mAdapterV2 = new DashboardAdapterV2(getContext(), bundle,
+ mConditionManager.getConditions(), mSuggestionControllerMixin, getLifecycle());
+ mDashboard.setAdapter(mAdapterV2);
+ mSummaryLoader.setSummaryConsumer(mAdapterV2);
+ } else {
+ mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions(),
+ mSuggestionControllerMixin, this /* SuggestionDismissController.Callback */);
+ mDashboard.setAdapter(mAdapter);
+ mSummaryLoader.setSummaryConsumer(mAdapter);
+ }
ActionBarShadowController.attachToRecyclerView(
getActivity().findViewById(R.id.search_bar_container), getLifecycle(), mDashboard);
rebuildUI();
@@ -237,7 +249,11 @@
if (mOnConditionsChangedCalled) {
final boolean scrollToTop =
mLayoutManager.findFirstCompletelyVisibleItemPosition() <= 1;
- mAdapter.setConditions(mConditionManager.getConditions());
+ if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+ mAdapterV2.setConditions(mConditionManager.getConditions());
+ } else {
+ mAdapter.setConditions(mConditionManager.getConditions());
+ }
if (scrollToTop) {
mDashboard.scrollToPosition(0);
}
@@ -248,7 +264,11 @@
@Override
public Suggestion getSuggestionAt(int position) {
- return mAdapter.getSuggestion(position);
+ if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+ return mAdapterV2.getSuggestion(position);
+ } else {
+ return mAdapter.getSuggestion(position);
+ }
}
@Override
@@ -259,11 +279,20 @@
@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);
+ if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+ mAdapterV2.setSuggestions(suggestions);
+ if (mStagingCategory != null) {
+ Log.d(TAG, "Category has loaded, setting category from suggestionReady");
+ mHandler.removeCallbacksAndMessages(null);
+ mAdapterV2.setCategory(mStagingCategory);
+ }
+ } else {
+ mAdapter.setSuggestions(suggestions);
+ if (mStagingCategory != null) {
+ Log.d(TAG, "Category has loaded, setting category from suggestionReady");
+ mHandler.removeCallbacksAndMessages(null);
+ mAdapter.setCategory(mStagingCategory);
+ }
}
}
@@ -276,14 +305,26 @@
if (mSuggestionControllerMixin.isSuggestionLoaded()) {
Log.d(TAG, "Suggestion has loaded, setting suggestion/category");
ThreadUtils.postOnMainThread(() -> {
- if (mStagingSuggestions != null) {
- mAdapter.setSuggestions(mStagingSuggestions);
+ if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+ if (mStagingSuggestions != null) {
+ mAdapterV2.setSuggestions(mStagingSuggestions);
+ }
+ mAdapterV2.setCategory(mStagingCategory);
+ } else {
+ if (mStagingSuggestions != null) {
+ mAdapter.setSuggestions(mStagingSuggestions);
+ }
+ mAdapter.setCategory(mStagingCategory);
}
- 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);
+ if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+ mHandler.postDelayed(()
+ -> mAdapterV2.setCategory(mStagingCategory), MAX_WAIT_MILLIS);
+ } else {
+ mHandler.postDelayed(() -> mAdapter.setCategory(mStagingCategory), MAX_WAIT_MILLIS);
+ }
}
}
}
diff --git a/src/com/android/settings/dashboard/RoundedHomepageIcon.java b/src/com/android/settings/dashboard/RoundedHomepageIcon.java
new file mode 100644
index 0000000..19749b9
--- /dev/null
+++ b/src/com/android/settings/dashboard/RoundedHomepageIcon.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+
+import com.android.settings.R;
+
+public class RoundedHomepageIcon extends LayerDrawable {
+
+ 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);
+ }
+}
diff --git a/src/com/android/settings/dashboard/SiteMapManager.java b/src/com/android/settings/dashboard/SiteMapManager.java
deleted file mode 100644
index b54e061..0000000
--- a/src/com/android/settings/dashboard/SiteMapManager.java
+++ /dev/null
@@ -1,205 +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 android.provider.SearchIndexablesContract.SITE_MAP_COLUMNS;
-import static com.android.settings.dashboard.DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.provider.SearchIndexablesContract.SiteMapColumns;
-import android.support.annotation.VisibleForTesting;
-import android.support.annotation.WorkerThread;
-import android.support.v4.util.ArrayMap;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.settings.SettingsActivity;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.IndexDatabaseHelper;
-import com.android.settings.search.IndexDatabaseHelper.IndexColumns;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A manager class that maintains a "site map" and look up breadcrumb for a certain page on demand.
- * <p/>
- * The methods on this class can only be called on a background thread.
- */
-public class SiteMapManager {
-
- private static final String TAG = "SiteMapManager";
- private static final boolean DEBUG_TIMING = false;
-
- private static final String[] CLASS_TO_SCREEN_TITLE_COLUMNS = {
- IndexColumns.CLASS_NAME,
- IndexColumns.SCREEN_TITLE,
- };
-
- private final List<SiteMapPair> mPairs = new ArrayList<>();
-
- private boolean mInitialized;
-
- /**
- * Given a fragment class name and its screen title, build a breadcrumb from Settings root to
- * this screen.
- * <p/>
- * Not all screens have a full breadcrumb path leading up to root, it's because either some
- * page in the breadcrumb path is not indexed, or it's only reachable via search.
- */
- @WorkerThread
- public synchronized List<String> buildBreadCrumb(Context context, String clazz,
- String screenTitle) {
- init(context);
- final long startTime = System.currentTimeMillis();
- final List<String> breadcrumbs = new ArrayList<>();
- if (!mInitialized) {
- Log.w(TAG, "SiteMap is not initialized yet, skipping");
- return breadcrumbs;
- }
- breadcrumbs.add(screenTitle);
- String currentClass = clazz;
- String currentTitle = screenTitle;
- // Look up current page's parent, if found add it to breadcrumb string list, and repeat.
- while (true) {
- final SiteMapPair pair = lookUpParent(currentClass, currentTitle);
- if (pair == null) {
- if (DEBUG_TIMING) {
- Log.d(TAG, "BreadCrumb timing: " + (System.currentTimeMillis() - startTime));
- }
- return breadcrumbs;
- }
- breadcrumbs.add(0, pair.parentTitle);
- currentClass = pair.parentClass;
- currentTitle = pair.parentTitle;
- }
- }
-
- /**
- * Initialize a list of {@link SiteMapPair}s. Each pair knows about a single parent-child
- * page relationship.
- *
- * We get the knowledge of such mPairs from 2 sources:
- * 1. Static indexing time: we know which page(s) a parent can open by parsing its pref xml.
- * 2. IA: We know from {@link DashboardFeatureProvider} which page can be dynamically
- * injected to where.
- */
- @VisibleForTesting
- @WorkerThread
- synchronized void init(Context context) {
- if (mInitialized) {
- // Make sure only init once.
- return;
- }
- final long startTime = System.currentTimeMillis();
- // First load site map from static index table.
- final Context appContext = context.getApplicationContext();
- final SQLiteDatabase db = IndexDatabaseHelper.getInstance(appContext).getReadableDatabase();
- Cursor sitemap = db.query(IndexDatabaseHelper.Tables.TABLE_SITE_MAP, SITE_MAP_COLUMNS, null,
- null, null, null, null);
- while (sitemap.moveToNext()) {
- final SiteMapPair pair = new SiteMapPair(
- sitemap.getString(sitemap.getColumnIndex(SiteMapColumns.PARENT_CLASS)),
- sitemap.getString(sitemap.getColumnIndex(SiteMapColumns.PARENT_TITLE)),
- sitemap.getString(sitemap.getColumnIndex(SiteMapColumns.CHILD_CLASS)),
- sitemap.getString(sitemap.getColumnIndex(SiteMapColumns.CHILD_TITLE)));
- mPairs.add(pair);
- }
- sitemap.close();
-
- // Then prepare a local map that contains class name -> screen title mapping. This is needed
- // to figure out the display name for any fragment if it's injected dynamically through IA.
- final Map<String, String> classToTitleMap = new ArrayMap<>();
- final Cursor titleQuery = db.query(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX,
- CLASS_TO_SCREEN_TITLE_COLUMNS, null, null, null, null, null);
- while (titleQuery.moveToNext()) {
- classToTitleMap.put(
- titleQuery.getString(titleQuery.getColumnIndex(IndexColumns.CLASS_NAME)),
- titleQuery.getString(titleQuery.getColumnIndex(IndexColumns.SCREEN_TITLE)));
- }
- titleQuery.close();
-
- // Loop through all IA categories and pages and build additional SiteMapPairs
- List<DashboardCategory> categories = FeatureFactory.getFactory(context)
- .getDashboardFeatureProvider(context).getAllCategories();
-
- for (DashboardCategory category : categories) {
- // Find the category key first.
- final String parentClass = CATEGORY_KEY_TO_PARENT_MAP.get(category.key);
- if (parentClass == null) {
- continue;
- }
- // Use the key to look up parent (which page hosts this key)
- final String parentName = classToTitleMap.get(parentClass);
- if (parentName == null) {
- continue;
- }
- // Build parent-child mPairs for all children listed under this key.
- for (Tile tile : category.getTiles()) {
- final String childTitle = tile.title.toString();
- String childClass = null;
- if (tile.metaData != null) {
- childClass = tile.metaData.getString(
- SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS);
- }
- if (childClass == null) {
- continue;
- }
- mPairs.add(new SiteMapPair(parentClass, parentName, childClass, childTitle));
- }
- }
- // Done.
- mInitialized = true;
- if (DEBUG_TIMING) {
- Log.d(TAG, "Init timing: " + (System.currentTimeMillis() - startTime));
- }
- }
-
- @WorkerThread
- private SiteMapPair lookUpParent(String clazz, String title) {
- for (SiteMapPair pair : mPairs) {
- if (TextUtils.equals(pair.childClass, clazz)
- && TextUtils.equals(title, pair.childTitle)) {
- return pair;
- }
- }
- return null;
- }
-
- /**
- * Data model for a parent-child page pair.
- */
- private static class SiteMapPair {
- public final String parentClass;
- public final String parentTitle;
- public final String childClass;
- public final String childTitle;
-
- public SiteMapPair(String parentClass, String parentTitle, String childClass,
- String childTitle) {
- this.parentClass = parentClass;
- this.parentTitle = parentTitle;
- this.childClass = childClass;
- this.childTitle = childTitle;
- }
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java b/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java
index 7fd9af8..c6002bd 100644
--- a/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java
+++ b/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java
@@ -21,10 +21,11 @@
import android.content.IntentFilter;
import android.graphics.drawable.Icon;
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.settings.Settings;
import com.android.settingslib.WirelessUtils;
public class AirplaneModeCondition extends Condition {
@@ -33,7 +34,7 @@
private final Receiver mReceiver;
private static final IntentFilter AIRPLANE_MODE_FILTER =
- new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED);
+ new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED);
public AirplaneModeCondition(ConditionManager conditionManager) {
super(conditionManager);
@@ -79,13 +80,14 @@
@Override
public CharSequence[] getActions() {
- return new CharSequence[] { mManager.getContext().getString(R.string.condition_turn_off) };
+ return new CharSequence[] {mManager.getContext().getString(R.string.condition_turn_off)};
}
@Override
public void onPrimaryClick() {
- mManager.getContext().startActivity(new Intent(mManager.getContext(),
- Settings.NetworkDashboardActivity.class));
+ mManager.getContext().startActivity(
+ new Intent(Settings.ACTION_WIRELESS_SETTINGS)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
@Override
diff --git a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java b/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
index 2bc71b2..cbac86f 100644
--- a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
+++ b/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
@@ -56,7 +56,7 @@
@Override
public void onPrimaryClick() {
mManager.getContext().startActivity(new Intent(mManager.getContext(),
- Settings.DataUsageSummaryActivity.class));
+ Settings.DataUsageSummaryActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
@Override
diff --git a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
index 64d263f..112248c 100644
--- a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
+++ b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
@@ -80,7 +80,7 @@
@Override
public void onPrimaryClick() {
mManager.getContext().startActivity(new Intent(mManager.getContext(),
- Settings.DataUsageSummaryActivity.class));
+ Settings.DataUsageSummaryActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
@Override
diff --git a/src/com/android/settings/dashboard/conditional/Condition.java b/src/com/android/settings/dashboard/conditional/Condition.java
index 05783bd..d66440e 100644
--- a/src/com/android/settings/dashboard/conditional/Condition.java
+++ b/src/com/android/settings/dashboard/conditional/Condition.java
@@ -24,8 +24,8 @@
import android.support.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public abstract class Condition {
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
index eb768e5..d84aa7c 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
@@ -27,13 +27,13 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardAdapter;
import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder;
import com.android.settings.dashboard.DashboardData;
import com.android.settings.dashboard.DashboardData.HeaderMode;
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;
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapterV2.java b/src/com/android/settings/dashboard/conditional/ConditionAdapterV2.java
new file mode 100644
index 0000000..8db57f7
--- /dev/null
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapterV2.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.support.annotation.VisibleForTesting;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+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.DashboardAdapterV2.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;
+
+public class ConditionAdapterV2 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 ConditionAdapterV2(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.setImageIcon(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/WorkModeCondition.java b/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
index 297e35a..5c47be6 100644
--- a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
+++ b/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
@@ -22,6 +22,7 @@
import android.graphics.drawable.Icon;
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;
@@ -84,14 +85,15 @@
@Override
public void onPrimaryClick() {
mManager.getContext().startActivity(new Intent(mManager.getContext(),
- Settings.UserAndAccountDashboardActivity.class));
+ Settings.UserSettingsActivity.class)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
@Override
public void onActionClick(int index) {
if (index == 0) {
if (mUserHandle != null) {
- mUm.trySetQuietModeEnabled(false, mUserHandle);
+ mUm.requestQuietModeEnabled(false, mUserHandle);
}
setActive(false);
} else {
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
index fc11029..d1d7db2 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -27,10 +27,11 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder;
import com.android.settings.dashboard.DashboardAdapter.IconCache;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.suggestions.SuggestionControllerMixin;
import java.util.List;
import java.util.Objects;
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2.java
new file mode 100644
index 0000000..483af92
--- /dev/null
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.os.Bundle;
+import android.service.settings.suggestions.Suggestion;
+import android.support.v7.widget.RecyclerView;
+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 com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardAdapterV2.DashboardItemHolder;
+import com.android.settings.dashboard.DashboardAdapterV2.IconCache;
+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.suggestions.SuggestionControllerMixin;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class SuggestionAdapterV2 extends RecyclerView.Adapter<DashboardItemHolder> implements
+ LifecycleObserver, OnSaveInstanceState {
+ public static final String TAG = "SuggestionAdapterV2";
+
+ 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 SuggestionControllerMixin 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 SuggestionAdapterV2(Context context, SuggestionControllerMixin suggestionControllerMixin,
+ Bundle savedInstanceState, Callback callback, Lifecycle lifecycle) {
+ mContext = context;
+ mSuggestionControllerMixin = suggestionControllerMixin;
+ mCache = new IconCache(context);
+ final FeatureFactory factory = FeatureFactory.getFactory(context);
+ mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
+ 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);
+ }
+ mConfig.setCardLayout(holder, suggestionCount, position);
+ holder.icon.setImageDrawable(mCache.getIcon(suggestion.getIcon()));
+ holder.title.setText(suggestion.getTitle());
+ holder.title.setSingleLine(suggestionCount == 1);
+
+ 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 {
+ // Do not show summary if there are more than 1 suggestions
+ holder.summary.setVisibility(View.GONE);
+ holder.title.setMaxLines(3);
+ }
+
+ final ImageView closeButton = holder.itemView.findViewById(R.id.close_button);
+ if (closeButton != null) {
+ if (mCallback != null) {
+ closeButton.setOnClickListener(v -> {
+ mCallback.onSuggestionClosed(suggestion);
+ });
+ } else {
+ closeButton.setOnClickListener(null);
+ }
+ }
+
+ 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_v2;
+ } else {
+ return R.layout.suggestion_tile_v2;
+ }
+ }
+
+ @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;
+ }
+
+ private static class CardConfig {
+ // Card start/end margin
+ private final int mMarginInner;
+ private final int mMarginOuter;
+ // Card width for different numbers of cards
+ private final int mWidthSingleCard;
+ private final int mWidthTwoCards;
+ private final int mWidthMultipleCards;
+ // padding between icon and title
+ private final int mPaddingTitleTopSingleCard;
+ private final int mPaddingTitleTopMultipleCards;
+
+ private static CardConfig sConfig;
+
+ private CardConfig(Context context) {
+ final Resources res = context.getResources();
+ mMarginInner =
+ res.getDimensionPixelOffset(R.dimen.suggestion_card_inner_margin);
+ mMarginOuter =
+ res.getDimensionPixelOffset(R.dimen.suggestion_card_outer_margin);
+ mWidthSingleCard = res.getDimensionPixelOffset(R.dimen.suggestion_card_width_one_card);
+ mWidthTwoCards = res.getDimensionPixelOffset(R.dimen.suggestion_card_width_two_cards);
+ mWidthMultipleCards =
+ res.getDimensionPixelOffset(R.dimen.suggestion_card_width_multiple_cards);
+ mPaddingTitleTopSingleCard =
+ res.getDimensionPixelOffset(R.dimen.suggestion_card_title_padding_bottom_one_card);
+ mPaddingTitleTopMultipleCards = res.getDimensionPixelOffset(
+ R.dimen.suggestion_card_title_padding_bottom_multiple_cards);
+ }
+
+ public static CardConfig get(Context context) {
+ if (sConfig == null) {
+ sConfig = new CardConfig(context);
+ }
+ return sConfig;
+ }
+
+ private void setCardLayout(DashboardItemHolder holder, int suggestionCount,
+ int position) {
+ final LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+ suggestionCount == 1
+ ? mWidthSingleCard : suggestionCount == 2
+ ? mWidthTwoCards : mWidthMultipleCards,
+ LinearLayout.LayoutParams.WRAP_CONTENT);
+ if (suggestionCount == 1) {
+ params.setMarginStart(mMarginOuter);
+ params.setMarginEnd(mMarginOuter);
+ } else {
+ params.setMarginStart(
+ position == 0 ? mMarginOuter : mMarginInner);
+ params.setMarginEnd(position == suggestionCount - 1 ? mMarginOuter : 0);
+ }
+ holder.itemView.setLayoutParams(params);
+ }
+
+ }
+
+}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionController.java b/src/com/android/settings/dashboard/suggestions/SuggestionController.java
deleted file mode 100644
index 8fe1a47..0000000
--- a/src/com/android/settings/dashboard/suggestions/SuggestionController.java
+++ /dev/null
@@ -1,174 +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.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.service.settings.suggestions.ISuggestionService;
-import android.service.settings.suggestions.Suggestion;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-import android.util.Log;
-
-import java.util.List;
-
-/**
- * A controller class to access suggestion data.
- */
-public class SuggestionController {
-
- /**
- * Callback interface when service is connected/disconnected.
- */
- public interface ServiceConnectionListener {
- /**
- * Called when service is connected.
- */
- void onServiceConnected();
-
- /**
- * Called when service is disconnected.
- */
- void onServiceDisconnected();
- }
-
- private static final String TAG = "SuggestionController";
- private static final boolean DEBUG = false;
-
- private final Context mContext;
- private final Intent mServiceIntent;
-
- private ServiceConnection mServiceConnection;
- private ISuggestionService mRemoteService;
- private ServiceConnectionListener mConnectionListener;
-
- /**
- * Create a new controller instance.
- *
- * @param context caller context
- * @param service The component name for service.
- * @param listener listener to receive service connected/disconnected event.
- */
- public SuggestionController(Context context, ComponentName service,
- ServiceConnectionListener listener) {
- mContext = context.getApplicationContext();
- mConnectionListener = listener;
- mServiceIntent = new Intent().setComponent(service);
- mServiceConnection = createServiceConnection();
- }
-
- /**
- * Start the controller.
- */
- public void start() {
- mContext.bindServiceAsUser(mServiceIntent, mServiceConnection, Context.BIND_AUTO_CREATE,
- android.os.Process.myUserHandle());
- }
-
- /**
- * Stop the controller.
- */
- public void stop() {
- if (mRemoteService != null) {
- mRemoteService = null;
- mContext.unbindService(mServiceConnection);
- }
- }
-
- /**
- * Get setting suggestions.
- */
- @Nullable
- @WorkerThread
- public List<Suggestion> getSuggestions() {
- if (!isReady()) {
- return null;
- }
- try {
- return mRemoteService.getSuggestions();
- } catch (NullPointerException e) {
- Log.w(TAG, "mRemote service detached before able to query", e);
- return null;
- } catch (RemoteException e) {
- Log.w(TAG, "Error when calling getSuggestion()", e);
- return null;
- }
- }
-
- public void dismissSuggestions(Suggestion suggestion) {
- if (!isReady()) {
- Log.w(TAG, "SuggestionController not ready, cannot dismiss " + suggestion.getId());
- return;
- }
- try {
- mRemoteService.dismissSuggestion(suggestion);
- } catch (RemoteException e) {
- Log.w(TAG, "Error when calling dismissSuggestion()", e);
- }
- }
-
- public void launchSuggestion(Suggestion suggestion) {
- if (!isReady()) {
- Log.w(TAG, "SuggestionController not ready, cannot launch " + suggestion.getId());
- return;
- }
-
- try {
- mRemoteService.launchSuggestion(suggestion);
- } catch (RemoteException e) {
- Log.w(TAG, "Error when calling launchSuggestion()", e);
- }
- }
-
- /**
- * Whether or not the manager is ready
- */
- private boolean isReady() {
- return mRemoteService != null;
- }
-
- /**
- * Create a new {@link ServiceConnection} object to handle service connect/disconnect event.
- */
- private ServiceConnection createServiceConnection() {
- return new ServiceConnection() {
-
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- if (DEBUG) {
- Log.d(TAG, "Service is connected");
- }
- mRemoteService = ISuggestionService.Stub.asInterface(service);
- if (mConnectionListener != null) {
- mConnectionListener.onServiceConnected();
- }
- }
-
- @Override
- public void onServiceDisconnected(ComponentName name) {
- if (mConnectionListener != null) {
- mRemoteService = null;
- mConnectionListener.onServiceDisconnected();
- }
- }
- };
- }
-}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java b/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java
deleted file mode 100644
index 81496ee..0000000
--- a/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java
+++ /dev/null
@@ -1,139 +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.LoaderManager;
-import android.content.Context;
-import android.content.Loader;
-import android.os.Bundle;
-import android.service.settings.suggestions.Suggestion;
-import android.support.annotation.Nullable;
-import android.util.Log;
-
-import com.android.settings.overlay.FeatureFactory;
-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 java.util.List;
-
-/**
- * Manages IPC communication to SettingsIntelligence for suggestion related services.
- */
-public class SuggestionControllerMixin implements SuggestionController.ServiceConnectionListener,
- LifecycleObserver, OnStart, OnStop, LoaderManager.LoaderCallbacks<List<Suggestion>> {
-
- public interface SuggestionControllerHost {
- /**
- * Called when suggestion data fetching is ready.
- */
- void onSuggestionReady(List<Suggestion> data);
-
- /**
- * Returns {@link LoaderManager} associated with the host. If host is not attached to
- * activity then return null.
- */
- @Nullable
- LoaderManager getLoaderManager();
- }
-
- private static final String TAG = "SuggestionCtrlMixin";
- private static final boolean DEBUG = false;
-
- private final Context mContext;
- private final SuggestionController mSuggestionController;
- private final SuggestionControllerHost mHost;
-
- private boolean mSuggestionLoaded;
-
- public SuggestionControllerMixin(Context context, SuggestionControllerHost host,
- Lifecycle lifecycle) {
- mContext = context.getApplicationContext();
- mHost = host;
- mSuggestionController = new SuggestionController(mContext,
- FeatureFactory.getFactory(mContext)
- .getSuggestionFeatureProvider(mContext)
- .getSuggestionServiceComponent(),
- this /* serviceConnectionListener */);
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
- }
-
- @Override
- public void onStart() {
- mSuggestionController.start();
- }
-
- @Override
- public void onStop() {
- mSuggestionController.stop();
- }
-
- @Override
- public void onServiceConnected() {
- final LoaderManager loaderManager = mHost.getLoaderManager();
- if (loaderManager != null) {
- loaderManager.restartLoader(SuggestionLoader.LOADER_ID_SUGGESTIONS,
- null /* args */, this /* callback */);
- }
- }
-
- @Override
- public void onServiceDisconnected() {
- if (DEBUG) {
- Log.d(TAG, "SuggestionService disconnected");
- }
- final LoaderManager loaderManager = mHost.getLoaderManager();
- if (loaderManager != null) {
- loaderManager.destroyLoader(SuggestionLoader.LOADER_ID_SUGGESTIONS);
- }
- }
-
- @Override
- public Loader<List<Suggestion>> onCreateLoader(int id, Bundle args) {
- if (id == SuggestionLoader.LOADER_ID_SUGGESTIONS) {
- mSuggestionLoaded = false;
- return new SuggestionLoader(mContext, mSuggestionController);
- }
- throw new IllegalArgumentException("This loader id is not supported " + id);
- }
-
- @Override
- public void onLoadFinished(Loader<List<Suggestion>> loader, List<Suggestion> data) {
- mSuggestionLoaded = true;
- mHost.onSuggestionReady(data);
- }
-
- @Override
- public void onLoaderReset(Loader<List<Suggestion>> loader) {
- mSuggestionLoaded = false;
- }
-
- public boolean isSuggestionLoaded() {
- return mSuggestionLoaded;
- }
-
- public void dismissSuggestion(Suggestion suggestion) {
- mSuggestionController.dismissSuggestions(suggestion);
- }
-
- public void launchSuggestion(Suggestion suggestion) {
- mSuggestionController.launchSuggestion(suggestion);
- }
-}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
index de0c129..6a8db89 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
@@ -23,7 +23,12 @@
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.suggestions.SuggestionControllerMixin;
+/**
+ * Deprecated as a close button is provided to dismiss the suggestion.
+ */
+@Deprecated
public class SuggestionDismissController extends ItemTouchHelper.SimpleCallback {
public interface Callback {
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
index bdc29e7..b700049 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -24,6 +24,7 @@
import android.util.Pair;
import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionControllerMixin;
import java.util.List;
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index fe19b95..4e5f688 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -30,26 +30,17 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.Settings.AmbientDisplayPickupSuggestionActivity;
-import com.android.settings.Settings.AmbientDisplaySuggestionActivity;
-import com.android.settings.Settings.DoubleTapPowerSuggestionActivity;
-import com.android.settings.Settings.DoubleTwistSuggestionActivity;
import com.android.settings.Settings.NightDisplaySuggestionActivity;
-import com.android.settings.Settings.SwipeToNotificationSuggestionActivity;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity;
import com.android.settings.fingerprint.FingerprintSuggestionActivity;
-import com.android.settings.gestures.DoubleTapPowerPreferenceController;
-import com.android.settings.gestures.DoubleTapScreenPreferenceController;
-import com.android.settings.gestures.DoubleTwistPreferenceController;
-import com.android.settings.gestures.PickupGesturePreferenceController;
-import com.android.settings.gestures.SwipeToNotificationPreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ScreenLockSuggestionActivity;
import com.android.settings.support.NewDeviceIntroSuggestionActivity;
import com.android.settings.wallpaper.WallpaperSuggestionActivity;
import com.android.settings.wifi.WifiCallingSuggestionActivity;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionControllerMixin;
import java.util.List;
@@ -98,21 +89,6 @@
return hasUsedNightDisplay(context);
} else if (className.equals(NewDeviceIntroSuggestionActivity.class.getName())) {
return NewDeviceIntroSuggestionActivity.isSuggestionComplete(context);
- } else if (className.equals(DoubleTapPowerSuggestionActivity.class.getName())) {
- return DoubleTapPowerPreferenceController
- .isSuggestionComplete(context, getSharedPrefs(context));
- } else if (className.equals(DoubleTwistSuggestionActivity.class.getName())) {
- return DoubleTwistPreferenceController
- .isSuggestionComplete(context, getSharedPrefs(context));
- } else if (className.equals(AmbientDisplaySuggestionActivity.class.getName())) {
- return DoubleTapScreenPreferenceController
- .isSuggestionComplete(context, getSharedPrefs(context));
- } else if (className.equals(AmbientDisplayPickupSuggestionActivity.class.getName())) {
- return PickupGesturePreferenceController
- .isSuggestionComplete(context, getSharedPrefs(context));
- } else if (className.equals(SwipeToNotificationSuggestionActivity.class.getName())) {
- return SwipeToNotificationPreferenceController
- .isSuggestionComplete(context, getSharedPrefs(context));
}
return false;
}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionLoader.java b/src/com/android/settings/dashboard/suggestions/SuggestionLoader.java
deleted file mode 100644
index 8c5b46d..0000000
--- a/src/com/android/settings/dashboard/suggestions/SuggestionLoader.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.dashboard.suggestions;
-
-import android.content.Context;
-import android.service.settings.suggestions.Suggestion;
-import android.util.Log;
-
-import com.android.settingslib.utils.AsyncLoader;
-
-import java.util.List;
-
-public class SuggestionLoader extends AsyncLoader<List<Suggestion>> {
-
- public static final int LOADER_ID_SUGGESTIONS = 42;
- private static final String TAG = "SuggestionLoader";
-
- private final SuggestionController mSuggestionController;
-
- public SuggestionLoader(Context context, SuggestionController controller) {
- super(context);
- mSuggestionController = controller;
- }
-
- @Override
- protected void onDiscardResult(List<Suggestion> result) {
-
- }
-
- @Override
- public List<Suggestion> loadInBackground() {
- final List<Suggestion> data = mSuggestionController.getSuggestions();
- if (data == null) {
- Log.d(TAG, "data is null");
- } else {
- Log.d(TAG, "data size " + data.size());
- }
- return data;
- }
-}
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 5470e63..a0d0ec0 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -33,7 +33,6 @@
import android.os.RemoteException;
import android.os.UserHandle;
import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.text.format.Formatter;
@@ -48,6 +47,9 @@
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.RestrictedSwitchPreference;
import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoader;
import com.android.settingslib.net.UidDetail;
@@ -80,7 +82,7 @@
private Preference mForegroundUsage;
private Preference mBackgroundUsage;
private Preference mAppSettings;
- private SwitchPreference mRestrictBackground;
+ private RestrictedSwitchPreference mRestrictBackground;
private PreferenceCategory mAppList;
private Drawable mIcon;
@@ -97,7 +99,7 @@
private AppItem mAppItem;
private Intent mAppSettingsIntent;
private SpinnerPreference mCycle;
- private SwitchPreference mUnrestrictedData;
+ private RestrictedSwitchPreference mUnrestrictedData;
private DataSaverBackend mDataSaverBackend;
@Override
@@ -160,9 +162,11 @@
removePreference(KEY_UNRESTRICTED_DATA);
removePreference(KEY_RESTRICT_BACKGROUND);
} else {
- mRestrictBackground = (SwitchPreference) findPreference(KEY_RESTRICT_BACKGROUND);
+ mRestrictBackground = (RestrictedSwitchPreference) findPreference(
+ KEY_RESTRICT_BACKGROUND);
mRestrictBackground.setOnPreferenceChangeListener(this);
- mUnrestrictedData = (SwitchPreference) findPreference(KEY_UNRESTRICTED_DATA);
+ mUnrestrictedData = (RestrictedSwitchPreference) findPreference(
+ KEY_UNRESTRICTED_DATA);
mUnrestrictedData.setOnPreferenceChangeListener(this);
}
mDataSaverBackend = new DataSaverBackend(getContext());
@@ -261,8 +265,11 @@
}
private void updatePrefs(boolean restrictBackground, boolean unrestrictData) {
+ final EnforcedAdmin admin = RestrictedLockUtils.checkIfMeteredDataRestricted(
+ getContext(), mPackageName, UserHandle.getUserId(mAppItem.key));
if (mRestrictBackground != null) {
mRestrictBackground.setChecked(!restrictBackground);
+ mRestrictBackground.setDisabledByAdmin(admin);
}
if (mUnrestrictedData != null) {
if (restrictBackground) {
@@ -270,6 +277,7 @@
} else {
mUnrestrictedData.setVisible(true);
mUnrestrictedData.setChecked(unrestrictData);
+ mUnrestrictedData.setDisabledByAdmin(admin);
}
}
}
diff --git a/src/com/android/settings/datausage/DataPlanUsageSummary.java b/src/com/android/settings/datausage/DataPlanUsageSummary.java
index a56bfa1..9489322 100644
--- a/src/com/android/settings/datausage/DataPlanUsageSummary.java
+++ b/src/com/android/settings/datausage/DataPlanUsageSummary.java
@@ -48,6 +48,11 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * @deprecated This fragment was supposed to be new version of {@link DataUsageSummary} however
+ * unfinished and used nowhere. Keep it in case we may bring it back someday.
+ */
+@Deprecated
public class DataPlanUsageSummary extends DataUsageBase {
public static final String KEY_DATA_PLAN_USAGE = "data_plan_usage";
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index 041a81f..b59da9d 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -25,8 +25,8 @@
import android.util.SparseIntArray;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.utils.ThreadUtils;
import java.util.ArrayList;
@@ -204,6 +204,10 @@
public void onRestrictBackgroundChanged(final boolean isDataSaving) throws RemoteException {
ThreadUtils.postOnMainThread(() -> handleRestrictBackgroundChanged(isDataSaving));
}
+
+ @Override
+ public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) {
+ }
};
public interface Listener {
diff --git a/src/com/android/settings/datausage/DataSaverPreference.java b/src/com/android/settings/datausage/DataSaverPreference.java
index 13ef9d7..f1f648a 100644
--- a/src/com/android/settings/datausage/DataSaverPreference.java
+++ b/src/com/android/settings/datausage/DataSaverPreference.java
@@ -37,7 +37,7 @@
@Override
public void onDetached() {
super.onDetached();
- mDataSaverBackend.addListener(this);
+ mDataSaverBackend.remListener(this);
}
@Override
diff --git a/src/com/android/settings/datausage/DataUsageBase.java b/src/com/android/settings/datausage/DataUsageBase.java
index f08d534..b889a2f 100644
--- a/src/com/android/settings/datausage/DataUsageBase.java
+++ b/src/com/android/settings/datausage/DataUsageBase.java
@@ -36,6 +36,10 @@
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";
diff --git a/src/com/android/settings/datausage/DataUsageBaseFragment.java b/src/com/android/settings/datausage/DataUsageBaseFragment.java
new file mode 100644
index 0000000..344f2b8
--- /dev/null
+++ b/src/com/android/settings/datausage/DataUsageBaseFragment.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 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.ConnectivityManager.TYPE_ETHERNET;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.INetworkStatsService;
+import android.net.INetworkStatsSession;
+import android.net.NetworkPolicy;
+import android.net.NetworkPolicyManager;
+import android.net.NetworkTemplate;
+import android.net.TrafficStats;
+import android.os.Bundle;
+import android.os.INetworkManagementService;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.os.UserManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.NetworkPolicyEditor;
+
+public abstract class DataUsageBaseFragment extends DashboardFragment {
+ 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;
+ }
+ }
+
+ /**
+ * Test if device has an ethernet network connection.
+ */
+ public boolean hasEthernet(Context context) {
+ if (DataUsageUtils.TEST_RADIOS) {
+ return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains(ETHERNET);
+ }
+
+ final ConnectivityManager conn = ConnectivityManager.from(context);
+ final boolean hasEthernet = conn.isNetworkSupported(TYPE_ETHERNET);
+
+ final long ethernetBytes;
+ try {
+ INetworkStatsSession statsSession = services.mStatsService.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 hasEthernet && ethernetBytes > 0;
+ }
+}
diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
deleted file mode 100644
index 8bc7e04..0000000
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ /dev/null
@@ -1,150 +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.app.backup.BackupManager;
-import android.content.Context;
-import android.net.NetworkPolicyManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.provider.SearchIndexableResource;
-import android.support.v7.preference.DropDownPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-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.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settingslib.NetworkPolicyEditor;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Panel to configure {@link WifiConfiguration#meteredOverride}.
- */
-public class DataUsageMeteredSettings extends SettingsPreferenceFragment implements Indexable {
-
- private NetworkPolicyManager mPolicyManager;
- private WifiManager mWifiManager;
-
- private NetworkPolicyEditor mPolicyEditor;
-
- private PreferenceCategory mMobileCategory;
- private PreferenceCategory mWifiCategory;
- private Preference mWifiDisabled;
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.NET_DATA_USAGE_METERED;
- }
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
- final Context context = getActivity();
-
- mPolicyManager = NetworkPolicyManager.from(context);
- mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-
- mPolicyEditor = new NetworkPolicyEditor(mPolicyManager);
- mPolicyEditor.read();
-
- addPreferencesFromResource(R.xml.data_usage_metered_prefs);
- mMobileCategory = (PreferenceCategory) findPreference("mobile");
- mWifiCategory = (PreferenceCategory) findPreference("wifi");
- mWifiDisabled = findPreference("wifi_disabled");
-
- updateNetworks(context);
- }
-
- private void updateNetworks(Context context) {
- getPreferenceScreen().removePreference(mMobileCategory);
-
- mWifiCategory.removeAll();
- if (DataUsageUtils.hasWifiRadio(context) && mWifiManager.isWifiEnabled()) {
- for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {
- final Preference pref = new MeteredPreference(getPrefContext(), config);
- if (!TextUtils.isEmpty(pref.getTitle())) {
- mWifiCategory.addPreference(pref);
- }
- }
- } else {
- mWifiCategory.addPreference(mWifiDisabled);
- }
- }
-
- private class MeteredPreference extends DropDownPreference {
- private final WifiConfiguration mConfig;
-
- public MeteredPreference(Context context, WifiConfiguration config) {
- super(context);
- mConfig = config;
-
- setPersistent(false);
- setEntries(new CharSequence[] {
- getString(R.string.data_usage_metered_auto),
- getString(R.string.data_usage_metered_yes),
- getString(R.string.data_usage_metered_no),
- });
- setEntryValues(new CharSequence[] {
- Integer.toString(WifiConfiguration.METERED_OVERRIDE_NONE),
- Integer.toString(WifiConfiguration.METERED_OVERRIDE_METERED),
- Integer.toString(WifiConfiguration.METERED_OVERRIDE_NOT_METERED),
- });
- setValue(Integer.toString(mConfig.meteredOverride));
- setTitle(NetworkPolicyManager.resolveNetworkId(mConfig));
- setSummary(getEntries()[mConfig.meteredOverride]);
-
- setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- mConfig.meteredOverride = Integer.parseInt((String) newValue);
- setSummary(getEntries()[mConfig.meteredOverride]);
-
- mWifiManager.updateNetwork(mConfig);
- // Stage the backup of the SettingsProvider package which backs this up
- BackupManager.dataChanged("com.android.providers.settings");
- return true;
- }
- });
- }
- }
-
- /**
- * For search
- */
- public static final Indexable.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.data_usage_metered_prefs;
- return Arrays.asList(sir);
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- final List<String> result = super.getNonIndexableKeys(context);
- result.add("mobile");
- return result;
- }
- };
-}
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index fe22022..b63cee3 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -20,8 +20,6 @@
import android.content.Intent;
import android.net.NetworkPolicyManager;
import android.net.NetworkTemplate;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
@@ -48,6 +46,7 @@
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.NetworkPolicyEditor;
+import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.net.DataUsageController;
import java.util.ArrayList;
@@ -55,11 +54,11 @@
/**
* Settings preference fragment that displays data usage summary.
- *
- * This class in deprecated use {@link DataPlanUsageSummary}.
*/
-@Deprecated
-public class DataUsageSummary extends DataUsageBase implements Indexable, DataUsageEditController {
+public class DataUsageSummary extends DataUsageBaseFragment implements Indexable,
+ DataUsageEditController {
+
+ private static final String TAG = "DataUsageSummary";
static final boolean LOGD = false;
@@ -77,8 +76,6 @@
// Wifi keys
public static final String KEY_WIFI_USAGE_TITLE = "wifi_category";
public static final String KEY_WIFI_DATA_USAGE = "wifi_data_usage";
- public static final String KEY_NETWORK_RESTRICTIONS = "network_restrictions";
-
private DataUsageController mDataUsageController;
private DataUsageInfoController mDataInfoController;
@@ -86,8 +83,6 @@
private Preference mLimitPreference;
private NetworkTemplate mDefaultTemplate;
private int mDataUsageTemplate;
- private NetworkRestrictionsPreference mNetworkRestrictionPreference;
- private WifiManager mWifiManager;
private NetworkPolicyEditor mPolicyEditor;
@Override
@@ -101,13 +96,11 @@
final Context context = getContext();
NetworkPolicyManager policyManager = NetworkPolicyManager.from(context);
- mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mPolicyEditor = new NetworkPolicyEditor(policyManager);
boolean hasMobileData = DataUsageUtils.hasMobileData(context);
mDataUsageController = new DataUsageController(context);
mDataInfoController = new DataUsageInfoController();
- addPreferencesFromResource(R.xml.data_usage);
int defaultSubId = DataUsageUtils.getDefaultSubscriptionId(context);
if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
@@ -184,6 +177,21 @@
return super.onPreferenceTreeClick(preference);
}
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.data_usage;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+ return null;
+ }
+
private void addMobileSection(int subId) {
addMobileSection(subId, null);
}
@@ -203,8 +211,6 @@
TemplatePreferenceCategory category = (TemplatePreferenceCategory)
inflatePreferences(R.xml.data_usage_wifi);
category.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(), 0, services);
- mNetworkRestrictionPreference =
- (NetworkRestrictionsPreference) category.findPreference(KEY_NETWORK_RESTRICTIONS);
}
private void addEthernetSection() {
@@ -293,8 +299,6 @@
mLimitPreference.setSummary(null);
}
- updateNetworkRestrictionSummary(mNetworkRestrictionPreference);
-
PreferenceScreen screen = getPreferenceScreen();
for (int i = 1; i < screen.getPreferenceCount(); i++) {
((TemplatePreferenceCategory) screen.getPreference(i)).pushTemplates(services);
@@ -321,22 +325,6 @@
updateState();
}
- @VisibleForTesting
- void updateNetworkRestrictionSummary(NetworkRestrictionsPreference preference) {
- if (preference == null) {
- return;
- }
- mPolicyEditor.read();
- int count = 0;
- for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {
- if (WifiConfiguration.isMetered(config, null)) {
- count++;
- }
- }
- preference.setSummary(getResources().getQuantityString(
- R.plurals.network_restrictions_summary, count, count));
- }
-
private static class SummaryProvider
implements SummaryLoader.SummaryProvider {
@@ -409,7 +397,6 @@
if (!DataUsageUtils.hasWifiRadio(context)) {
keys.add(KEY_WIFI_DATA_USAGE);
- keys.add(KEY_NETWORK_RESTRICTIONS);
}
// This title is named Wifi, and will confuse users.
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
index e8a7bbf..cff4a50 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
@@ -14,6 +14,8 @@
package com.android.settings.datausage;
+import static com.android.settingslib.RestrictedLockUtils.checkIfMeteredDataRestricted;
+
import android.app.Application;
import android.content.Context;
import android.os.Bundle;
@@ -37,6 +39,8 @@
import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.AppSwitchPreference;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedPreferenceHelper;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -172,6 +176,8 @@
preference.setOnPreferenceChangeListener(this);
getPreferenceScreen().addPreference(preference);
} else {
+ preference.setDisabledByAdmin(checkIfMeteredDataRestricted(getContext(),
+ entry.info.packageName, UserHandle.getUserId(entry.info.uid)));
preference.reuse();
}
preference.setOrder(i);
@@ -242,16 +248,22 @@
return app != null && UserHandle.isApp(app.info.uid);
}
- private class AccessPreference extends AppSwitchPreference
+ @VisibleForTesting
+ class AccessPreference extends AppSwitchPreference
implements DataSaverBackend.Listener {
private final AppEntry mEntry;
private final DataUsageState mState;
+ private final RestrictedPreferenceHelper mHelper;
public AccessPreference(final Context context, AppEntry entry) {
super(context);
+ setWidgetLayoutResource(R.layout.restricted_switch_widget);
+ mHelper = new RestrictedPreferenceHelper(context, this, null);
mEntry = entry;
mState = (DataUsageState) mEntry.extraInfo;
mEntry.ensureLabel(getContext());
+ setDisabledByAdmin(checkIfMeteredDataRestricted(context, entry.info.packageName,
+ UserHandle.getUserId(entry.info.uid)));
setState();
if (mEntry.icon != null) {
setIcon(mEntry.icon);
@@ -291,12 +303,21 @@
}
}
+ @Override
+ public void performClick() {
+ if (!mHelper.performClick()) {
+ super.performClick();
+ }
+ }
+
// Sets UI state based on whitelist/blacklist status.
private void setState() {
setTitle(mEntry.label);
if (mState != null) {
setChecked(mState.isDataSaverWhitelisted);
- if (mState.isDataSaverBlacklisted) {
+ if (isDisabledByAdmin()) {
+ setSummary(R.string.disabled_by_admin);
+ } else if (mState.isDataSaverBlacklisted) {
setSummary(R.string.restrict_background_blacklisted);
} else {
setSummary("");
@@ -323,10 +344,21 @@
}
});
}
- holder.findViewById(android.R.id.widget_frame)
- .setVisibility(mState != null && mState.isDataSaverBlacklisted
- ? View.INVISIBLE : View.VISIBLE);
+ final boolean disabledByAdmin = isDisabledByAdmin();
+ final View widgetFrame = holder.findViewById(android.R.id.widget_frame);
+ if (disabledByAdmin) {
+ widgetFrame.setVisibility(View.VISIBLE);
+ } else {
+ widgetFrame.setVisibility(mState != null && mState.isDataSaverBlacklisted
+ ? View.INVISIBLE : View.VISIBLE);
+ }
super.onBindViewHolder(holder);
+
+ mHelper.onBindViewHolder(holder);
+ holder.findViewById(R.id.restricted_icon).setVisibility(
+ disabledByAdmin ? View.VISIBLE : View.GONE);
+ holder.findViewById(android.R.id.switch_widget).setVisibility(
+ disabledByAdmin ? View.GONE : View.VISIBLE);
}
@Override
@@ -348,6 +380,19 @@
reuse();
}
}
+
+ public void setDisabledByAdmin(EnforcedAdmin admin) {
+ mHelper.setDisabledByAdmin(admin);
+ }
+
+ public boolean isDisabledByAdmin() {
+ return mHelper.isDisabledByAdmin();
+ }
+
+ @VisibleForTesting
+ public AppEntry getEntryForTest() {
+ return mEntry;
+ }
}
}
diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java
index 435b1fe..e29e245 100644
--- a/src/com/android/settings/datetime/TimeZonePreferenceController.java
+++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java
@@ -20,7 +20,10 @@
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
+import android.util.FeatureFlagUtils;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.datetime.timezone.ZonePicker;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.datetime.ZoneGetter;
@@ -33,11 +36,13 @@
private static final String KEY_TIMEZONE = "timezone";
private final AutoTimeZonePreferenceController mAutoTimeZonePreferenceController;
+ private final boolean mZonePickerV2;
public TimeZonePreferenceController(Context context,
AutoTimeZonePreferenceController autoTimeZonePreferenceController) {
super(context);
mAutoTimeZonePreferenceController = autoTimeZonePreferenceController;
+ mZonePickerV2 = FeatureFlagUtils.isEnabled(mContext, FeatureFlags.ZONE_PICKER_V2);
}
@Override
@@ -45,6 +50,9 @@
if (!(preference instanceof RestrictedPreference)) {
return;
}
+ if (mZonePickerV2) {
+ preference.setFragment(ZonePicker.class.getName());
+ }
preference.setSummary(getTimeZoneOffsetAndName());
if( !((RestrictedPreference) preference).isDisabledByAdmin()) {
preference.setEnabled(!mAutoTimeZonePreferenceController.isEnabled());
diff --git a/src/com/android/settings/datetime/ZonePicker.java b/src/com/android/settings/datetime/ZonePicker.java
index 57c340c..dc69127 100644
--- a/src/com/android/settings/datetime/ZonePicker.java
+++ b/src/com/android/settings/datetime/ZonePicker.java
@@ -35,8 +35,9 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.core.instrumentation.Instrumentable;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.datetime.ZoneGetter;
import java.text.Collator;
@@ -57,8 +58,7 @@
private static final int MENU_TIMEZONE = Menu.FIRST+1;
private static final int MENU_ALPHABETICAL = Menu.FIRST;
- private final VisibilityLoggerMixin mVisibilityLoggerMixin =
- new VisibilityLoggerMixin(getMetricsCategory());
+ private VisibilityLoggerMixin mVisibilityLoggerMixin;
private boolean mSortedByTimezone;
@@ -145,12 +145,6 @@
}
@Override
- public void onAttach(Context context) {
- super.onAttach(context);
- mVisibilityLoggerMixin.onAttach(context);
- }
-
- @Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.ZONE_PICKER;
}
@@ -170,6 +164,13 @@
}
@Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
+ FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider());
+ }
+
+ @Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final View view = super.onCreateView(inflater, container, savedInstanceState);
diff --git a/src/com/android/settings/datetime/timezone/DataLoader.java b/src/com/android/settings/datetime/timezone/DataLoader.java
new file mode 100644
index 0000000..038558a
--- /dev/null
+++ b/src/com/android/settings/datetime/timezone/DataLoader.java
@@ -0,0 +1,205 @@
+/*
+ * 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.datetime.timezone;
+
+import android.graphics.Paint;
+import android.icu.text.Collator;
+import android.icu.text.LocaleDisplayNames;
+import android.icu.text.TimeZoneFormat;
+import android.icu.text.TimeZoneNames;
+import android.icu.text.TimeZoneNames.NameType;
+import android.icu.util.Region;
+import android.icu.util.Region.RegionType;
+import android.icu.util.TimeZone;
+import android.icu.util.TimeZone.SystemTimeZoneType;
+import com.android.settingslib.datetime.ZoneGetter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * Provides data for manual selection of time zones based associated to regions. This class makes no
+ * attempt to avoid IO and processing intensive actions. This means it should not be called from the
+ * UI thread.
+ */
+public class DataLoader {
+
+ private static final int MIN_HOURS_OFFSET = -14;
+ private static final int MAX_HOURS_OFFSET = +12;
+
+ private final Locale mLocale;
+
+ private final Collator mCollator;
+ private final LocaleDisplayNames mLocaleDisplayNames;
+ private final TimeZoneFormat mTimeZoneFormat;
+ private final Paint mPaint;
+ private final AtomicLong nextItemId = new AtomicLong(1);
+ private final long mNow = System.currentTimeMillis();
+
+ public DataLoader(Locale locale) {
+ mLocale = locale;
+ mCollator = Collator.getInstance(locale);
+ mLocaleDisplayNames = LocaleDisplayNames.getInstance(locale);
+ mTimeZoneFormat = TimeZoneFormat.getInstance(locale);
+ mPaint = new Paint();
+ }
+
+ /**
+ * Returns a {@link RegionInfo} object for each region that has selectable time zones. The
+ * returned list will be sorted properly for display in the locale.
+ */
+ public List<RegionInfo> loadRegionInfos() {
+ final Set<Region> regions = Region.getAvailable(RegionType.TERRITORY);
+ final TreeSet<RegionInfo> regionInfos = new TreeSet<>(new RegionInfoComparator());
+ for (final Region region : regions) {
+ final String regionId = region.toString();
+ final Set<String> timeZoneIds = getTimeZoneIds(regionId);
+ if (timeZoneIds.isEmpty()) {
+ continue;
+ }
+
+ final String name = mLocaleDisplayNames.regionDisplayName(regionId);
+ final String regionalIndicator = createRegionalIndicator(regionId);
+
+ regionInfos.add(new RegionInfo(regionId, name, regionalIndicator, timeZoneIds));
+ }
+
+ return Collections.unmodifiableList(new ArrayList<>(regionInfos));
+ }
+
+ /**
+ * Returns a list of {@link TimeZoneInfo} objects. The returned list will be sorted properly for
+ * display in the locale.It may be smaller than the input collection, if equivalent IDs are
+ * passed in.
+ *
+ * @param timeZoneIds a list of Olson IDs.
+ */
+ public List<TimeZoneInfo> loadTimeZoneInfos(Collection<String> timeZoneIds) {
+ final TreeSet<TimeZoneInfo> timeZoneInfos = new TreeSet<>(new TimeZoneInfoComparator());
+ outer:
+ for (final String timeZoneId : timeZoneIds) {
+ final TimeZone timeZone = TimeZone.getFrozenTimeZone(timeZoneId);
+ for (final TimeZoneInfo other : timeZoneInfos) {
+ if (other.getTimeZone().hasSameRules(timeZone)) {
+ continue outer;
+ }
+ }
+ timeZoneInfos.add(createTimeZoneInfo(timeZone));
+ }
+ return Collections.unmodifiableList(new ArrayList<>(timeZoneInfos));
+ }
+
+ /**
+ * Returns a {@link TimeZoneInfo} for each fixed offset time zone, such as UTC or GMT+4. The
+ * returned list will be sorted in a reasonable way for display.
+ */
+ public List<TimeZoneInfo> loadFixedOffsets() {
+ final List<TimeZoneInfo> timeZoneInfos = new ArrayList<>();
+ timeZoneInfos.add(createTimeZoneInfo(TimeZone.getFrozenTimeZone("Etc/UTC")));
+ for (int hoursOffset = MAX_HOURS_OFFSET; hoursOffset >= MIN_HOURS_OFFSET; --hoursOffset) {
+ if (hoursOffset == 0) {
+ // UTC is handled above, so don't add GMT +/-0 again.
+ continue;
+ }
+ final String id = String.format("Etc/GMT%+d", hoursOffset);
+ timeZoneInfos.add(createTimeZoneInfo(TimeZone.getFrozenTimeZone(id)));
+ }
+ return Collections.unmodifiableList(timeZoneInfos);
+ }
+
+ /**
+ * Gets the set of ids for relevant TimeZones in the given region.
+ */
+ private Set<String> getTimeZoneIds(String regionId) {
+ return TimeZone.getAvailableIDs(
+ SystemTimeZoneType.CANONICAL_LOCATION, regionId, /* rawOffset */ null);
+ }
+
+ private TimeZoneInfo createTimeZoneInfo(TimeZone timeZone) {
+ // Every timezone we handle must be an OlsonTimeZone.
+ final String id = timeZone.getID();
+ final TimeZoneNames timeZoneNames = mTimeZoneFormat.getTimeZoneNames();
+ final java.util.TimeZone javaTimeZone = android.icu.impl.TimeZoneAdapter.wrap(timeZone);
+ final CharSequence gmtOffset = ZoneGetter.getGmtOffsetText(mTimeZoneFormat, mLocale,
+ javaTimeZone, new Date(mNow));
+ return new TimeZoneInfo.Builder(timeZone)
+ .setGenericName(timeZoneNames.getDisplayName(id, NameType.LONG_GENERIC, mNow))
+ .setStandardName(timeZoneNames.getDisplayName(id, NameType.LONG_STANDARD, mNow))
+ .setDaylightName(timeZoneNames.getDisplayName(id, NameType.LONG_DAYLIGHT, mNow))
+ .setExemplarLocation(timeZoneNames.getExemplarLocationName(id))
+ .setGmtOffset(gmtOffset)
+ .setItemId(nextItemId.getAndIncrement())
+ .build();
+ }
+
+ /**
+ * Create a Unicode Region Indicator Symbol for a given region id (a.k.a flag emoji). If the
+ * system can't render a flag for this region or the input is not a region id, this returns
+ * {@code null}.
+ *
+ * @param id the two-character region id.
+ * @return a String representing the flag of the region or {@code null}.
+ */
+ private String createRegionalIndicator(String id) {
+ if (id.length() != 2) {
+ return null;
+ }
+ final char c1 = id.charAt(0);
+ final char c2 = id.charAt(1);
+ if ('A' > c1 || c1 > 'Z' || 'A' > c2 || c2 > 'Z') {
+ return null;
+ }
+ // Regional Indicator A is U+1F1E6 which is 0xD83C 0xDDE6 in UTF-16.
+ final String regionalIndicator = new String(
+ new char[]{0xd83c, (char) (0xdde6 - 'A' + c1), 0xd83c, (char) (0xdde6 - 'A' + c2)});
+ if (!mPaint.hasGlyph(regionalIndicator)) {
+ return null;
+ }
+ return regionalIndicator;
+ }
+
+ private class TimeZoneInfoComparator implements Comparator<TimeZoneInfo> {
+
+ @Override
+ public int compare(TimeZoneInfo tzi1, TimeZoneInfo tzi2) {
+ int result =
+ Integer
+ .compare(tzi1.getTimeZone().getRawOffset(), tzi2.getTimeZone().getRawOffset());
+ if (result == 0) {
+ result = mCollator.compare(tzi1.getExemplarLocation(), tzi2.getExemplarLocation());
+ }
+ if (result == 0 && tzi1.getGenericName() != null && tzi2.getGenericName() != null) {
+ result = mCollator.compare(tzi1.getGenericName(), tzi2.getGenericName());
+ }
+ return result;
+ }
+ }
+
+ private class RegionInfoComparator implements Comparator<RegionInfo> {
+
+ @Override
+ public int compare(RegionInfo r1, RegionInfo r2) {
+ return mCollator.compare(r1.getName(), r2.getName());
+ }
+ }
+}
diff --git a/src/com/android/settings/datetime/timezone/RegionInfo.java b/src/com/android/settings/datetime/timezone/RegionInfo.java
new file mode 100644
index 0000000..99fbaf0
--- /dev/null
+++ b/src/com/android/settings/datetime/timezone/RegionInfo.java
@@ -0,0 +1,60 @@
+/*
+ * 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.datetime.timezone;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Data object describing a geographical region.
+ *
+ * Regions are roughly equivalent to countries, but not every region is a country (for example "U.S.
+ * overseas territories" is treated as a country).
+ */
+public class RegionInfo {
+
+ private final String mId;
+ private final String mName;
+ private final String mRegionalIndicator;
+ private final Collection<String> mTimeZoneIds;
+
+ public RegionInfo(String id, String name, String regionalIndicator,
+ Collection<String> timeZoneIds) {
+ mId = id;
+ mName = name;
+ mRegionalIndicator = regionalIndicator;
+ mTimeZoneIds = Collections.unmodifiableList(new ArrayList<>(timeZoneIds));
+ }
+
+ public String getId() {
+ return mId;
+ }
+
+ public String getName() {
+ return mName;
+ }
+
+ public Collection<String> getTimeZoneIds() {
+ return mTimeZoneIds;
+ }
+
+ @Override
+ public String toString() {
+ return mRegionalIndicator != null ? mRegionalIndicator + " " + mName : mName;
+ }
+}
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneAdapter.java b/src/com/android/settings/datetime/timezone/TimeZoneAdapter.java
new file mode 100644
index 0000000..79075ca
--- /dev/null
+++ b/src/com/android/settings/datetime/timezone/TimeZoneAdapter.java
@@ -0,0 +1,208 @@
+/*
+ * 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.datetime.timezone;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.icu.impl.OlsonTimeZone;
+import android.icu.text.DateFormat;
+import android.icu.text.DisplayContext;
+import android.icu.text.SimpleDateFormat;
+import android.icu.util.Calendar;
+import android.icu.util.TimeZone;
+import android.icu.util.TimeZoneTransition;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.settings.R;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Adapter for showing {@link TimeZoneInfo} objects in a recycler view.
+ */
+class TimeZoneAdapter extends RecyclerView.Adapter {
+
+ static final int VIEW_TYPE_NORMAL = 1;
+ static final int VIEW_TYPE_SELECTED = 2;
+
+ private final DateFormat mTimeFormat;
+ private final DateFormat mDateFormat;
+ private final View.OnClickListener mOnClickListener;
+ private final Context mContext;
+ private final String mCurrentTimeZone;
+
+ private List<TimeZoneInfo> mTimeZoneInfos;
+
+ TimeZoneAdapter(View.OnClickListener onClickListener, Context context) {
+ mOnClickListener = onClickListener;
+ mContext = context;
+ mTimeFormat = DateFormat.getTimeInstance(SimpleDateFormat.SHORT);
+ mDateFormat = DateFormat.getDateInstance(SimpleDateFormat.MEDIUM);
+ mDateFormat.setContext(DisplayContext.CAPITALIZATION_NONE);
+ mCurrentTimeZone = TimeZone.getDefault().getID();
+ setHasStableIds(true);
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return getItem(position).getItemId();
+ }
+
+ @NonNull
+ @Override
+ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ final View view = LayoutInflater.from(parent.getContext())
+ .inflate(R.layout.time_zone_list_item, parent, false);
+ view.setOnClickListener(mOnClickListener);
+ final ViewHolder viewHolder = new ViewHolder(view);
+ if (viewType == VIEW_TYPE_SELECTED) {
+ viewHolder.mNameView.setTypeface(
+ viewHolder.mNameView.getTypeface(), Typeface.BOLD);
+ }
+ return viewHolder;
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+ final TimeZoneInfo item = getItem(position);
+ final ViewHolder tzHolder = (ViewHolder) holder;
+ tzHolder.mNameView.setText(formatName(item));
+ tzHolder.mDetailsView.setText(formatDetails(item));
+ tzHolder.mTimeView.setText(formatTime(item));
+ String dstText = formatDstText(item);
+ tzHolder.mDstView.setText(dstText);
+ // Hide DST TextView when it has no content.
+ tzHolder.mDstView.setVisibility(dstText != null ? View.VISIBLE : View.GONE);
+
+ }
+
+ @Override
+ public int getItemCount() {
+ return getTimeZones().size();
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ final TimeZoneInfo tz = getItem(position);
+ if (tz.getId().equals(mCurrentTimeZone)) {
+ return VIEW_TYPE_SELECTED;
+ } else {
+ return VIEW_TYPE_NORMAL;
+ }
+ }
+
+ public TimeZoneInfo getItem(int position) {
+ return getTimeZones().get(position);
+ }
+
+ private CharSequence formatName(TimeZoneInfo item) {
+ CharSequence name = item.getExemplarLocation();
+ if (name == null) {
+ name = item.getGenericName();
+ }
+ if (name == null && item.getTimeZone().inDaylightTime(new Date())) {
+ name = item.getDaylightName();
+ }
+ if (name == null) {
+ name = item.getStandardName();
+ }
+ if (name == null) {
+ name = item.getGmtOffset();
+ }
+ return name;
+ }
+
+ private CharSequence formatDetails(TimeZoneInfo item) {
+ String name = item.getGenericName();
+ if (name == null) {
+ if (item.getTimeZone().inDaylightTime(new Date())) {
+ name = item.getDaylightName();
+ } else {
+ name = item.getStandardName();
+ }
+ }
+ if (name == null) {
+ return item.getGmtOffset();
+ } else {
+ return TextUtils.concat(item.getGmtOffset(), " ", name);
+ }
+ }
+
+ private String formatDstText(TimeZoneInfo item) {
+ final TimeZone timeZone = item.getTimeZone();
+ if (!timeZone.observesDaylightTime()) {
+ return null;
+ }
+
+ final TimeZoneTransition nextDstTransition = findNextDstTransition(timeZone);
+ if (nextDstTransition == null) {
+ return null;
+ }
+ final boolean toDst = nextDstTransition.getTo().getDSTSavings() != 0;
+ String timeType = toDst ? item.getDaylightName() : item.getStandardName();
+ if (timeType == null) {
+ // Fall back to generic "summer time" and "standard time" if the time zone has no
+ // specific names.
+ timeType = toDst ?
+ mContext.getString(R.string.zone_time_type_dst) :
+ mContext.getString(R.string.zone_time_type_standard);
+
+ }
+ final Calendar transitionTime = Calendar.getInstance(timeZone);
+ transitionTime.setTimeInMillis(nextDstTransition.getTime());
+ final String date = mDateFormat.format(transitionTime);
+ return mContext.getString(R.string.zone_change_to_from_dst, timeType, date);
+ }
+
+ private TimeZoneTransition findNextDstTransition(TimeZone timeZone) {
+ if (!(timeZone instanceof OlsonTimeZone)) {
+ return null;
+ }
+ final OlsonTimeZone olsonTimeZone = (OlsonTimeZone) timeZone;
+ TimeZoneTransition transition = olsonTimeZone.getNextTransition(
+ System.currentTimeMillis(), /* inclusive */ false);
+ do {
+ if (transition.getTo().getDSTSavings() != transition.getFrom().getDSTSavings()) {
+ break;
+ }
+ transition = olsonTimeZone.getNextTransition(
+ transition.getTime(), /*inclusive */ false);
+ } while (transition != null);
+ return transition;
+ }
+
+ private String formatTime(TimeZoneInfo item) {
+ return mTimeFormat.format(Calendar.getInstance(item.getTimeZone()));
+ }
+
+ private List<TimeZoneInfo> getTimeZones() {
+ if (mTimeZoneInfos == null) {
+ return Collections.emptyList();
+ }
+ return mTimeZoneInfos;
+ }
+
+ void setTimeZoneInfos(List<TimeZoneInfo> timeZoneInfos) {
+ mTimeZoneInfos = timeZoneInfos;
+ notifyDataSetChanged();
+ }
+}
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfo.java b/src/com/android/settings/datetime/timezone/TimeZoneInfo.java
new file mode 100644
index 0000000..96a2067
--- /dev/null
+++ b/src/com/android/settings/datetime/timezone/TimeZoneInfo.java
@@ -0,0 +1,136 @@
+/*
+ * 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.datetime.timezone;
+
+import android.icu.util.TimeZone;
+import android.text.TextUtils;
+
+/**
+ * Data object containing information for displaying a time zone for the user to select.
+ */
+public class TimeZoneInfo {
+
+ private final String mId;
+ private final TimeZone mTimeZone;
+ private final String mGenericName;
+ private final String mStandardName;
+ private final String mDaylightName;
+ private final String mExemplarLocation;
+ private final CharSequence mGmtOffset;
+ // Arbitrary id that's unique within all TimeZoneInfo objects created by a given DataLoader instance.
+ private final long mItemId;
+
+ public TimeZoneInfo(Builder builder) {
+ mTimeZone = builder.mTimeZone;
+ mId = mTimeZone.getID();
+ mGenericName = builder.mGenericName;
+ mStandardName = builder.mStandardName;
+ mDaylightName = builder.mDaylightName;
+ mExemplarLocation = builder.mExemplarLocation;
+ mGmtOffset = builder.mGmtOffset;
+ mItemId = builder.mItemId;
+ }
+
+ public String getId() {
+ return mId;
+ }
+
+ public TimeZone getTimeZone() {
+ return mTimeZone;
+ }
+
+ public String getExemplarLocation() {
+ return mExemplarLocation;
+ }
+
+ public String getGenericName() {
+ return mGenericName;
+ }
+
+ public String getStandardName() {
+ return mStandardName;
+ }
+
+ public String getDaylightName() {
+ return mDaylightName;
+ }
+
+ public CharSequence getGmtOffset() {
+ return mGmtOffset;
+ }
+
+ public long getItemId() {
+ return mItemId;
+ }
+
+ public static class Builder {
+ private final TimeZone mTimeZone;
+ private String mGenericName;
+ private String mStandardName;
+ private String mDaylightName;
+ private String mExemplarLocation;
+ private CharSequence mGmtOffset;
+ private long mItemId = -1;
+
+ public Builder(TimeZone timeZone) {
+ if (timeZone == null) {
+ throw new IllegalArgumentException("TimeZone must not be null!");
+ }
+ mTimeZone = timeZone;
+ }
+
+ public Builder setGenericName(String genericName) {
+ this.mGenericName = genericName;
+ return this;
+ }
+
+ public Builder setStandardName(String standardName) {
+ this.mStandardName = standardName;
+ return this;
+ }
+
+ public Builder setDaylightName(String daylightName) {
+ mDaylightName = daylightName;
+ return this;
+ }
+
+ public Builder setExemplarLocation(String exemplarLocation) {
+ mExemplarLocation = exemplarLocation;
+ return this;
+ }
+
+ public Builder setGmtOffset(CharSequence gmtOffset) {
+ mGmtOffset = gmtOffset;
+ return this;
+ }
+
+ public Builder setItemId(long itemId) {
+ mItemId = itemId;
+ return this;
+ }
+
+ public TimeZoneInfo build() {
+ if (TextUtils.isEmpty(mGmtOffset)) {
+ throw new IllegalStateException("gmtOffset must not be empty!");
+ }
+ if (mItemId == -1) {
+ throw new IllegalStateException("ItemId not set!");
+ }
+ return new TimeZoneInfo(this);
+ }
+
+ }
+}
diff --git a/src/com/android/settings/datetime/timezone/ViewHolder.java b/src/com/android/settings/datetime/timezone/ViewHolder.java
new file mode 100644
index 0000000..3cb2c4e
--- /dev/null
+++ b/src/com/android/settings/datetime/timezone/ViewHolder.java
@@ -0,0 +1,40 @@
+/*
+ * 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.datetime.timezone;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.TextView;
+import com.android.settings.R;
+
+/**
+ * View holder for a time zone list item.
+ */
+class ViewHolder extends RecyclerView.ViewHolder {
+
+ final TextView mNameView;
+ final TextView mDstView;
+ final TextView mDetailsView;
+ final TextView mTimeView;
+
+ public ViewHolder(View itemView) {
+ super(itemView);
+ mNameView = itemView.findViewById(R.id.tz_item_name);
+ mDstView = itemView.findViewById(R.id.tz_item_dst);
+ mDetailsView = itemView.findViewById(R.id.tz_item_details);
+ mTimeView = itemView.findViewById(R.id.tz_item_time);
+ }
+}
diff --git a/src/com/android/settings/datetime/timezone/ZonePicker.java b/src/com/android/settings/datetime/timezone/ZonePicker.java
new file mode 100644
index 0000000..d0d1720
--- /dev/null
+++ b/src/com/android/settings/datetime/timezone/ZonePicker.java
@@ -0,0 +1,229 @@
+/*
+ * 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.datetime.timezone;
+
+import android.app.Activity;
+import android.app.AlarmManager;
+import android.content.Context;
+import android.icu.util.TimeZone;
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.InstrumentedFragment;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * The class displaying a region list and a list of time zones for the selected region.
+ * Choosing an item from the list will set the time zone. Pressing Back without choosing from the
+ * list will not result in a change in the time zone setting.
+ */
+public class ZonePicker extends InstrumentedFragment
+ implements AdapterView.OnItemSelectedListener, View.OnClickListener {
+
+ private static final int MENU_BY_REGION = Menu.FIRST;
+ private static final int MENU_BY_OFFSET = Menu.FIRST + 1;
+
+ private Locale mLocale;
+ private List<RegionInfo> mRegions;
+ private Map<String, List<TimeZoneInfo>> mZoneInfos;
+ private List<TimeZoneInfo> mFixedOffsetTimeZones;
+ private String mSelectedTimeZone;
+ private boolean mSelectByRegion;
+ private DataLoader mDataLoader;
+ private TimeZoneAdapter mTimeZoneAdapter;
+
+ private RecyclerView mRecyclerView;
+ private LinearLayout mRegionSpinnerLayout;
+ private Spinner mRegionSpinner;
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.ZONE_PICKER;
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ final View view = inflater.inflate(R.layout.time_zone_list, container, false);
+
+ mLocale = getContext().getResources().getConfiguration().locale;
+ mDataLoader = new DataLoader(mLocale);
+ // TOOD: move this off the UI thread.
+ mRegions = mDataLoader.loadRegionInfos();
+ mZoneInfos = new HashMap<>();
+ mSelectByRegion = true;
+ mSelectedTimeZone = TimeZone.getDefault().getID();
+
+ mTimeZoneAdapter = new TimeZoneAdapter(this, getContext());
+ mRecyclerView = view.findViewById(R.id.tz_list);
+ mRecyclerView.setAdapter(mTimeZoneAdapter);
+ mRecyclerView.setLayoutManager(
+ new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, /* reverseLayout */ false));
+
+ final ArrayAdapter<RegionInfo> regionAdapter = new ArrayAdapter<>(getContext(),
+ R.layout.filter_spinner_item, mRegions);
+ regionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+ mRegionSpinnerLayout = view.findViewById(R.id.tz_region_spinner_layout);
+ mRegionSpinner = view.findViewById(R.id.tz_region_spinner);
+ mRegionSpinner.setAdapter(regionAdapter);
+ mRegionSpinner.setOnItemSelectedListener(this);
+ setupForCurrentTimeZone();
+ setHasOptionsMenu(true);
+ return view;
+ }
+
+ private void setupForCurrentTimeZone() {
+ final String localeRegionId = mLocale.getCountry().toUpperCase(Locale.ROOT);
+ final String currentTimeZone = TimeZone.getDefault().getID();
+ boolean fixedOffset = currentTimeZone.startsWith("Etc/GMT") ||
+ currentTimeZone.equals("Etc/UTC");
+
+ for (int regionIndex = 0; regionIndex < mRegions.size(); regionIndex++) {
+ final RegionInfo region = mRegions.get(regionIndex);
+ if (localeRegionId.equals(region.getId())) {
+ mRegionSpinner.setSelection(regionIndex);
+ }
+ if (!fixedOffset) {
+ for (String timeZoneId: region.getTimeZoneIds()) {
+ if (TextUtils.equals(timeZoneId, mSelectedTimeZone)) {
+ mRegionSpinner.setSelection(regionIndex);
+ return;
+ }
+ }
+ }
+ }
+
+ if (fixedOffset) {
+ setSelectByRegion(false);
+ }
+ }
+
+ @Override
+ public void onClick(View view) {
+ // Ignore extra clicks
+ if (!isResumed()) {
+ return;
+ }
+ final int position = mRecyclerView.getChildAdapterPosition(view);
+ if (position == RecyclerView.NO_POSITION) {
+ return;
+ }
+ final TimeZoneInfo timeZoneInfo = mTimeZoneAdapter.getItem(position);
+
+ // Update the system timezone value
+ final Activity activity = getActivity();
+ final AlarmManager alarm = (AlarmManager) activity.getSystemService(Context.ALARM_SERVICE);
+ alarm.setTimeZone(timeZoneInfo.getId());
+
+ activity.onBackPressed();
+ }
+
+ @Override
+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ menu.add(0, MENU_BY_REGION, 0, R.string.zone_menu_by_region);
+ menu.add(0, MENU_BY_OFFSET, 0, R.string.zone_menu_by_offset);
+ super.onCreateOptionsMenu(menu, inflater);
+ }
+
+ @Override
+ public void onPrepareOptionsMenu(Menu menu) {
+ if (mSelectByRegion) {
+ menu.findItem(MENU_BY_REGION).setVisible(false);
+ menu.findItem(MENU_BY_OFFSET).setVisible(true);
+ } else {
+ menu.findItem(MENU_BY_REGION).setVisible(true);
+ menu.findItem(MENU_BY_OFFSET).setVisible(false);
+ }
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+
+ case MENU_BY_REGION:
+ setSelectByRegion(true);
+ return true;
+
+ case MENU_BY_OFFSET:
+ setSelectByRegion(false);
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private void setSelectByRegion(boolean selectByRegion) {
+ mSelectByRegion = selectByRegion;
+ mRegionSpinnerLayout.setVisibility(
+ mSelectByRegion ? View.VISIBLE : View.GONE);
+ List<TimeZoneInfo> tzInfos;
+ if (selectByRegion) {
+ int selectedRegion = mRegionSpinner.getSelectedItemPosition();
+ if (selectedRegion == -1) {
+ // Arbitrarily pick the first item if no region was selected above.
+ selectedRegion = 0;
+ mRegionSpinner.setSelection(selectedRegion);
+ }
+ tzInfos = getTimeZoneInfos(mRegions.get(selectedRegion));
+ } else {
+ if (mFixedOffsetTimeZones == null) {
+ mFixedOffsetTimeZones = mDataLoader.loadFixedOffsets();
+ }
+ tzInfos = mFixedOffsetTimeZones;
+ }
+ mTimeZoneAdapter.setTimeZoneInfos(tzInfos);
+ }
+
+ private List<TimeZoneInfo> getTimeZoneInfos(RegionInfo regionInfo) {
+ List<TimeZoneInfo> tzInfos = mZoneInfos.get(regionInfo.getId());
+ if (tzInfos == null) {
+ // TODO: move this off the UI thread.
+ Collection<String> tzIds = regionInfo.getTimeZoneIds();
+ tzInfos = mDataLoader.loadTimeZoneInfos(tzIds);
+ mZoneInfos.put(regionInfo.getId(), tzInfos);
+ }
+ return tzInfos;
+ }
+
+ @Override
+ public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+ mTimeZoneAdapter.setTimeZoneInfos(getTimeZoneInfos(mRegions.get(position)));
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView<?> parent) {
+ mTimeZoneAdapter.setTimeZoneInfos(null);
+ }
+
+}
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index cb9e750..184c0c5 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -81,6 +81,8 @@
private void initializeSwitchBar() {
final SettingsActivity activity = (SettingsActivity) getActivity();
mSwitchBar = activity.getSwitchBar();
+ mSwitchBar.setSwitchBarText(R.string.automatic_storage_manager_master_switch_title,
+ R.string.automatic_storage_manager_master_switch_title);
mSwitchBar.show();
mSwitchController =
new AutomaticStorageManagerSwitchBarController(
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java
index 8ab1a07..a20afa1 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java
@@ -23,10 +23,10 @@
import android.support.v7.preference.Preference;
import android.widget.Switch;
-import com.android.internal.util.Preconditions;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.widget.SwitchBar;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.util.Preconditions;
+import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/** Handles the logic for flipping the storage management toggle on a {@link SwitchBar}. */
public class AutomaticStorageManagerSwitchBarController
diff --git a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
index e4e6493..171dd6a 100644
--- a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
+++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
@@ -18,6 +18,8 @@
import android.bluetooth.BluetoothA2dp;
import android.bluetooth.BluetoothCodecConfig;
+import android.bluetooth.BluetoothCodecStatus;
+import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.ListPreference;
@@ -80,7 +82,7 @@
final BluetoothCodecConfig codecConfig = mBluetoothA2dpConfigStore.createCodecConfig();
synchronized (mBluetoothA2dpConfigStore) {
if (mBluetoothA2dp != null) {
- setCodecConfigPreference(codecConfig);
+ setCodecConfigPreference(null, codecConfig); // Use current active device
}
}
// Because the setting is not persisted into permanent storage, we cannot call update state
@@ -99,13 +101,13 @@
@Override
public void updateState(Preference preference) {
- if (getCodecConfig() == null || mPreference == null) {
+ if (getCodecConfig(null) == null || mPreference == null) { // Use current active device
return;
}
BluetoothCodecConfig codecConfig;
synchronized (mBluetoothA2dpConfigStore) {
- codecConfig = getCodecConfig();
+ codecConfig = getCodecConfig(null); // Use current active device
}
final int index = getCurrentA2dpSettingIndex(codecConfig);
@@ -183,16 +185,19 @@
protected abstract int getDefaultIndex();
@VisibleForTesting
- void setCodecConfigPreference(BluetoothCodecConfig config) {
- mBluetoothA2dp.setCodecConfigPreference(config);
+ void setCodecConfigPreference(BluetoothDevice device,
+ BluetoothCodecConfig config) {
+ mBluetoothA2dp.setCodecConfigPreference(device, config);
}
@VisibleForTesting
- BluetoothCodecConfig getCodecConfig() {
- if (mBluetoothA2dp == null || mBluetoothA2dp.getCodecStatus() == null) {
- return null;
+ BluetoothCodecConfig getCodecConfig(BluetoothDevice device) {
+ if (mBluetoothA2dp != null) {
+ BluetoothCodecStatus codecStatus = mBluetoothA2dp.getCodecStatus(device);
+ if (codecStatus != null) {
+ return codecStatus.getCodecConfig();
+ }
}
-
- return mBluetoothA2dp.getCodecStatus().getCodecConfig();
+ return null;
}
}
diff --git a/src/com/android/settings/development/BluetoothAudioCodecPreferenceController.java b/src/com/android/settings/development/BluetoothAudioCodecPreferenceController.java
index 2163a70..b5c40a3 100644
--- a/src/com/android/settings/development/BluetoothAudioCodecPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothAudioCodecPreferenceController.java
@@ -109,14 +109,14 @@
case 6:
synchronized (mBluetoothA2dpConfigStore) {
if (mBluetoothA2dp != null) {
- mBluetoothA2dp.enableOptionalCodecs();
+ mBluetoothA2dp.enableOptionalCodecs(null); // Use current active device
}
}
return;
case 7:
synchronized (mBluetoothA2dpConfigStore) {
if (mBluetoothA2dp != null) {
- mBluetoothA2dp.disableOptionalCodecs();
+ mBluetoothA2dp.disableOptionalCodecs(null); // Use current active device
}
}
return;
diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
index 41a7983..3f09513 100644
--- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
+++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
@@ -57,10 +57,7 @@
@Override
public boolean isAvailable() {
- final String buildType = SystemProperties.get(BUILD_TYPE);
- return mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor) &&
- (TextUtils.equals(USERDEBUG_BUILD, buildType) || TextUtils.equals(ENG_BUILD,
- buildType));
+ return mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor);
}
@Override
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index a404bc0..395d230 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -398,8 +398,7 @@
controllers.add(new CameraLaserSensorPreferenceController(context));
controllers.add(new WifiDisplayCertificationPreferenceController(context));
controllers.add(new WifiVerboseLoggingPreferenceController(context));
- controllers.add(new WifiAggressiveHandoverPreferenceController(context));
- controllers.add(new WifiRoamScansPreferenceController(context));
+ controllers.add(new WifiConnectedMacRandomizationPreferenceController(context));
controllers.add(new MobileDataAlwaysOnPreferenceController(context));
controllers.add(new TetheringHardwareAccelPreferenceController(context));
controllers.add(new SelectUsbConfigPreferenceController(context, lifecycle));
@@ -424,6 +423,7 @@
controllers.add(new ShowLayoutBoundsPreferenceController(context));
controllers.add(new RtlLayoutPreferenceController(context));
controllers.add(new WindowAnimationScalePreferenceController(context));
+ controllers.add(new EmulateDisplayCutoutPreferenceController(context));
controllers.add(new TransitionAnimationScalePreferenceController(context));
controllers.add(new AnimatorDurationScalePreferenceController(context));
controllers.add(new SecondaryDisplayPreferenceController(context));
@@ -435,12 +435,12 @@
controllers.add(new ForceMSAAPreferenceController(context));
controllers.add(new HardwareOverlaysPreferenceController(context));
controllers.add(new SimulateColorSpacePreferenceController(context));
- controllers.add(new SetGpuRendererPreferenceController(context));
controllers.add(new UsbAudioRoutingPreferenceController(context));
controllers.add(new StrictModePreferenceController(context));
controllers.add(new ProfileGpuRenderingPreferenceController(context));
controllers.add(new KeepActivitiesPreferenceController(context));
controllers.add(new BackgroundProcessLimitPreferenceController(context));
+ controllers.add(new ShowFirstCrashDialogPreferenceController(context));
controllers.add(new AppsNotRespondingPreferenceController(context));
controllers.add(new NotificationChannelWarningsPreferenceController(context));
controllers.add(new AllowAppsOnExternalPreferenceController(context));
diff --git a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
new file mode 100644
index 0000000..d6c74f9
--- /dev/null
+++ b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.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.development;
+
+import static android.os.UserHandle.USER_SYSTEM;
+
+import android.content.Context;
+import android.content.om.IOverlayManager;
+import android.content.om.OverlayInfo;
+import android.content.pm.PackageManager;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.internal.util.ArrayUtils;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+import java.util.List;
+
+public class EmulateDisplayCutoutPreferenceController extends
+ DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin {
+
+ public static final String EMULATION_OVERLAY_PREFIX =
+ "com.android.internal.display.cutout.emulation.";
+ private static final String KEY = "display_cutout_emulation";
+
+ private final IOverlayManager mOverlayManager;
+ private final boolean mAvailable;
+
+ private ListPreference mPreference;
+ private PackageManager mPackageManager;
+
+ @VisibleForTesting
+ EmulateDisplayCutoutPreferenceController(Context context, PackageManager packageManager,
+ IOverlayManager overlayManager) {
+ super(context);
+ mOverlayManager = overlayManager;
+ mPackageManager = packageManager;
+ mAvailable = overlayManager != null && getOverlayInfos().length > 0;
+ }
+
+ public EmulateDisplayCutoutPreferenceController(Context context) {
+ this(context, context.getPackageManager(), IOverlayManager.Stub.asInterface(
+ ServiceManager.getService(Context.OVERLAY_SERVICE)));
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return mAvailable;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ setPreference((ListPreference) screen.findPreference(getPreferenceKey()));
+ }
+
+ @VisibleForTesting
+ void setPreference(ListPreference preference) {
+ mPreference = preference;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ return setEmulationOverlay((String) newValue);
+ }
+
+ private boolean setEmulationOverlay(String packageName) {
+ OverlayInfo[] overlays = getOverlayInfos();
+ CharSequence currentPackageName = null;
+ for (OverlayInfo o : overlays) {
+ if (o.isEnabled()) {
+ currentPackageName = o.packageName;
+ }
+ }
+
+ if (TextUtils.isEmpty(packageName) && TextUtils.isEmpty(currentPackageName)
+ || TextUtils.equals(packageName, currentPackageName)) {
+ // Already set.
+ return true;
+ }
+
+ for (OverlayInfo o : overlays) {
+ boolean isEnabled = o.isEnabled();
+ boolean shouldBeEnabled = TextUtils.equals(o.packageName, packageName);
+ if (isEnabled != shouldBeEnabled) {
+ try {
+ mOverlayManager.setEnabled(o.packageName, shouldBeEnabled, USER_SYSTEM);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+ }
+ updateState(mPreference);
+ return true;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ OverlayInfo[] overlays = getOverlayInfos();
+
+ CharSequence[] pkgs = new CharSequence[overlays.length + 1];
+ CharSequence[] labels = new CharSequence[pkgs.length];
+
+ int current = 0;
+ pkgs[0] = "";
+ labels[0] = mContext.getString(R.string.display_cutout_emulation_none);
+
+ for (int i = 0; i < overlays.length; i++) {
+ OverlayInfo o = overlays[i];
+ pkgs[i+1] = o.packageName;
+ if (o.isEnabled()) {
+ current = i+1;
+ }
+ }
+ for (int i = 1; i < pkgs.length; i++) {
+ try {
+ labels[i] = mPackageManager.getApplicationInfo(pkgs[i].toString(), 0)
+ .loadLabel(mPackageManager);
+ } catch (PackageManager.NameNotFoundException e) {
+ labels[i] = pkgs[i];
+ }
+ }
+
+ mPreference.setEntries(labels);
+ mPreference.setEntryValues(pkgs);
+ mPreference.setValueIndex(current);
+ mPreference.setSummary(labels[current]);
+ }
+
+ private OverlayInfo[] getOverlayInfos() {
+ try {
+ @SuppressWarnings("unchecked") List<OverlayInfo> overlayInfos =
+ mOverlayManager.getOverlayInfosForTarget("android", USER_SYSTEM);
+ for (int i = overlayInfos.size() - 1; i >= 0; i--) {
+ if (!overlayInfos.get(i).packageName.startsWith(EMULATION_OVERLAY_PREFIX)) {
+ overlayInfos.remove(i);
+ }
+ }
+ return overlayInfos.toArray(new OverlayInfo[overlayInfos.size()]);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchEnabled() {
+ mPreference.setEnabled(true);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ setEmulationOverlay("");
+ updateState(mPreference);
+ mPreference.setEnabled(false);
+ }
+}
diff --git a/src/com/android/settings/development/SetGpuRendererPreferenceController.java b/src/com/android/settings/development/SetGpuRendererPreferenceController.java
deleted file mode 100644
index b19344c..0000000
--- a/src/com/android/settings/development/SetGpuRendererPreferenceController.java
+++ /dev/null
@@ -1,102 +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.development;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.text.TextUtils;
-import android.view.ThreadedRenderer;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import com.android.settingslib.development.SystemPropPoker;
-
-public class SetGpuRendererPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
- PreferenceControllerMixin {
-
- private static final String DEBUG_HW_RENDERER_KEY = "debug_hw_renderer";
-
- private final String[] mListValues;
- private final String[] mListSummaries;
- private ListPreference mPreference;
-
- public SetGpuRendererPreferenceController(Context context) {
- super(context);
-
- mListValues = context.getResources().getStringArray(R.array.debug_hw_renderer_values);
- mListSummaries = context.getResources().getStringArray(R.array.debug_hw_renderer_entries);
- }
-
- @Override
- public String getPreferenceKey() {
- return DEBUG_HW_RENDERER_KEY;
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
-
- mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- writeDebugHwRendererOptions(newValue);
- updateDebugHwRendererOptions();
- return true;
- }
-
- @Override
- public void updateState(Preference preference) {
- updateDebugHwRendererOptions();
- }
-
- @Override
- protected void onDeveloperOptionsSwitchEnabled() {
- mPreference.setEnabled(true);
- }
-
- @Override
- protected void onDeveloperOptionsSwitchDisabled() {
- mPreference.setEnabled(false);
- }
-
- private void writeDebugHwRendererOptions(Object newValue) {
- SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY,
- newValue == null ? "" : newValue.toString());
- SystemPropPoker.getInstance().poke();
- }
-
- private void updateDebugHwRendererOptions() {
- final String value = SystemProperties.get(
- ThreadedRenderer.DEBUG_RENDERER_PROPERTY, "" /* default */);
- int index = 0; // default
- for (int i = 0; i < mListValues.length; i++) {
- if (TextUtils.equals(value, mListValues[i])) {
- index = i;
- break;
- }
- }
- mPreference.setValue(mListValues[index]);
- mPreference.setSummary(mListSummaries[index]);
- }
-}
diff --git a/src/com/android/settings/development/WifiRoamScansPreferenceController.java b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java
similarity index 62%
copy from src/com/android/settings/development/WifiRoamScansPreferenceController.java
copy to src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java
index b3ff400..e1f9b32 100644
--- a/src/com/android/settings/development/WifiRoamScansPreferenceController.java
+++ b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.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.
@@ -17,7 +17,7 @@
package com.android.settings.development;
import android.content.Context;
-import android.net.wifi.WifiManager;
+import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
@@ -26,29 +26,34 @@
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-public class WifiRoamScansPreferenceController extends
+public class ShowFirstCrashDialogPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
- private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";
+ private static final String SHOW_FIRST_CRASH_DIALOG_KEY = "show_first_crash_dialog";
@VisibleForTesting
static final int SETTING_VALUE_ON = 1;
@VisibleForTesting
static final int SETTING_VALUE_OFF = 0;
- private final WifiManager mWifiManager;
private SwitchPreference mPreference;
- public WifiRoamScansPreferenceController(Context context) {
+ public ShowFirstCrashDialogPreferenceController(Context context) {
super(context);
-
- mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
}
@Override
public String getPreferenceKey() {
- return WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY;
+ return SHOW_FIRST_CRASH_DIALOG_KEY;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ // If the global setting is on, hide this preference since the global overrides
+ // any user preference.
+ return Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.SHOW_FIRST_CRASH_DIALOG, SETTING_VALUE_OFF) == SETTING_VALUE_OFF;
}
@Override
@@ -61,14 +66,17 @@
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean isEnabled = (Boolean) newValue;
- mWifiManager.setAllowScansWithTraffic(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION,
+ isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
return true;
}
@Override
public void updateState(Preference preference) {
- final boolean enabled = mWifiManager.getAllowScansWithTraffic() > 0;
- mPreference.setChecked(enabled);
+ final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, SETTING_VALUE_OFF);
+ mPreference.setChecked(mode != SETTING_VALUE_OFF);
}
@Override
@@ -78,7 +86,8 @@
@Override
protected void onDeveloperOptionsSwitchDisabled() {
- mWifiManager.setAllowScansWithTraffic(SETTING_VALUE_OFF);
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, SETTING_VALUE_OFF);
mPreference.setEnabled(false);
mPreference.setChecked(false);
}
diff --git a/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java b/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
deleted file mode 100644
index aa607ce..0000000
--- a/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
+++ /dev/null
@@ -1,85 +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.development;
-
-import android.content.Context;
-import android.net.wifi.WifiManager;
-import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class WifiAggressiveHandoverPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
- PreferenceControllerMixin {
-
- private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";
-
- @VisibleForTesting
- static final int SETTING_VALUE_ON = 1;
- @VisibleForTesting
- static final int SETTING_VALUE_OFF = 0;
-
- private final WifiManager mWifiManager;
- private SwitchPreference mPreference;
-
- public WifiAggressiveHandoverPreferenceController(Context context) {
- super(context);
-
- mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- }
-
- @Override
- public String getPreferenceKey() {
- return WIFI_AGGRESSIVE_HANDOVER_KEY;
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
-
- mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- boolean isEnabled = (Boolean) newValue;
- mWifiManager.enableAggressiveHandover(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
- return true;
- }
-
- @Override
- public void updateState(Preference preference) {
- boolean enabled = mWifiManager.getAggressiveHandover() > 0;
- mPreference.setChecked(enabled);
- }
-
- @Override
- protected void onDeveloperOptionsSwitchEnabled() {
- mPreference.setEnabled(true);
- }
-
- @Override
- protected void onDeveloperOptionsSwitchDisabled() {
- mWifiManager.enableAggressiveHandover(SETTING_VALUE_OFF);
- mPreference.setChecked(false);
- mPreference.setEnabled(false);
- }
-}
diff --git a/src/com/android/settings/development/WifiRoamScansPreferenceController.java b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java
similarity index 65%
rename from src/com/android/settings/development/WifiRoamScansPreferenceController.java
rename to src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java
index b3ff400..eae2355 100644
--- a/src/com/android/settings/development/WifiRoamScansPreferenceController.java
+++ b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java
@@ -17,58 +17,65 @@
package com.android.settings.development;
import android.content.Context;
-import android.net.wifi.WifiManager;
+import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-public class WifiRoamScansPreferenceController extends
+public class WifiConnectedMacRandomizationPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
- private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";
+ private static final String WIFI_CONNECTED_MAC_RANDOMIZATION_KEY =
+ "wifi_connected_mac_randomization";
@VisibleForTesting
static final int SETTING_VALUE_ON = 1;
@VisibleForTesting
static final int SETTING_VALUE_OFF = 0;
- private final WifiManager mWifiManager;
private SwitchPreference mPreference;
- public WifiRoamScansPreferenceController(Context context) {
+ public WifiConnectedMacRandomizationPreferenceController(Context context) {
super(context);
+ }
- mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+ @Override
+ public boolean isAvailable() {
+ return mContext.getResources().getBoolean(
+ R.bool.config_wifi_support_connected_mac_randomization);
}
@Override
public String getPreferenceKey() {
- return WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY;
+ return WIFI_CONNECTED_MAC_RANDOMIZATION_KEY;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
-
mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean isEnabled = (Boolean) newValue;
- mWifiManager.setAllowScansWithTraffic(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED,
+ isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
return true;
}
@Override
public void updateState(Preference preference) {
- final boolean enabled = mWifiManager.getAllowScansWithTraffic() > 0;
- mPreference.setChecked(enabled);
+ final int enableMode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, SETTING_VALUE_OFF);
+ mPreference.setChecked(enableMode != SETTING_VALUE_OFF);
}
@Override
@@ -78,8 +85,9 @@
@Override
protected void onDeveloperOptionsSwitchDisabled() {
- mWifiManager.setAllowScansWithTraffic(SETTING_VALUE_OFF);
- mPreference.setEnabled(false);
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, SETTING_VALUE_OFF);
mPreference.setChecked(false);
+ mPreference.setEnabled(false);
}
}
diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java
index bc3fcb5..38f9565 100644
--- a/src/com/android/settings/development/qstile/DevelopmentTiles.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java
@@ -16,20 +16,29 @@
package com.android.settings.development.qstile;
+import android.content.Context;
+import android.os.IBinder;
+import android.os.Parcel;
import android.os.RemoteException;
+import android.os.ServiceManager;
import android.os.SystemProperties;
import android.provider.Settings;
import android.service.quicksettings.Tile;
import android.service.quicksettings.TileService;
+import android.support.annotation.VisibleForTesting;
+import android.util.Log;
import android.view.IWindowManager;
import android.view.ThreadedRenderer;
import android.view.View;
import android.view.WindowManagerGlobal;
+import android.widget.Toast;
import com.android.internal.app.LocalePicker;
+import com.android.settings.wrapper.IWindowManagerWrapper;
import com.android.settingslib.development.SystemPropPoker;
public abstract class DevelopmentTiles extends TileService {
+ private static final String TAG = "DevelopmentTiles";
protected abstract boolean isEnabled();
@@ -131,4 +140,120 @@
} catch (RemoteException e) { }
}
}
+
+ /**
+ * Tile to toggle Window Trace.
+ */
+ public static class WindowTrace extends DevelopmentTiles {
+ @VisibleForTesting
+ IWindowManagerWrapper mWindowManager;
+ @VisibleForTesting
+ Toast mToast;
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ mWindowManager = new IWindowManagerWrapper(WindowManagerGlobal
+ .getWindowManagerService());
+ Context context = getApplicationContext();
+ CharSequence text = "Trace written to /data/misc/wmtrace/wm_trace.pb";
+ mToast = Toast.makeText(context, text, Toast.LENGTH_LONG);
+ }
+
+ @Override
+ protected boolean isEnabled() {
+ try {
+ return mWindowManager.isWindowTraceEnabled();
+ } catch (RemoteException e) {
+ Log.e(TAG,
+ "Could not get window trace status, defaulting to false." + e.toString());
+ }
+ return false;
+ }
+
+ @Override
+ protected void setIsEnabled(boolean isEnabled) {
+ try {
+ if (isEnabled) {
+ mWindowManager.startWindowTrace();
+ } else {
+ mWindowManager.stopWindowTrace();
+ mToast.show();
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Could not set window trace status." + e.toString());
+ }
+ }
+ }
+
+ /**
+ * Tile to toggle Layer Trace.
+ */
+ public static class LayerTrace extends DevelopmentTiles {
+ @VisibleForTesting
+ static final int SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE = 1025;
+ @VisibleForTesting
+ static final int SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE = 1026;
+ @VisibleForTesting
+ IBinder mSurfaceFlinger;
+ @VisibleForTesting
+ Toast mToast;
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger");
+ Context context = getApplicationContext();
+ CharSequence text = "Trace written to /data/misc/wmtrace/layers_trace.pb";
+ mToast = Toast.makeText(context, text, Toast.LENGTH_LONG);
+ }
+
+ @Override
+ protected boolean isEnabled() {
+ boolean surfaceTraceEnabled = false;
+ Parcel reply = null;
+ Parcel data = null;
+ try {
+ if (mSurfaceFlinger != null) {
+ reply = Parcel.obtain();
+ data = Parcel.obtain();
+ data.writeInterfaceToken("android.ui.ISurfaceComposer");
+ mSurfaceFlinger.transact(SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE,
+ data, reply, 0 /* flags */ );
+ surfaceTraceEnabled = reply.readBoolean();
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Could not get layer trace status, defaulting to false." + e.toString());
+ } finally {
+ if (data != null) {
+ data.recycle();
+ reply.recycle();
+ }
+ }
+ return surfaceTraceEnabled;
+ }
+
+ @Override
+ protected void setIsEnabled(boolean isEnabled) {
+ Parcel data = null;
+ try {
+ if (mSurfaceFlinger != null) {
+ data = Parcel.obtain();
+ data.writeInterfaceToken("android.ui.ISurfaceComposer");
+ data.writeInt(isEnabled ? 1 : 0);
+ mSurfaceFlinger.transact(SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE,
+ data, null, 0 /* flags */);
+ if (!isEnabled){
+ mToast.show();
+ }
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Could not set layer tracing." + e.toString());
+ } finally {
+ if (data != null) {
+ data.recycle();
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java
new file mode 100644
index 0000000..c968d25
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.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.deviceinfo;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.accounts.AccountDetailDashboardFragment;
+import com.android.settings.accounts.AccountFeatureProvider;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+
+public class BrandedAccountPreferenceController extends BasePreferenceController {
+ private static final String KEY_PREFERENCE_TITLE = "branded_account";
+ private final Account[] mAccounts;
+
+ public BrandedAccountPreferenceController(Context context) {
+ super(context, KEY_PREFERENCE_TITLE);
+ final AccountFeatureProvider accountFeatureProvider = FeatureFactory.getFactory(
+ mContext).getAccountFeatureProvider();
+ mAccounts = accountFeatureProvider.getAccounts(mContext);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ if (mAccounts != null && mAccounts.length > 0) {
+ return AVAILABLE;
+ }
+ return DISABLED_FOR_USER;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ final AccountFeatureProvider accountFeatureProvider = FeatureFactory.getFactory(
+ mContext).getAccountFeatureProvider();
+ final Preference accountPreference = screen.findPreference(KEY_PREFERENCE_TITLE);
+ if (accountPreference != null && (mAccounts == null || mAccounts.length == 0)) {
+ screen.removePreference(accountPreference);
+ return;
+ }
+
+ accountPreference.setSummary(mAccounts[0].name);
+ accountPreference.setOnPreferenceClickListener(preference -> {
+ final Bundle args = new Bundle();
+ args.putParcelable(AccountDetailDashboardFragment.KEY_ACCOUNT,
+ mAccounts[0]);
+ args.putParcelable(AccountDetailDashboardFragment.KEY_USER_HANDLE,
+ android.os.Process.myUserHandle());
+ args.putString(AccountDetailDashboardFragment.KEY_ACCOUNT_TYPE,
+ accountFeatureProvider.getAccountType());
+ Utils.startWithFragment(mContext, AccountDetailDashboardFragment.class.getName(),
+ args, null, 0,
+ R.string.account_sync_title, null, MetricsEvent.ACCOUNT);
+ return true;
+ });
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index 2641f5d..0f3bfb8 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -34,11 +34,11 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.core.AbstractPreferenceController;
+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.OnResume;
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java
similarity index 83%
rename from src/com/android/settings/DeviceInfoSettings.java
rename to src/com/android/settings/deviceinfo/DeviceInfoSettings.java
index 7e32e5e..9b99e8b 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.deviceinfo;
import android.app.Activity;
import android.app.Fragment;
@@ -26,23 +26,13 @@
import android.telephony.TelephonyManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.deviceinfo.BluetoothAddressPreferenceController;
-import com.android.settings.deviceinfo.BuildNumberPreferenceController;
-import com.android.settings.deviceinfo.DeviceModelPreferenceController;
-import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;
-import com.android.settings.deviceinfo.FeedbackPreferenceController;
-import com.android.settings.deviceinfo.ImsStatusPreferenceController;
-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.WifiMacAddressPreferenceController;
-import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;
-import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
-import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
+import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController;
+import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController;
+import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -84,8 +74,8 @@
|| !arguments.containsKey(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY)) {
// Increase the number of children when the device contains more than 1 sim.
- final TelephonyManager telephonyManager = (TelephonyManager) getSystemService(
- Context.TELEPHONY_SERVICE);
+ final TelephonyManager telephonyManager = (TelephonyManager) getContext()
+ .getSystemService(Context.TELEPHONY_SERVICE);
final int numberOfChildren = Math.max(SIM_PREFERENCES_COUNT,
SIM_PREFERENCES_COUNT * telephonyManager.getPhoneCount())
+ NON_SIM_PREFERENCES_COUNT;
@@ -110,7 +100,7 @@
@Override
protected int getPreferenceScreenResId() {
- return R.xml.device_info_settings_v2;
+ return R.xml.device_info_settings;
}
@Override
@@ -148,10 +138,10 @@
Activity activity, Fragment fragment, Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new PhoneNumberPreferenceController(context));
- controllers.add(new SimStatusPreferenceControllerV2(context, fragment));
+ controllers.add(new SimStatusPreferenceController(context, fragment));
controllers.add(new DeviceModelPreferenceController(context, fragment));
- controllers.add(new ImeiInfoPreferenceControllerV2(context, fragment));
- controllers.add(new FirmwareVersionPreferenceControllerV2(context, fragment));
+ controllers.add(new ImeiInfoPreferenceController(context, fragment));
+ controllers.add(new FirmwareVersionPreferenceController(context, fragment));
controllers.add(new ImsStatusPreferenceController(context, lifecycle));
controllers.add(new IpAddressPreferenceController(context, lifecycle));
controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
@@ -176,7 +166,7 @@
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.device_info_settings_v2;
+ sir.xmlResId = R.xml.device_info_settings;
return Arrays.asList(sir);
}
diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
new file mode 100644
index 0000000..0f1dea1
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.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.deviceinfo;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.SpannedString;
+
+import com.android.settings.bluetooth.BluetoothLengthDeviceNameFilter;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.widget.ValidatedEditTextPreference;
+import com.android.settings.wifi.tether.WifiDeviceNameTextValidator;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+public class DeviceNamePreferenceController extends BasePreferenceController
+ implements ValidatedEditTextPreference.Validator, Preference.OnPreferenceChangeListener {
+ private static final String PREF_KEY = "device_name";
+ private String mDeviceName;
+ protected WifiManager mWifiManager;
+ private final WifiDeviceNameTextValidator mWifiDeviceNameTextValidator;
+ private ValidatedEditTextPreference mPreference;
+ @Nullable
+ private LocalBluetoothManager mBluetoothManager;
+
+ public DeviceNamePreferenceController(Context context) {
+ super(context, PREF_KEY);
+ mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+ mWifiDeviceNameTextValidator = new WifiDeviceNameTextValidator();
+ initializeDeviceName();
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = (ValidatedEditTextPreference) screen.findPreference(PREF_KEY);
+ mPreference.setSummary(getSummary());
+ mPreference.setValidator(this);
+ }
+
+ private void initializeDeviceName() {
+ mDeviceName = Settings.Global.getString(mContext.getContentResolver(),
+ Settings.Global.DEVICE_NAME);
+ if (mDeviceName == null) {
+ mDeviceName = Build.MODEL;
+ }
+ }
+
+ @Override
+ public String getSummary() {
+ return mDeviceName;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return PREF_KEY;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ mDeviceName = (String) newValue;
+ setDeviceName(mDeviceName);
+ preference.setSummary(getSummary());
+ return true;
+ }
+
+ @Override
+ public boolean isTextValid(String deviceName) {
+ // BluetoothNameDialogFragment describes BT name filter as a 248 bytes long cap.
+ // Given the restrictions presented by the SSID name filter (32 char), I don't believe it is
+ // possible to construct an SSID that is not a valid Bluetooth name.
+ return mWifiDeviceNameTextValidator.isTextValid(deviceName);
+ }
+
+ public void setLocalBluetoothManager(LocalBluetoothManager localBluetoothManager) {
+ mBluetoothManager = localBluetoothManager;
+ }
+
+ /**
+ * This method presumes that security/validity checks have already been passed.
+ */
+ private void setDeviceName(String deviceName) {
+ setSettingsGlobalDeviceName(deviceName);
+ setBluetoothDeviceName(deviceName);
+ setTetherSsidName(deviceName);
+ }
+
+ private void setSettingsGlobalDeviceName(String deviceName) {
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEVICE_NAME,
+ deviceName);
+ }
+
+ private void setBluetoothDeviceName(String deviceName) {
+ // Bluetooth manager doesn't exist for certain devices.
+ if (mBluetoothManager == null) {
+ return;
+ }
+
+ final LocalBluetoothAdapter localBluetoothAdapter = mBluetoothManager.getBluetoothAdapter();
+ if (localBluetoothAdapter != null) {
+ localBluetoothAdapter.setName(getFilteredBluetoothString(deviceName));
+ }
+ }
+
+ /**
+ * Using a UTF8ByteLengthFilter, we can filter a string to be compliant with the Bluetooth spec.
+ * 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(),
+ new SpannedString(""),
+ 0, 0);
+ // null -> use the original
+ if (filteredSequence == null) {
+ return deviceName;
+ }
+ return filteredSequence.toString();
+ }
+
+ private void setTetherSsidName(String deviceName) {
+ final WifiConfiguration config = mWifiManager.getWifiApConfiguration();
+ config.SSID = deviceName;
+ // TODO: If tether is running, turn off the AP and restart it after setting config.
+ mWifiManager.setWifiApConfiguration(config);
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
index 802d774..93f75bf 100644
--- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
@@ -23,6 +23,8 @@
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
import android.text.TextUtils;
import com.android.settings.R;
@@ -120,7 +122,7 @@
final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,
subscriptionInfo);
return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)
- : phoneNumber;
+ : BidiFormatter.getInstance().unicodeWrap(phoneNumber, TextDirectionHeuristics.LTR);
}
@VisibleForTesting
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 0f88b4a..efcf03d 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -160,8 +160,11 @@
mInternalCategory.addPreference(mInternalSummary);
int privateCount = 0;
- long privateUsedBytes = 0;
- long privateTotalBytes = 0;
+
+ final StorageManagerVolumeProvider smvp = new StorageManagerVolumeProvider(mStorageManager);
+ final PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(smvp);
+ final long privateTotalBytes = info.totalBytes;
+ final long privateUsedBytes = info.totalBytes - info.freeBytes;
final List<VolumeInfo> volumes = mStorageManager.getVolumes();
Collections.sort(volumes, VolumeInfo.getDescriptionComparator());
@@ -173,11 +176,6 @@
final int color = COLOR_PRIVATE[privateCount++ % COLOR_PRIVATE.length];
mInternalCategory.addPreference(
new StorageVolumePreference(context, vol, color, volumeTotalBytes));
- if (vol.isMountedReadable()) {
- final File path = vol.getPath();
- privateUsedBytes += (volumeTotalBytes - path.getFreeSpace());
- privateTotalBytes += volumeTotalBytes;
- }
} else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
mExternalCategory.addPreference(
new StorageVolumePreference(context, vol, COLOR_PUBLIC, 0));
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index 91bdfbf..023b2a1 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -16,6 +16,7 @@
package com.android.settings.deviceinfo;
+import android.app.usage.StorageStatsManager;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Color;
@@ -25,6 +26,7 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.text.format.Formatter;
+import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageView;
@@ -34,6 +36,7 @@
import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
import com.android.settingslib.Utils;
+import java.io.IOException;
import java.io.File;
/**
@@ -41,6 +44,8 @@
* quick actions like unmounting.
*/
public class StorageVolumePreference extends Preference {
+ private static final String TAG = StorageVolumePreference.class.getSimpleName();
+
private final StorageManager mStorageManager;
private final VolumeInfo mVolume;
@@ -70,11 +75,28 @@
if (volume.isMountedReadable()) {
// TODO: move statfs() to background thread
final File path = volume.getPath();
- if (totalBytes <= 0) {
- totalBytes = path.getTotalSpace();
+
+ long freeBytes = 0;
+ long usedBytes = 0;
+ if (volume.getType() == VolumeInfo.TYPE_PRIVATE) {
+ final StorageStatsManager stats =
+ context.getSystemService(StorageStatsManager.class);
+ try {
+ totalBytes = stats.getTotalBytes(volume.getFsUuid());
+ freeBytes = stats.getFreeBytes(volume.getFsUuid());
+ usedBytes = totalBytes - freeBytes;
+ } catch (IOException e) {
+ Log.w(TAG, e);
+ }
+ } else {
+ // StorageStatsManager can only query private volumes.
+ // Default to previous storage calculation for public volumes.
+ if (totalBytes <= 0) {
+ totalBytes = path.getTotalSpace();
+ }
+ freeBytes = path.getFreeSpace();
+ usedBytes = totalBytes - freeBytes;
}
- final long freeBytes = path.getFreeSpace();
- final long usedBytes = totalBytes - freeBytes;
final String used = Formatter.formatFileSize(context, usedBytes);
final String total = Formatter.formatFileSize(context, totalBytes);
diff --git a/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java b/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
index a061f82..2806275 100644
--- a/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
@@ -47,7 +47,8 @@
@Override
public int getAvailabilityStatus() {
- return mUm.isAdminUser()
+ return mContext.getResources().getBoolean(R.bool.config_show_system_update_settings)
+ && mUm.isAdminUser()
? AVAILABLE
: DISABLED_UNSUPPORTED;
}
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
similarity index 63%
copy from src/com/android/settings/DeviceInfoSettings.java
copy to src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
index 7e32e5e..bb95228 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 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,23 +14,31 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.deviceinfo.aboutphone;
+
+import static com.android.settings.bluetooth.Utils.getLocalBtManager;
import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
-import android.content.Intent;
+import android.content.pm.UserInfo;
import android.os.Bundle;
+import android.os.UserManager;
import android.provider.SearchIndexableResource;
-import android.support.annotation.VisibleForTesting;
-import android.telephony.TelephonyManager;
+import android.view.View;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.accounts.EmergencyInfoPreferenceController;
+import com.android.settings.applications.LayoutPreference;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.deviceinfo.BluetoothAddressPreferenceController;
+import com.android.settings.deviceinfo.BrandedAccountPreferenceController;
import com.android.settings.deviceinfo.BuildNumberPreferenceController;
import com.android.settings.deviceinfo.DeviceModelPreferenceController;
+import com.android.settings.deviceinfo.DeviceNamePreferenceController;
import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;
import com.android.settings.deviceinfo.FeedbackPreferenceController;
import com.android.settings.deviceinfo.ImsStatusPreferenceController;
@@ -40,11 +48,11 @@
import com.android.settings.deviceinfo.RegulatoryInfoPreferenceController;
import com.android.settings.deviceinfo.SafetyInfoPreferenceController;
import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;
-import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;
-import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
-import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
+import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController;
+import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController;
+import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
+import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -52,17 +60,12 @@
import java.util.Arrays;
import java.util.List;
-public class DeviceInfoSettings extends DashboardFragment implements Indexable {
+public class MyDeviceInfoFragment extends DashboardFragment {
+ private static final String LOG_TAG = "MeCardFragment";
- private static final String LOG_TAG = "DeviceInfoSettings";
-
+ private static final String KEY_MY_DEVICE_INFO_HEADER = "my_device_info_header";
private static final String KEY_LEGAL_CONTAINER = "legal_container";
- @VisibleForTesting
- static final int SIM_PREFERENCES_COUNT = 3;
- @VisibleForTesting
- static final int NON_SIM_PREFERENCES_COUNT = 2;
-
@Override
public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO;
@@ -74,33 +77,9 @@
}
@Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
- final Bundle arguments = getArguments();
- // Do not override initial expand children count if we come from
- // search (EXTRA_FRAGMENT_ARG_KEY is set) - we need to display every if entry point
- // is search.
- if (arguments == null
- || !arguments.containsKey(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY)) {
-
- // Increase the number of children when the device contains more than 1 sim.
- final TelephonyManager telephonyManager = (TelephonyManager) getSystemService(
- Context.TELEPHONY_SERVICE);
- final int numberOfChildren = Math.max(SIM_PREFERENCES_COUNT,
- SIM_PREFERENCES_COUNT * telephonyManager.getPhoneCount())
- + NON_SIM_PREFERENCES_COUNT;
- getPreferenceScreen().setInitialExpandedChildrenCount(numberOfChildren);
- }
- }
-
- @Override
- public void onActivityResult(int requestCode, int resultCode, Intent data) {
- final BuildNumberPreferenceController buildNumberPreferenceController =
- getPreferenceController(BuildNumberPreferenceController.class);
- if (buildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) {
- return;
- }
- super.onActivityResult(requestCode, resultCode, data);
+ public void onResume() {
+ super.onResume();
+ initHeader();
}
@Override
@@ -110,7 +89,7 @@
@Override
protected int getPreferenceScreenResId() {
- return R.xml.device_info_settings_v2;
+ return R.xml.my_device_info;
}
@Override
@@ -119,6 +98,61 @@
getLifecycle());
}
+ private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+ Activity activity, Fragment fragment, 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);
+ deviceNamePreferenceController.setLocalBluetoothManager(getLocalBtManager(context));
+ controllers.add(deviceNamePreferenceController);
+ controllers.add(new SimStatusPreferenceController(context, fragment));
+ controllers.add(new DeviceModelPreferenceController(context, fragment));
+ controllers.add(new ImeiInfoPreferenceController(context, fragment));
+ controllers.add(new FirmwareVersionPreferenceController(context, fragment));
+ controllers.add(new ImsStatusPreferenceController(context, lifecycle));
+ controllers.add(new IpAddressPreferenceController(context, lifecycle));
+ controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
+ controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));
+ controllers.add(new RegulatoryInfoPreferenceController(context));
+ controllers.add(new SafetyInfoPreferenceController(context));
+ controllers.add(new ManualPreferenceController(context));
+ controllers.add(new FeedbackPreferenceController(fragment, context));
+ controllers.add(new FccEquipmentIdPreferenceController(context));
+ controllers.add(
+ new BuildNumberPreferenceController(context, activity, fragment, lifecycle));
+ return controllers;
+ }
+
+ private void initHeader() {
+ // TODO: Migrate into its own controller.
+ final LayoutPreference headerPreference =
+ (LayoutPreference) getPreferenceScreen().findPreference(KEY_MY_DEVICE_INFO_HEADER);
+ final View appSnippet = headerPreference.findViewById(R.id.entity_header);
+ final Activity context = getActivity();
+ final Bundle bundle = getArguments();
+ EntityHeaderController controller = EntityHeaderController
+ .newInstance(context, this, appSnippet)
+ .setRecyclerView(getListView(), getLifecycle())
+ .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
+ EntityHeaderController.ActionType.ACTION_NONE);
+
+ // TODO: There may be an avatar setting action we can use here.
+ final int iconId = bundle.getInt("icon_id", 0);
+ if (iconId == 0) {
+ UserManager userManager = (UserManager) getActivity().getSystemService(
+ Context.USER_SERVICE);
+ UserInfo info = Utils.getExistingUser(userManager, android.os.Process.myUserHandle());
+ controller.setLabel(info.name);
+ controller.setIcon(
+ com.android.settingslib.Utils.getUserIcon(getActivity(), userManager, info));
+ }
+
+ controller.done(context, true /* rebindActions */);
+ }
+
private static class SummaryProvider implements SummaryLoader.SummaryProvider {
private final SummaryLoader mSummaryLoader;
@@ -136,35 +170,7 @@
}
public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = new SummaryLoader.SummaryProviderFactory() {
- @Override
- public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
- SummaryLoader summaryLoader) {
- return new SummaryProvider(summaryLoader);
- }
- };
-
- private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
- Activity activity, Fragment fragment, Lifecycle lifecycle) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new PhoneNumberPreferenceController(context));
- controllers.add(new SimStatusPreferenceControllerV2(context, fragment));
- controllers.add(new DeviceModelPreferenceController(context, fragment));
- controllers.add(new ImeiInfoPreferenceControllerV2(context, fragment));
- controllers.add(new FirmwareVersionPreferenceControllerV2(context, fragment));
- controllers.add(new ImsStatusPreferenceController(context, lifecycle));
- controllers.add(new IpAddressPreferenceController(context, lifecycle));
- controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
- controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));
- controllers.add(new RegulatoryInfoPreferenceController(context));
- controllers.add(new SafetyInfoPreferenceController(context));
- controllers.add(new ManualPreferenceController(context));
- controllers.add(new FeedbackPreferenceController(fragment, context));
- controllers.add(new FccEquipmentIdPreferenceController(context));
- controllers.add(
- new BuildNumberPreferenceController(context, activity, fragment, lifecycle));
- return controllers;
- }
+ = (activity, summaryLoader) -> new SummaryProvider(summaryLoader);
/**
* For Search.
@@ -176,7 +182,7 @@
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.device_info_settings_v2;
+ sir.xmlResId = R.xml.my_device_info;
return Arrays.asList(sir);
}
@@ -190,6 +196,7 @@
@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/FirmwareVersionPreferenceControllerV2.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java
similarity index 91%
rename from src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2.java
rename to src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java
index 3ce9ee1..7629890 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java
@@ -26,20 +26,19 @@
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
-public class FirmwareVersionPreferenceControllerV2 extends AbstractPreferenceController implements
+public class FirmwareVersionPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
private final static String FIRMWARE_VERSION_KEY = "firmware_version";
private final Fragment mFragment;
- public FirmwareVersionPreferenceControllerV2(Context context, Fragment fragment) {
+ public FirmwareVersionPreferenceController(Context context, Fragment fragment) {
super(context);
mFragment = fragment;
}
-
@Override
public boolean isAvailable() {
return true;
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
similarity index 96%
rename from src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2.java
rename to src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
index dcc6db6..52ba94e 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
@@ -35,7 +35,7 @@
/**
* Controller that manages preference for single and multi sim devices.
*/
-public class ImeiInfoPreferenceControllerV2 extends
+public class ImeiInfoPreferenceController extends
AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
private static final String KEY_IMEI_INFO = "imei_info";
@@ -45,7 +45,7 @@
private final List<Preference> mPreferenceList = new ArrayList<>();
private final Fragment mFragment;
- public ImeiInfoPreferenceControllerV2(Context context, Fragment fragment) {
+ public ImeiInfoPreferenceController(Context context, Fragment fragment) {
super(context);
mFragment = fragment;
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 35b8bd1..af898d5 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -26,6 +26,7 @@
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.res.Resources;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.os.UserHandle;
@@ -39,10 +40,14 @@
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
+import android.telephony.euicc.EuiccManager;
import android.text.TextUtils;
import android.util.Log;
import com.android.settings.R;
+import com.android.settings.wrapper.EuiccManagerWrapper;
import com.android.settingslib.DeviceInfoUtils;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -79,6 +84,8 @@
final static int ICCID_INFO_LABEL_ID = R.id.icc_id_label;
@VisibleForTesting
final static int ICCID_INFO_VALUE_ID = R.id.icc_id_value;
+ @VisibleForTesting
+ final static int EID_INFO_VALUE_ID = R.id.esim_id_value;
private final static String CB_AREA_INFO_RECEIVED_ACTION =
"com.android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
@@ -90,6 +97,7 @@
private final SubscriptionInfo mSubscriptionInfo;
private final TelephonyManager mTelephonyManager;
private final CarrierConfigManager mCarrierConfigManager;
+ private final EuiccManagerWrapper mEuiccManager;
private final Resources mRes;
private final Context mContext;
@@ -114,7 +122,6 @@
}
};
-
private PhoneStateListener mPhoneStateListener;
public SimStatusDialogController(@NonNull SimStatusDialogFragment dialog, Lifecycle lifecycle,
@@ -126,6 +133,7 @@
TELEPHONY_SERVICE);
mCarrierConfigManager = (CarrierConfigManager) mContext.getSystemService(
CARRIER_CONFIG_SERVICE);
+ mEuiccManager = new EuiccManagerWrapper(mContext);
mRes = mContext.getResources();
@@ -135,6 +143,8 @@
}
public void initialize() {
+ updateEid();
+
if (mSubscriptionInfo == null) {
return;
}
@@ -195,7 +205,8 @@
private void updatePhoneNumber() {
// If formattedNumber is null or empty, it'll display as "Unknown".
- mDialog.setText(PHONE_NUMBER_VALUE_ID, getPhoneNumber());
+ mDialog.setText(PHONE_NUMBER_VALUE_ID, BidiFormatter.getInstance().unicodeWrap(
+ getPhoneNumber(), TextDirectionHeuristics.LTR));
}
private void updateDataState(int state) {
@@ -360,6 +371,10 @@
}
}
+ private void updateEid() {
+ mDialog.setText(EID_INFO_VALUE_ID, mEuiccManager.getEid());
+ }
+
private SubscriptionInfo getPhoneSubscriptionInfo(int slotId) {
final List<SubscriptionInfo> subscriptionInfoList = SubscriptionManager.from(
mContext).getActiveSubscriptionInfoList();
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
similarity index 96%
rename from src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2.java
rename to src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
index 55493dc..00910e4 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
@@ -32,7 +32,7 @@
import java.util.ArrayList;
import java.util.List;
-public class SimStatusPreferenceControllerV2 extends
+public class SimStatusPreferenceController extends
AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
private static final String KEY_SIM_STATUS = "sim_status";
@@ -42,7 +42,7 @@
private final Fragment mFragment;
private final List<Preference> mPreferenceList = new ArrayList<>();
- public SimStatusPreferenceControllerV2(Context context, Fragment fragment) {
+ public SimStatusPreferenceController(Context context, Fragment fragment) {
super(context);
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
index 717d765..8ab21b3 100644
--- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
@@ -25,12 +25,12 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.deletionhelper.ActivationWarningFragment;
import com.android.settings.widget.MasterSwitchController;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnResume;
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index 1149b99..3623298 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -38,11 +38,11 @@
import com.android.settings.Utils;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.deviceinfo.PrivateVolumeSettings.SystemInfoFragment;
import com.android.settings.deviceinfo.StorageItemPreference;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.deviceinfo.StorageMeasurement;
import com.android.settingslib.deviceinfo.StorageVolumeProvider;
diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
index 68a21ce..f3d17d5 100644
--- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -27,11 +27,11 @@
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class AmbientDisplayNotificationsPreferenceController extends
AbstractPreferenceController implements PreferenceControllerMixin,
diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java
index 24aede0..187325c 100644
--- a/src/com/android/settings/display/AmbientDisplaySettings.java
+++ b/src/com/android/settings/display/AmbientDisplaySettings.java
@@ -23,13 +23,13 @@
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.gestures.DoubleTapScreenPreferenceController;
import com.android.settings.gestures.PickupGesturePreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.ArrayList;
diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java
index c7f6af1..2134b88 100644
--- a/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -20,9 +20,9 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.view.RotationPolicy;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
+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.OnPause;
diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java
index d1341dd74..9c1314e 100644
--- a/src/com/android/settings/display/ThemePreferenceController.java
+++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -29,9 +29,9 @@
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import libcore.util.Objects;
diff --git a/src/com/android/settings/display/TimeoutPreferenceController.java b/src/com/android/settings/display/TimeoutPreferenceController.java
index 1d86999..84f9641 100644
--- a/src/com/android/settings/display/TimeoutPreferenceController.java
+++ b/src/com/android/settings/display/TimeoutPreferenceController.java
@@ -13,9 +13,11 @@
*/
package com.android.settings.display;
-import android.app.admin.DevicePolicyManager;
+import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+
import android.content.Context;
import android.os.UserHandle;
+import android.os.UserManager;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.util.Log;
@@ -25,10 +27,9 @@
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.core.AbstractPreferenceController;
-import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
public class TimeoutPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
@@ -69,6 +70,13 @@
timeoutListPreference.removeUnusableTimeouts(maxTimeout, admin);
}
updateTimeoutPreferenceDescription(timeoutListPreference, currentTimeout);
+
+ EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ mContext, UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT,
+ UserHandle.myUserId());
+ if(admin != null) {
+ timeoutListPreference.removeUnusableTimeouts(0/* disable all*/, admin);
+ }
}
@Override
diff --git a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
index 6f35641..7cfe7a9 100644
--- a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
+++ b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
@@ -45,7 +45,7 @@
@Override
public boolean isAvailable() {
- return true;
+ return mContext.getResources().getBoolean(R.bool.config_show_manage_device_admin);
}
@Override
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 819846a..de027a3 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -374,7 +374,7 @@
@Override
public void onLimitBackgroundActivity() {
- mBackgroundActivityPreferenceController.setUnchecked(
+ mBackgroundActivityPreferenceController.setRestricted(
findPreference(mBackgroundActivityPreferenceController.getPreferenceKey()));
}
}
diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
index c034746..a52433b 100644
--- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
@@ -48,7 +48,6 @@
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.ActionButtonPreference;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
@@ -56,6 +55,7 @@
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.AbstractPreferenceController;
+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.OnDestroy;
diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
index 6323715..01e4182 100644
--- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
@@ -43,20 +43,21 @@
* Controller to control whether an app can run in the background
*/
public class BackgroundActivityPreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+ implements PreferenceControllerMixin {
private static final String TAG = "BgActivityPrefContr";
- private static final String KEY_BACKGROUND_ACTIVITY = "background_activity";
+ @VisibleForTesting
+ static final String KEY_BACKGROUND_ACTIVITY = "background_activity";
- private final PackageManager mPackageManager;
private final AppOpsManager mAppOpsManager;
private final UserManager mUserManager;
private final int mUid;
@VisibleForTesting
DevicePolicyManagerWrapper mDpm;
+ @VisibleForTesting
+ BatteryUtils mBatteryUtils;
private Fragment mFragment;
private String mTargetPackage;
- private boolean mIsPreOApp;
private PowerWhitelistBackend mPowerWhitelistBackend;
public BackgroundActivityPreferenceController(Context context, Fragment fragment,
@@ -69,7 +70,6 @@
int uid, String packageName, PowerWhitelistBackend backend) {
super(context);
mPowerWhitelistBackend = backend;
- mPackageManager = context.getPackageManager();
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mDpm = new DevicePolicyManagerWrapper(
(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE));
@@ -77,7 +77,7 @@
mUid = uid;
mFragment = fragment;
mTargetPackage = packageName;
- mIsPreOApp = isLegacyApp(packageName);
+ mBatteryUtils = BatteryUtils.getInstance(context);
}
@Override
@@ -85,11 +85,6 @@
final int mode = mAppOpsManager
.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage);
final boolean whitelisted = mPowerWhitelistBackend.isWhitelisted(mTargetPackage);
- // Set checked or not before we may set it disabled
- if (mode != AppOpsManager.MODE_ERRORED) {
- final boolean checked = whitelisted || mode != AppOpsManager.MODE_IGNORED;
- ((SwitchPreference) preference).setChecked(checked);
- }
if (whitelisted || mode == AppOpsManager.MODE_ERRORED
|| Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mTargetPackage)) {
preference.setEnabled(false);
@@ -108,14 +103,8 @@
* Called from the warning dialog, if the user decides to go ahead and disable background
* activity for this package
*/
- public void setUnchecked(Preference preference) {
- if (mIsPreOApp) {
- mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mTargetPackage,
- AppOpsManager.MODE_IGNORED);
- }
- mAppOpsManager.setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage,
- AppOpsManager.MODE_IGNORED);
- ((SwitchPreference) preference).setChecked(false);
+ public void setRestricted(Preference preference) {
+ mBatteryUtils.setForceAppStandby(mUid, mTargetPackage, AppOpsManager.MODE_IGNORED);
updateSummary(preference);
}
@@ -125,33 +114,18 @@
}
@Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- final boolean switchOn = (Boolean) newValue;
- if (!switchOn) {
- final WarningDialogFragment dialogFragment = new WarningDialogFragment();
- dialogFragment.setTargetFragment(mFragment, 0);
- dialogFragment.show(mFragment.getFragmentManager(), TAG);
- return false;
- }
- if (mIsPreOApp) {
- mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mTargetPackage,
- AppOpsManager.MODE_ALLOWED);
- }
- mAppOpsManager.setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage,
- AppOpsManager.MODE_ALLOWED);
- updateSummary(preference);
- return true;
- }
-
- @VisibleForTesting
- boolean isLegacyApp(final String packageName) {
- try {
- ApplicationInfo info = mPackageManager.getApplicationInfo(packageName,
- PackageManager.GET_META_DATA);
-
- return info.targetSdkVersion < Build.VERSION_CODES.O;
- } catch (PackageManager.NameNotFoundException e) {
- Log.e(TAG, "Cannot find package: " + packageName, e);
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (KEY_BACKGROUND_ACTIVITY.equals(preference.getKey())) {
+ final int mode = mAppOpsManager
+ .checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage);
+ final boolean restricted = mode == AppOpsManager.MODE_IGNORED;
+ if (!restricted) {
+ showDialog();
+ return false;
+ }
+ mBatteryUtils.setForceAppStandby(mUid, mTargetPackage, AppOpsManager.MODE_ALLOWED);
+ updateSummary(preference);
+ return true;
}
return false;
@@ -169,12 +143,19 @@
if (mode == AppOpsManager.MODE_ERRORED) {
preference.setSummary(R.string.background_activity_summary_disabled);
} else {
- final boolean checked = mode != AppOpsManager.MODE_IGNORED;
- preference.setSummary(checked ? R.string.background_activity_summary_on
- : R.string.background_activity_summary_off);
+ final boolean restricted = mode == AppOpsManager.MODE_IGNORED;
+ preference.setSummary(restricted ? R.string.restricted_true_label
+ : R.string.restricted_false_label);
}
}
+ @VisibleForTesting
+ void showDialog() {
+ final WarningDialogFragment dialogFragment = new WarningDialogFragment();
+ dialogFragment.setTargetFragment(mFragment, 0 /* requestCode */);
+ dialogFragment.show(mFragment.getFragmentManager(), TAG);
+ }
+
interface WarningConfirmationListener {
void onLimitBackgroundActivity();
}
diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
index 5d95dd2..91f35e2 100644
--- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
@@ -49,10 +49,10 @@
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.Utils;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
+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.OnDestroy;
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index 7a0cd27..6384130 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -170,18 +170,21 @@
if (discharging && provider != null
&& provider.isEnhancedBatteryPredictionEnabled(context)) {
- final long prediction = provider.getEnhancedBatteryPrediction(context);
- BatteryUtils.logRuntime(LOG_TAG, "time for enhanced BatteryInfo", startTime);
- return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
- elapsedRealtimeUs, shortString, BatteryUtils.convertMsToUs(prediction),
- true);
- } else {
- long prediction = discharging
- ? stats.computeBatteryTimeRemaining(elapsedRealtimeUs) : 0;
- BatteryUtils.logRuntime(LOG_TAG, "time for regular BatteryInfo", startTime);
- return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
- elapsedRealtimeUs, shortString, prediction, false);
+ Estimate estimate = provider.getEnhancedBatteryPrediction(context);
+ if(estimate != null) {
+ BatteryUtils
+ .logRuntime(LOG_TAG, "time for enhanced BatteryInfo", startTime);
+ return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+ elapsedRealtimeUs, shortString,
+ BatteryUtils.convertMsToUs(estimate.estimateMillis),
+ estimate.isBasedOnUsage);
+ }
}
+ long prediction = discharging
+ ? stats.computeBatteryTimeRemaining(elapsedRealtimeUs) : 0;
+ BatteryUtils.logRuntime(LOG_TAG, "time for regular BatteryInfo", startTime);
+ return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+ elapsedRealtimeUs, shortString, prediction, false);
}
@Override
@@ -271,7 +274,7 @@
void onParsingDone();
}
- private static void parse(BatteryStats stats, BatteryDataParser... parsers) {
+ public static void parse(BatteryStats stats, BatteryDataParser... parsers) {
long startWalltime = 0;
long endWalltime = 0;
long historyStart = 0;
diff --git a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java
index 227f4a5..c60f423 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java
@@ -20,6 +20,8 @@
import com.android.internal.os.BatteryStatsHelper;
import com.android.settingslib.utils.AsyncLoader;
+import com.android.internal.annotations.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
@@ -30,9 +32,13 @@
BatteryStatsHelper mStatsHelper;
private static final String LOG_TAG = "BatteryInfoLoader";
+ @VisibleForTesting
+ BatteryUtils batteryUtils;
+
public BatteryInfoLoader(Context context, BatteryStatsHelper batteryStatsHelper) {
super(context);
mStatsHelper = batteryStatsHelper;
+ batteryUtils = BatteryUtils.getInstance(context);
}
@Override
@@ -42,7 +48,6 @@
@Override
public BatteryInfo loadInBackground() {
- final BatteryUtils batteryUtils = BatteryUtils.getInstance(getContext());
return batteryUtils.getBatteryInfo(mStatsHelper, LOG_TAG);
}
}
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index f00b952..2a4fd6e 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -26,12 +26,14 @@
import android.os.Handler;
import android.os.PowerManager;
import android.provider.SearchIndexableResource;
+import android.provider.Settings;
import android.provider.Settings.Global;
import android.support.annotation.VisibleForTesting;
import android.util.Log;
import android.widget.Switch;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.util.ArrayUtils;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -85,16 +87,24 @@
.setTitle(com.android.internal.R.string.battery_saver_description);
mContext = getActivity();
mSwitchBar = ((SettingsActivity) mContext).getSwitchBar();
+ mSwitchBar.setSwitchBarText(R.string.battery_saver_master_switch_title,
+ R.string.battery_saver_master_switch_title);
mSwitch = mSwitchBar.getSwitch();
mSwitchBar.show();
+ int[] levelChoices = getResources().getIntArray(R.array.battery_saver_trigger_values);
+ final int currentThreshold = Global.getInt(mContext.getContentResolver(),
+ Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
+ levelChoices = ArrayUtils.appendInt(levelChoices, currentThreshold);
+ Arrays.sort(levelChoices);
+
mTriggerPref = new SettingPref(SettingPref.TYPE_GLOBAL, KEY_TURN_ON_AUTOMATICALLY,
Global.LOW_POWER_MODE_TRIGGER_LEVEL,
0, /*default*/
- getResources().getIntArray(R.array.battery_saver_trigger_values)) {
+ levelChoices) {
@Override
protected String getCaption(Resources res, int value) {
- if (value > 0 && value < 100) {
+ if (value > 0 && value <= 100) {
return res.getString(R.string.battery_saver_turn_on_automatically_pct,
Utils.formatPercentage(value));
}
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index c623396..5738c29 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -21,8 +21,6 @@
import android.content.IntentFilter;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.net.Uri;
import android.os.BatteryManager;
import android.os.BatteryStats;
import android.os.Bundle;
@@ -347,6 +345,17 @@
}
+ /**
+ * Calculate the screen usage time since last full charge.
+ * @param batteryStatsHelper utility class that contains the screen usage data
+ * @return time in millis
+ */
+ public long calculateScreenUsageTime(BatteryStatsHelper batteryStatsHelper) {
+ final BatterySipper sipper = findBatterySipperByType(
+ batteryStatsHelper.getUsageList(), BatterySipper.DrainType.SCREEN);
+ return sipper != null ? sipper.usageTimeMs : 0;
+ }
+
public static void logRuntime(String tag, String message, long startTime) {
Log.d(tag, message + ": " + (System.currentTimeMillis() - startTime) + "ms");
}
@@ -389,6 +398,19 @@
return timeMs * 1000;
}
+ public void setForceAppStandby(int uid, String packageName,
+ int mode) {
+ final boolean isPreOApp = isLegacyApp(packageName);
+ if (isPreOApp) {
+ // Control whether app could run in the background if it is pre O app
+ mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, uid, packageName,
+ mode);
+ }
+ // Control whether app could run jobs in the background
+ mAppOpsManager.setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, uid, packageName,
+ mode);
+ }
+
public void initBatteryStatsHelper(BatteryStatsHelper statsHelper, Bundle bundle,
UserManager userManager) {
statsHelper.create(bundle);
@@ -410,19 +432,19 @@
final boolean discharging = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1)
== 0;
// Get enhanced prediction if available and discharging, otherwise use the old code
- Cursor cursor = null;
+ Estimate estimate = null;
if (discharging && mPowerUsageFeatureProvider != null &&
mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(mContext)) {
- final Uri queryUri = mPowerUsageFeatureProvider.getEnhancedBatteryPredictionUri();
- cursor = mContext.getContentResolver().query(queryUri, null, null, null, null);
+ estimate = mPowerUsageFeatureProvider.getEnhancedBatteryPrediction(mContext);
}
final BatteryStats stats = statsHelper.getStats();
BatteryUtils.logRuntime(tag, "BatteryInfoLoader post query", startTime);
- if (cursor != null && cursor.moveToFirst()) {
- long enhancedEstimate = mPowerUsageFeatureProvider.getTimeRemainingEstimate(cursor);
+
+ if (estimate != null) {
batteryInfo = BatteryInfo.getBatteryInfo(mContext, batteryBroadcast, stats,
elapsedRealtimeUs, false /* shortString */,
- BatteryUtils.convertMsToUs(enhancedEstimate), true /* basedOnUsage */);
+ BatteryUtils.convertMsToUs(estimate.estimateMillis),
+ estimate.isBasedOnUsage);
} else {
batteryInfo = BatteryInfo.getBatteryInfo(mContext, batteryBroadcast, stats,
elapsedRealtimeUs, false /* shortString */,
@@ -434,6 +456,20 @@
return batteryInfo;
}
+ /**
+ * Find the {@link BatterySipper} with the corresponding {@link BatterySipper.DrainType}
+ */
+ public BatterySipper findBatterySipperByType(List<BatterySipper> usageList,
+ BatterySipper.DrainType type) {
+ for (int i = 0, size = usageList.size(); i < size; i++) {
+ final BatterySipper sipper = usageList.get(i);
+ if (sipper.drainType == type) {
+ return sipper;
+ }
+ }
+ return null;
+ }
+
private boolean isDataCorrupted() {
return mPackageManager == null || mAppOpsManager == null;
}
@@ -458,5 +494,18 @@
return 0;
}
+ public boolean isLegacyApp(final String packageName) {
+ try {
+ ApplicationInfo info = mPackageManager.getApplicationInfo(packageName,
+ PackageManager.GET_META_DATA);
+
+ return info.targetSdkVersion < Build.VERSION_CODES.O;
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.e(TAG, "Cannot find package: " + packageName, e);
+ }
+
+ return false;
+ }
+
}
diff --git a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
index 19aa639..e58ccd3 100644
--- a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
+++ b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
@@ -54,14 +54,18 @@
BatteryInfo oldinfo = BatteryInfo.getBatteryInfoOld(getContext(), batteryBroadcast,
stats, elapsedRealtimeUs, false);
- final long timeRemainingEnhanced = BatteryUtils.convertMsToUs(
- powerUsageFeatureProvider.getEnhancedBatteryPrediction(getContext()));
- BatteryInfo newinfo = BatteryInfo.getBatteryInfo(getContext(), batteryBroadcast, stats,
- elapsedRealtimeUs, false, timeRemainingEnhanced, true);
+ Estimate estimate = powerUsageFeatureProvider.getEnhancedBatteryPrediction(context);
+ if (estimate == null) {
+ estimate = new Estimate(0, false);
+ }
+ BatteryInfo newInfo = BatteryInfo.getBatteryInfo(getContext(), batteryBroadcast, stats,
+ elapsedRealtimeUs, false,
+ BatteryUtils.convertMsToUs(estimate.estimateMillis),
+ estimate.isBasedOnUsage);
List<BatteryInfo> infos = new ArrayList<>();
infos.add(oldinfo);
- infos.add(newinfo);
+ infos.add(newInfo);
return infos;
}
}
diff --git a/src/com/android/settings/fuelgauge/Estimate.java b/src/com/android/settings/fuelgauge/Estimate.java
new file mode 100644
index 0000000..541678c
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/Estimate.java
@@ -0,0 +1,12 @@
+package com.android.settings.fuelgauge;
+
+public class Estimate {
+
+ public final long estimateMillis;
+ public final boolean isBasedOnUsage;
+
+ public Estimate(long estimateMillis, boolean isBasedOnUsage) {
+ this.estimateMillis = estimateMillis;
+ this.isBasedOnUsage = isBasedOnUsage;
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index cbd9c3f..063185e 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -363,6 +363,16 @@
}
@Override
+ public long getCpuActiveTime() {
+ return 0;
+ }
+
+ @Override
+ public long[] getCpuClusterTimes() {
+ return null;
+ }
+
+ @Override
public long[] getCpuFreqTimes(int procState, int which) {
return null;
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
index 0d73511..143733d 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
@@ -31,6 +31,7 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.fuelgauge.anomaly.AnomalyDialogFragment;
@@ -151,12 +152,6 @@
@VisibleForTesting
Drawable getBadgedIcon(String packageName, int userId) {
- try {
- final ApplicationInfo appInfo = mPackageManager.getApplicationInfo(packageName,
- PackageManager.GET_META_DATA);
- return mIconDrawableFactory.getBadgedIcon(appInfo, userId);
- } catch (PackageManager.NameNotFoundException e) {
- return mPackageManager.getDefaultActivityIcon();
- }
+ return Utils.getBadgedIcon(mIconDrawableFactory, mPackageManager, packageName, userId);
}
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index 1fb02c4..79675cb 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -18,8 +18,6 @@
import android.content.Context;
import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
import android.util.SparseIntArray;
import com.android.internal.os.BatterySipper;
@@ -28,6 +26,7 @@
* Feature Provider used in power usage
*/
public interface PowerUsageFeatureProvider {
+
/**
* Check whether location setting is enabled
*/
@@ -66,7 +65,7 @@
/**
* Returns an improved prediction for battery time remaining.
*/
- long getEnhancedBatteryPrediction(Context context);
+ Estimate getEnhancedBatteryPrediction(Context context);
/**
* Returns an improved projection curve for future battery level.
@@ -80,16 +79,6 @@
boolean isEnhancedBatteryPredictionEnabled(Context context);
/**
- * Returns the Uri used to query for an enhanced battery prediction from a cursor loader.
- */
- Uri getEnhancedBatteryPredictionUri();
-
- /**
- * Returns the the estimate in the cursor as a long or -1 if the cursor is null
- */
- long getTimeRemainingEstimate(Cursor cursor);
-
- /**
* Checks whether debugging should be enabled for battery estimates.
* @return
*/
@@ -120,4 +109,13 @@
* Checks whether to display the battery v2.
*/
boolean isBatteryV2Enabled();
+
+ /**
+ * Returns a signal to indicate if the device will need to warn the user they may not make it
+ * to their next charging time.
+ *
+ * @param id Optional string used to identify the caller for metrics. Usually the class name of
+ * the caller
+ */
+ boolean getEarlyWarningSignal(Context context, String id);
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index cda4d3d..93c4e03 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -21,8 +21,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.net.Uri;
import android.os.Process;
import android.util.FeatureFlagUtils;
import android.util.SparseIntArray;
@@ -95,8 +93,8 @@
}
@Override
- public long getEnhancedBatteryPrediction(Context context) {
- return -1;
+ public Estimate getEnhancedBatteryPrediction(Context context) {
+ return null;
}
@Override
@@ -110,16 +108,6 @@
}
@Override
- public Uri getEnhancedBatteryPredictionUri() {
- return null;
- }
-
- @Override
- public long getTimeRemainingEstimate(Cursor cursor) {
- return 0;
- }
-
- @Override
public String getEnhancedEstimateDebugString(String timeRemaining) {
return null;
}
@@ -143,4 +131,9 @@
public boolean isBatteryV2Enabled() {
return FeatureFlagUtils.isEnabled(mContext, BATTERY_SETTINGS_V2);
}
+
+ @Override
+ public boolean getEarlyWarningSignal(Context context, String id) {
+ return false;
+ }
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 0315f03..e0954e5 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -47,7 +47,6 @@
import com.android.settings.Utils;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.applications.manageapplications.ManageApplications;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.display.AmbientDisplayPreferenceController;
import com.android.settings.display.AutoBrightnessPreferenceController;
@@ -61,6 +60,7 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.ArrayList;
@@ -266,7 +266,7 @@
KEY_APP_LIST, lifecycle, activity, this);
controllers.add(mBatteryAppListPreferenceController);
mBatteryTipPreferenceController = new BatteryTipPreferenceController(context,
- KEY_BATTERY_TIP, this);
+ KEY_BATTERY_TIP, (SettingsActivity) getActivity(), this, this);
controllers.add(mBatteryTipPreferenceController);
controllers.add(new BatterySaverController(context, getLifecycle()));
controllers.add(new BatteryPercentagePreferenceController(context));
@@ -369,8 +369,9 @@
restartBatteryInfoLoader();
final long lastFullChargeTime = mBatteryUtils.calculateLastFullChargeTime(mStatsHelper,
System.currentTimeMillis());
- updateScreenPreference();
updateLastFullChargePreference(lastFullChargeTime);
+ mScreenUsagePref.setSubtitle(Utils.formatElapsedTime(getContext(),
+ mBatteryUtils.calculateScreenUsageTime(mStatsHelper), false));
final CharSequence timeSequence = Utils.formatRelativeTime(context, lastFullChargeTime,
false);
@@ -394,26 +395,6 @@
}
@VisibleForTesting
- BatterySipper findBatterySipperByType(List<BatterySipper> usageList, DrainType type) {
- for (int i = 0, size = usageList.size(); i < size; i++) {
- final BatterySipper sipper = usageList.get(i);
- if (sipper.drainType == type) {
- return sipper;
- }
- }
- return null;
- }
-
- @VisibleForTesting
- void updateScreenPreference() {
- final BatterySipper sipper = findBatterySipperByType(
- mStatsHelper.getUsageList(), DrainType.SCREEN);
- final long usageTimeMs = sipper != null ? sipper.usageTimeMs : 0;
-
- mScreenUsagePref.setSubtitle(Utils.formatElapsedTime(getContext(), usageTimeMs, false));
- }
-
- @VisibleForTesting
void updateLastFullChargePreference(long timeMs) {
final CharSequence timeSequence = Utils.formatRelativeTime(getContext(), timeMs, false);
mLastFullChargePref.setSubtitle(timeSequence);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java b/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java
index c50d580..605591d 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java
@@ -54,7 +54,6 @@
import com.android.settings.Utils;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.applications.manageapplications.ManageApplications;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.display.AmbientDisplayPreferenceController;
import com.android.settings.display.AutoBrightnessPreferenceController;
@@ -67,6 +66,7 @@
import com.android.settings.fuelgauge.anomaly.AnomalySummaryPreferenceController;
import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
diff --git a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
new file mode 100644
index 0000000..0a40f1e
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.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.fuelgauge;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.List;
+
+/**
+ * Controller to change and update the smart battery toggle
+ */
+public class RestrictAppPreferenceController extends BasePreferenceController {
+ @VisibleForTesting
+ static final String KEY_RESTRICT_APP = "restricted_app";
+
+ private AppOpsManager mAppOpsManager;
+ private List<AppOpsManager.PackageOps> mPackageOps;
+ private SettingsActivity mSettingsActivity;
+ private PreferenceFragment mPreferenceFragment;
+
+ public RestrictAppPreferenceController(Context context) {
+ super(context, KEY_RESTRICT_APP);
+ mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+ }
+
+ public RestrictAppPreferenceController(SettingsActivity settingsActivity,
+ PreferenceFragment preferenceFragment) {
+ this(settingsActivity.getApplicationContext());
+ mSettingsActivity = settingsActivity;
+ mPreferenceFragment = preferenceFragment;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+
+ mPackageOps = mAppOpsManager.getPackagesForOps(
+ new int[]{AppOpsManager.OP_RUN_ANY_IN_BACKGROUND});
+ final int num = mPackageOps != null ? mPackageOps.size() : 0;
+
+ // Enable the preference if some apps already been restricted, otherwise disable it
+ preference.setEnabled(num > 0);
+ preference.setSummary(
+ mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num,
+ num));
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (getPreferenceKey().equals(preference.getKey())) {
+ // start fragment
+ RestrictedAppDetails.startRestrictedAppDetails(mSettingsActivity, mPreferenceFragment,
+ mPackageOps);
+ return true;
+ }
+
+ return super.handlePreferenceTreeClick(preference);
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
new file mode 100644
index 0000000..e09a8a3
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.CheckBoxPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.util.IconDrawableFactory;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.widget.AppCheckBoxPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.List;
+
+/**
+ * Fragment to show a list of anomaly apps, where user could handle these anomalies
+ */
+public class RestrictedAppDetails extends DashboardFragment {
+
+ public static final String TAG = "RestrictedAppDetails";
+
+ private static final String EXTRA_PACKAGE_OPS_LIST = "package_ops_list";
+ private static final String KEY_PREF_RESTRICTED_APP_LIST = "restrict_app_list";
+
+ @VisibleForTesting
+ List<AppOpsManager.PackageOps> mPackageOpsList;
+ @VisibleForTesting
+ IconDrawableFactory mIconDrawableFactory;
+ @VisibleForTesting
+ PreferenceGroup mRestrictedAppListGroup;
+ @VisibleForTesting
+ BatteryUtils mBatteryUtils;
+ @VisibleForTesting
+ PackageManager mPackageManager;
+
+ public static void startRestrictedAppDetails(SettingsActivity caller,
+ PreferenceFragment fragment, List<AppOpsManager.PackageOps> packageOpsList) {
+ Bundle args = new Bundle();
+ args.putParcelableList(EXTRA_PACKAGE_OPS_LIST, packageOpsList);
+
+ caller.startPreferencePanelAsUser(fragment, RestrictedAppDetails.class.getName(), args,
+ R.string.restricted_app_title, null /* titleText */,
+ new UserHandle(UserHandle.myUserId()));
+ }
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ final Context context = getContext();
+
+ mRestrictedAppListGroup = (PreferenceGroup) findPreference(KEY_PREF_RESTRICTED_APP_LIST);
+ mPackageOpsList = getArguments().getParcelableArrayList(EXTRA_PACKAGE_OPS_LIST);
+ mPackageManager = context.getPackageManager();
+ mIconDrawableFactory = IconDrawableFactory.newInstance(context);
+ mBatteryUtils = BatteryUtils.getInstance(context);
+
+ refreshUi();
+ }
+
+ @Override
+ public boolean onPreferenceTreeClick(Preference preference) {
+
+ return super.onPreferenceTreeClick(preference);
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.restricted_apps_detail;
+ }
+
+ @Override
+ protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+ return null;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.FUELGAUGE_RESTRICTED_APP_DETAILS;
+ }
+
+ @VisibleForTesting
+ void refreshUi() {
+ mRestrictedAppListGroup.removeAll();
+ final Context context = getPrefContext();
+
+ for (int i = 0, size = mPackageOpsList.size(); i < size; i++) {
+ final CheckBoxPreference checkBoxPreference = new AppCheckBoxPreference(context);
+ final AppOpsManager.PackageOps packageOps = mPackageOpsList.get(i);
+ try {
+ final ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
+ packageOps.getPackageName(), 0 /* flags */);
+ checkBoxPreference.setChecked(true);
+ checkBoxPreference.setTitle(mPackageManager.getApplicationLabel(applicationInfo));
+ checkBoxPreference.setKey(packageOps.getPackageName());
+ checkBoxPreference.setIcon(
+ Utils.getBadgedIcon(mIconDrawableFactory, mPackageManager,
+ packageOps.getPackageName(),
+ UserHandle.getUserId(packageOps.getUid())));
+ checkBoxPreference.setOnPreferenceChangeListener((pref, value) -> {
+ // change the toggle
+ final int mode = (Boolean) value ? AppOpsManager.MODE_IGNORED
+ : AppOpsManager.MODE_ALLOWED;
+ final String packageName = pref.getKey();
+ final int uid = mBatteryUtils.getPackageUid(packageName);
+ mBatteryUtils.setForceAppStandby(uid, packageName, mode);
+ return true;
+ });
+ mRestrictedAppListGroup.addPreference(checkBoxPreference);
+ } catch (PackageManager.NameNotFoundException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+}
diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
new file mode 100644
index 0000000..ee5279e
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Controller to change and update the smart battery toggle
+ */
+public class SmartBatteryPreferenceController extends BasePreferenceController implements
+ Preference.OnPreferenceChangeListener {
+ private static final String KEY_SMART_BATTERY = "smart_battery";
+ private static final int ON = 1;
+ private static final int OFF = 0;
+
+ public SmartBatteryPreferenceController(Context context) {
+ super(context, KEY_SMART_BATTERY);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ // TODO(b/71502850): get Availability from API. The device may not support it.
+ return AVAILABLE;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ final boolean smartBatteryOn = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.APP_STANDBY_ENABLED, ON) == ON;
+ ((SwitchPreference) preference).setChecked(smartBatteryOn);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ final boolean smartBatteryOn = (Boolean) newValue;
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.APP_STANDBY_ENABLED,
+ smartBatteryOn ? ON : OFF);
+ return true;
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/SmartBatterySettings.java b/src/com/android/settings/fuelgauge/SmartBatterySettings.java
new file mode 100644
index 0000000..52c0cef
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/SmartBatterySettings.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.os.Bundle;
+import android.provider.SearchIndexableResource;
+import android.support.v14.preference.PreferenceFragment;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.widget.FooterPreferenceMixin;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Fragment to show smart battery and restricted app controls
+ */
+public class SmartBatterySettings extends DashboardFragment {
+ public static final String TAG = "SmartBatterySettings";
+
+ private final FooterPreferenceMixin mFooterPreferenceMixin =
+ new FooterPreferenceMixin(this, getLifecycle());
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.battery_footer_summary);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.FUELGAUGE_SMART_BATTERY;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.smart_battery_detail;
+ }
+
+ @Override
+ protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, (SettingsActivity) getActivity(), this);
+ }
+
+ private static List<AbstractPreferenceController> buildPreferenceControllers(
+ Context context, SettingsActivity settingsActivity, PreferenceFragment fragment) {
+ final List<AbstractPreferenceController> controllers = new ArrayList<>();
+ controllers.add(new SmartBatteryPreferenceController(context));
+ if (settingsActivity != null && fragment != null) {
+ controllers.add(
+ new RestrictAppPreferenceController(settingsActivity, fragment));
+ } else {
+ controllers.add(new RestrictAppPreferenceController(context));
+ }
+
+ return controllers;
+ }
+
+ 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.smart_battery_detail;
+ return Arrays.asList(sir);
+ }
+
+ @Override
+ public List<String> getNonIndexableKeys(Context context) {
+ return super.getNonIndexableKeys(context);
+ }
+
+ @Override
+ public List<AbstractPreferenceController> getPreferenceControllers(
+ Context context) {
+ return buildPreferenceControllers(context, null, null);
+ }
+ };
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java
index 39d51dc0..3dde95e 100644
--- a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java
@@ -24,7 +24,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
import com.android.settings.fuelgauge.anomaly.action.ForceStopAction;
import com.android.settings.fuelgauge.anomaly.action.LocationCheckAction;
@@ -33,6 +32,7 @@
import com.android.settings.fuelgauge.anomaly.checker.BluetoothScanAnomalyDetector;
import com.android.settings.fuelgauge.anomaly.checker.WakeLockAnomalyDetector;
import com.android.settings.fuelgauge.anomaly.checker.WakeupAlarmAnomalyDetector;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.java b/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.java
index 3ee89d1..d7de5a7 100644
--- a/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.java
+++ b/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.java
@@ -20,9 +20,9 @@
import android.util.Pair;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Abstract class for anomaly action, which is triggered if we need to handle the anomaly
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java
new file mode 100644
index 0000000..a13df25
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.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.fuelgauge.batterytip;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+
+/**
+ * Database controls the anomaly logging(e.g. packageName, anomalyType and time)
+ */
+public class AnomalyDatabaseHelper extends SQLiteOpenHelper {
+ private static final String TAG = "BatteryDatabaseHelper";
+
+ private static final String DATABASE_NAME = "battery_settings.db";
+ private static final int DATABASE_VERSION = 1;
+
+ public interface Tables {
+ String TABLE_ANOMALY = "anomaly";
+ }
+
+ public interface AnomalyColumns {
+ /**
+ * The package name of the anomaly app
+ */
+ String PACKAGE_NAME = "package_name";
+ /**
+ * The type of the anomaly app
+ * @see Anomaly.AnomalyType
+ */
+ String ANOMALY_TYPE = "anomaly_type";
+ /**
+ * The time when anomaly happens
+ */
+ String TIME_STAMP_MS = "time_stamp_ms";
+ }
+
+ private static final String CREATE_ANOMALY_TABLE =
+ "CREATE TABLE " + Tables.TABLE_ANOMALY +
+ "(" +
+ AnomalyColumns.PACKAGE_NAME +
+ " TEXT, " +
+ AnomalyColumns.ANOMALY_TYPE +
+ " INTEGER, " +
+ AnomalyColumns.TIME_STAMP_MS +
+ " INTEGER)";
+
+ private static AnomalyDatabaseHelper sSingleton;
+
+ public static synchronized AnomalyDatabaseHelper getInstance(Context context) {
+ if (sSingleton == null) {
+ sSingleton = new AnomalyDatabaseHelper(context.getApplicationContext());
+ }
+ return sSingleton;
+ }
+
+ private AnomalyDatabaseHelper(Context context) {
+ super(context, DATABASE_NAME, null, DATABASE_VERSION);
+ }
+
+ @Override
+ public void onCreate(SQLiteDatabase db) {
+ bootstrapDB(db);
+ }
+
+ private void bootstrapDB(SQLiteDatabase db) {
+ db.execSQL(CREATE_ANOMALY_TABLE);
+ Log.i(TAG, "Bootstrapped database");
+ }
+
+ @Override
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ if (oldVersion < DATABASE_VERSION) {
+ Log.w(TAG, "Detected schema version '" + oldVersion + "'. " +
+ "Index needs to be rebuilt for schema version '" + newVersion + "'.");
+ // We need to drop the tables and recreate them
+ reconstruct(db);
+ }
+ }
+
+ @Override
+ public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ Log.w(TAG, "Detected schema version '" + oldVersion + "'. " +
+ "Index needs to be rebuilt for schema version '" + newVersion + "'.");
+ // We need to drop the tables and recreate them
+ reconstruct(db);
+ }
+
+ public void reconstruct(SQLiteDatabase db) {
+ dropTables(db);
+ bootstrapDB(db);
+ }
+
+ private void dropTables(SQLiteDatabase db) {
+ db.execSQL("DROP TABLE IF EXISTS " + Tables.TABLE_ANOMALY);
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java
new file mode 100644
index 0000000..1daff36
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/AppInfo.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.fuelgauge.batterytip;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+
+/**
+ * Model class stores app info(e.g. package name, type..) that used in battery tip
+ */
+public class AppInfo implements Comparable<AppInfo>, Parcelable {
+ public final String packageName;
+ /**
+ * Anomaly type of the app
+ * @see Anomaly.AnomalyType
+ */
+ public final int anomalyType;
+ public final long screenOnTimeMs;
+
+ private AppInfo(AppInfo.Builder builder) {
+ packageName = builder.mPackageName;
+ anomalyType = builder.mAnomalyType;
+ screenOnTimeMs = builder.mScreenOnTimeMs;
+ }
+
+ @VisibleForTesting
+ AppInfo(Parcel in) {
+ packageName = in.readString();
+ anomalyType = in.readInt();
+ screenOnTimeMs = in.readLong();
+ }
+
+ @Override
+ public int compareTo(AppInfo o) {
+ return Long.compare(screenOnTimeMs, o.screenOnTimeMs);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeString(packageName);
+ dest.writeInt(anomalyType);
+ dest.writeLong(screenOnTimeMs);
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ public AppInfo createFromParcel(Parcel in) {
+ return new AppInfo(in);
+ }
+
+ public AppInfo[] newArray(int size) {
+ return new AppInfo[size];
+ }
+ };
+
+ public static final class Builder {
+ private int mAnomalyType;
+ private String mPackageName;
+ private long mScreenOnTimeMs;
+
+ public Builder setAnomalyType(int type) {
+ mAnomalyType = type;
+ return this;
+ }
+
+ public Builder setPackageName(String packageName) {
+ mPackageName = packageName;
+ return this;
+ }
+
+ public Builder setScreenOnTimeMs(long screenOnTimeMs) {
+ mScreenOnTimeMs = screenOnTimeMs;
+ return this;
+ }
+
+ public AppInfo build() {
+ return new AppInfo(this);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java b/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java
new file mode 100644
index 0000000..f87501f
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.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.fuelgauge.batterytip;
+
+import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns
+ .PACKAGE_NAME;
+import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns
+ .ANOMALY_TYPE;
+import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns
+ .TIME_STAMP_MS;
+import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.Tables.TABLE_ANOMALY;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Database manager for battery data. Now it only contains anomaly data stored in {@link AppInfo}.
+ */
+public class BatteryDatabaseManager {
+ private final AnomalyDatabaseHelper mDatabaseHelper;
+
+ public BatteryDatabaseManager(Context context) {
+ mDatabaseHelper = AnomalyDatabaseHelper.getInstance(context);
+ }
+
+ /**
+ * Insert an anomaly log to database.
+ *
+ * @param packageName the package name of the app
+ * @param type the type of the anomaly
+ * @param timestampMs the time when it is happened
+ */
+ public void insertAnomaly(String packageName, int type, long timestampMs) {
+ try (SQLiteDatabase db = mDatabaseHelper.getWritableDatabase()) {
+ ContentValues values = new ContentValues();
+ values.put(PACKAGE_NAME, packageName);
+ values.put(ANOMALY_TYPE, type);
+ values.put(TIME_STAMP_MS, timestampMs);
+
+ db.insert(TABLE_ANOMALY, null, values);
+ }
+ }
+
+ /**
+ * Query all the anomalies that happened after {@code timestampMs}.
+ */
+ public List<AppInfo> queryAllAnomaliesAfter(long timestampMs) {
+ final List<AppInfo> appInfos = new ArrayList<>();
+ try (SQLiteDatabase db = mDatabaseHelper.getReadableDatabase()) {
+ final String[] projection = {PACKAGE_NAME, ANOMALY_TYPE};
+ final String orderBy = AnomalyDatabaseHelper.AnomalyColumns.TIME_STAMP_MS + " DESC";
+
+ try (Cursor cursor = db.query(TABLE_ANOMALY, projection, TIME_STAMP_MS + " > ?",
+ new String[]{String.valueOf(timestampMs)}, null, null, orderBy)) {
+ while (cursor.moveToNext()) {
+ AppInfo appInfo = new AppInfo.Builder()
+ .setPackageName(cursor.getString(cursor.getColumnIndex(PACKAGE_NAME)))
+ .setAnomalyType(cursor.getInt(cursor.getColumnIndex(ANOMALY_TYPE)))
+ .build();
+ appInfos.add(appInfo);
+ }
+ }
+ }
+
+ return appInfos;
+ }
+
+ public void deleteAllAnomaliesBeforeTimeStamp(long timestampMs) {
+ try (SQLiteDatabase db = mDatabaseHelper.getWritableDatabase()) {
+ db.delete(TABLE_ANOMALY, TIME_STAMP_MS + " < ?",
+ new String[]{String.valueOf(timestampMs)});
+ }
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
new file mode 100644
index 0000000..b51474d
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.batterytip;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController.BatteryTipListener;
+import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
+
+/**
+ * Dialog Fragment to show action dialog for each anomaly
+ */
+public class BatteryTipDialogFragment extends InstrumentedDialogFragment implements
+ DialogInterface.OnClickListener {
+
+ private static final String ARG_BATTERY_TIP = "battery_tip";
+
+ @VisibleForTesting
+ BatteryTip mBatteryTip;
+
+ public static BatteryTipDialogFragment newInstance(BatteryTip batteryTip) {
+ BatteryTipDialogFragment dialogFragment = new BatteryTipDialogFragment();
+
+ Bundle args = new Bundle(1);
+ args.putParcelable(ARG_BATTERY_TIP, batteryTip);
+ dialogFragment.setArguments(args);
+
+ return dialogFragment;
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ final Bundle bundle = getArguments();
+ final Context context = getContext();
+
+ mBatteryTip = bundle.getParcelable(ARG_BATTERY_TIP);
+
+ switch (mBatteryTip.getType()) {
+ case BatteryTip.TipType.SUMMARY:
+ case BatteryTip.TipType.LOW_BATTERY:
+ //TODO(b/70570352): add dialog
+ return null;
+ case BatteryTip.TipType.HIGH_DEVICE_USAGE:
+ final HighUsageTip highUsageTip = (HighUsageTip) mBatteryTip;
+ final RecyclerView view = (RecyclerView) LayoutInflater.from(context).inflate(
+ R.layout.recycler_view,
+ null);
+ view.setLayoutManager(new LinearLayoutManager(context));
+ view.setAdapter(new HighUsageAdapter(context,
+ highUsageTip.getHighUsageAppList()));
+
+ return new AlertDialog.Builder(context)
+ .setMessage(getString(R.string.battery_tip_dialog_message,
+ Utils.formatElapsedTime(context, highUsageTip.getScreenTimeMs(),
+ false /* withSeconds */)))
+ .setView(view)
+ .setPositiveButton(android.R.string.ok, null)
+ .create();
+ default:
+ throw new IllegalArgumentException("unknown type " + mBatteryTip.getType());
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ //TODO(b/70570352): add correct metric id
+ return 0;
+ }
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ final BatteryTipListener lsn = (BatteryTipListener) getTargetFragment();
+ if (lsn == null) {
+ return;
+ }
+ final BatteryTipAction action = BatteryTipUtils.getActionForBatteryTip(mBatteryTip,
+ (SettingsActivity) getActivity(), this);
+ if (action != null) {
+ action.handlePositiveAction();
+ }
+ lsn.onBatteryTipHandled(mBatteryTip);
+ }
+
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
index 9c3f48c..ced3461 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
@@ -22,8 +22,10 @@
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.fuelgauge.BatteryInfo;
import com.android.settings.fuelgauge.BatteryUtils;
-import com.android.settings.fuelgauge.batterytip.detectors.BatteryTipDetector;
+import com.android.settings.fuelgauge.batterytip.detectors.EarlyWarningDetector;
+import com.android.settings.fuelgauge.batterytip.detectors.HighUsageDetector;
import com.android.settings.fuelgauge.batterytip.detectors.LowBatteryDetector;
+import com.android.settings.fuelgauge.batterytip.detectors.SmartBatteryDetector;
import com.android.settings.fuelgauge.batterytip.detectors.SummaryDetector;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
@@ -44,9 +46,8 @@
private static final boolean USE_FAKE_DATA = false;
private BatteryStatsHelper mBatteryStatsHelper;
- private BatteryUtils mBatteryUtils;
@VisibleForTesting
- int mVisibleTips;
+ BatteryUtils mBatteryUtils;
public BatteryTipLoader(Context context, BatteryStatsHelper batteryStatsHelper) {
super(context);
@@ -62,11 +63,13 @@
final List<BatteryTip> tips = new ArrayList<>();
final BatteryTipPolicy policy = new BatteryTipPolicy(getContext());
final BatteryInfo batteryInfo = mBatteryUtils.getBatteryInfo(mBatteryStatsHelper, TAG);
- mVisibleTips = 0;
+ final Context context = getContext();
- addBatteryTipFromDetector(tips, new LowBatteryDetector(policy, batteryInfo));
- // Add summary detector at last since it need other detectors to update the mVisibleTips
- addBatteryTipFromDetector(tips, new SummaryDetector(policy, mVisibleTips));
+ tips.add(new LowBatteryDetector(policy, batteryInfo).detect());
+ tips.add(new HighUsageDetector(context, policy, mBatteryStatsHelper).detect());
+ tips.add(new SmartBatteryDetector(policy, context.getContentResolver()).detect());
+ tips.add(new EarlyWarningDetector(policy, context).detect());
+ tips.add(new SummaryDetector(policy).detect());
Collections.sort(tips);
return tips;
@@ -84,12 +87,4 @@
return tips;
}
- @VisibleForTesting
- void addBatteryTipFromDetector(final List<BatteryTip> tips,
- final BatteryTipDetector detector) {
- final BatteryTip batteryTip = detector.detect();
- mVisibleTips += batteryTip.isVisible() ? 1 : 0;
- tips.add(batteryTip);
- }
-
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
index ac5072d..a580db1 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
@@ -19,9 +19,12 @@
import android.content.Context;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
+import android.text.format.DateUtils;
import android.util.KeyValueListParser;
import android.util.Log;
+import java.time.Duration;
+
/**
* Class to store the policy for battery tips, which comes from
* {@link Settings.Global}
@@ -34,6 +37,8 @@
private static final String KEY_BATTERY_SAVER_TIP_ENABLED = "battery_saver_tip_enabled";
private static final String KEY_HIGH_USAGE_ENABLED = "high_usage_enabled";
private static final String KEY_HIGH_USAGE_APP_COUNT = "high_usage_app_count";
+ private static final String KEY_HIGH_USAGE_PERIOD_MS = "high_usage_period_ms";
+ private static final String KEY_HIGH_USAGE_BATTERY_DRAINING = "high_usage_battery_draining";
private static final String KEY_APP_RESTRICTION_ENABLED = "app_restriction_enabled";
private static final String KEY_REDUCED_BATTERY_ENABLED = "reduced_battery_enabled";
private static final String KEY_REDUCED_BATTERY_PERCENT = "reduced_battery_percent";
@@ -81,6 +86,24 @@
public final int highUsageAppCount;
/**
+ * The size of the window(milliseconds) for checking if the device is being heavily used
+ *
+ * @see Settings.Global#BATTERY_TIP_CONSTANTS
+ * @see #KEY_HIGH_USAGE_PERIOD_MS
+ */
+ public final long highUsagePeriodMs;
+
+ /**
+ * The battery draining threshold to detect whether device is heavily used.
+ * If battery drains more than {@link #highUsageBatteryDraining} in last {@link
+ * #highUsagePeriodMs}, treat device as heavily used.
+ *
+ * @see Settings.Global#BATTERY_TIP_CONSTANTS
+ * @see #KEY_HIGH_USAGE_BATTERY_DRAINING
+ */
+ public final int highUsageBatteryDraining;
+
+ /**
* {@code true} if app restriction tip is enabled
*
* @see Settings.Global#BATTERY_TIP_CONSTANTS
@@ -143,10 +166,13 @@
batterySaverTipEnabled = mParser.getBoolean(KEY_BATTERY_SAVER_TIP_ENABLED, true);
highUsageEnabled = mParser.getBoolean(KEY_HIGH_USAGE_ENABLED, true);
highUsageAppCount = mParser.getInt(KEY_HIGH_USAGE_APP_COUNT, 3);
+ highUsagePeriodMs = mParser.getLong(KEY_HIGH_USAGE_PERIOD_MS,
+ Duration.ofHours(2).toMillis());
+ highUsageBatteryDraining = mParser.getInt(KEY_HIGH_USAGE_BATTERY_DRAINING, 25);
appRestrictionEnabled = mParser.getBoolean(KEY_APP_RESTRICTION_ENABLED, true);
- reducedBatteryEnabled = mParser.getBoolean(KEY_REDUCED_BATTERY_ENABLED, true);
+ reducedBatteryEnabled = mParser.getBoolean(KEY_REDUCED_BATTERY_ENABLED, false);
reducedBatteryPercent = mParser.getInt(KEY_REDUCED_BATTERY_PERCENT, 50);
- lowBatteryEnabled = mParser.getBoolean(KEY_LOW_BATTERY_ENABLED, true);
+ lowBatteryEnabled = mParser.getBoolean(KEY_LOW_BATTERY_ENABLED, false);
lowBatteryHour = mParser.getInt(KEY_LOW_BATTERY_HOUR, 16);
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
index f611405..9ab4c51 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
@@ -18,11 +18,14 @@
import android.content.Context;
import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.PreferenceFragment;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.SettingsActivity;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.SummaryTip;
@@ -34,23 +37,31 @@
* Controller in charge of the battery tip group
*/
public class BatteryTipPreferenceController extends BasePreferenceController {
+ private static final String TAG = "BatteryTipPreferenceController";
+ private static final int REQUEST_ANOMALY_ACTION = 0;
+
private BatteryTipListener mBatteryTipListener;
private List<BatteryTip> mBatteryTips;
private Map<String, BatteryTip> mBatteryTipMap;
+ private SettingsActivity mSettingsActivity;
@VisibleForTesting
PreferenceGroup mPreferenceGroup;
@VisibleForTesting
Context mPrefContext;
+ PreferenceFragment mFragment;
public BatteryTipPreferenceController(Context context, String preferenceKey) {
- this(context, preferenceKey, null);
+ this(context, preferenceKey, null, null, null);
}
public BatteryTipPreferenceController(Context context, String preferenceKey,
+ SettingsActivity settingsActivity, PreferenceFragment fragment,
BatteryTipListener batteryTipListener) {
super(context, preferenceKey);
mBatteryTipListener = batteryTipListener;
mBatteryTipMap = new HashMap<>();
+ mFragment = fragment;
+ mSettingsActivity = settingsActivity;
}
@Override
@@ -87,6 +98,7 @@
final Preference preference = batteryTip.buildPreference(mPrefContext);
mBatteryTipMap.put(preference.getKey(), batteryTip);
mPreferenceGroup.addPreference(preference);
+ break;
}
}
}
@@ -96,9 +108,16 @@
final BatteryTip batteryTip = mBatteryTipMap.get(preference.getKey());
if (batteryTip != null) {
if (batteryTip.shouldShowDialog()) {
- // build and show the dialog
+ BatteryTipDialogFragment dialogFragment = BatteryTipDialogFragment.newInstance(
+ batteryTip);
+ dialogFragment.setTargetFragment(mFragment, REQUEST_ANOMALY_ACTION);
+ dialogFragment.show(mFragment.getFragmentManager(), TAG);
} else {
- batteryTip.action();
+ final BatteryTipAction action = BatteryTipUtils.getActionForBatteryTip(batteryTip,
+ mSettingsActivity, mFragment);
+ if (action != null) {
+ action.handlePositiveAction();
+ }
if (mBatteryTipListener != null) {
mBatteryTipListener.onBatteryTipHandled(batteryTip);
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
new file mode 100644
index 0000000..5781afd
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.batterytip;
+
+import android.app.Fragment;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.fuelgauge.batterytip.actions.BatterySaverAction;
+import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;
+import com.android.settings.fuelgauge.batterytip.actions.SmartBatteryAction;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+
+/**
+ * Utility class for {@link BatteryTip}
+ */
+public class BatteryTipUtils {
+
+ /**
+ * Get a corresponding action based on {@code batteryTip}
+ * @param batteryTip used to detect which action to choose
+ * @param settingsActivity used to populate {@link BatteryTipAction}
+ * @param fragment used to populate {@link BatteryTipAction}
+ * @return an action for {@code batteryTip}
+ */
+ public static BatteryTipAction getActionForBatteryTip(BatteryTip batteryTip,
+ SettingsActivity settingsActivity, Fragment fragment) {
+ switch (batteryTip.getType()) {
+ case BatteryTip.TipType.SMART_BATTERY_MANAGER:
+ return new SmartBatteryAction(settingsActivity, fragment);
+ case BatteryTip.TipType.BATTERY_SAVER:
+ return new BatterySaverAction(settingsActivity.getApplicationContext());
+ default:
+ return null;
+ }
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java
new file mode 100644
index 0000000..60aa6c8
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.batterytip;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+import android.support.v7.widget.RecyclerView;
+import android.util.IconDrawableFactory;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+import java.util.List;
+
+/**
+ * Adapter for the high usage app list
+ */
+public class HighUsageAdapter extends RecyclerView.Adapter<HighUsageAdapter.ViewHolder> {
+ private final Context mContext;
+ private final IconDrawableFactory mIconDrawableFactory;
+ private final PackageManager mPackageManager;
+ private final List<AppInfo> mHighUsageAppList;
+
+ public static class ViewHolder extends RecyclerView.ViewHolder {
+ public View view;
+ public ImageView appIcon;
+ public TextView appName;
+ public TextView appTime;
+
+ public ViewHolder(View v) {
+ super(v);
+ view = v;
+ appIcon = v.findViewById(R.id.app_icon);
+ appName = v.findViewById(R.id.app_name);
+ appTime = v.findViewById(R.id.app_screen_time);
+ }
+ }
+
+ public HighUsageAdapter(Context context, List<AppInfo> highUsageAppList) {
+ mContext = context;
+ mHighUsageAppList = highUsageAppList;
+ mIconDrawableFactory = IconDrawableFactory.newInstance(context);
+ mPackageManager = context.getPackageManager();
+ }
+
+ @Override
+ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ final View view = LayoutInflater.from(mContext).inflate(R.layout.app_high_usage_item,
+ parent, false);
+ return new ViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(ViewHolder holder, int position) {
+ final AppInfo app = mHighUsageAppList.get(position);
+ holder.appIcon.setImageDrawable(
+ Utils.getBadgedIcon(mIconDrawableFactory, mPackageManager, app.packageName,
+ UserHandle.myUserId()));
+ holder.appName.setText(Utils.getApplicationLabel(mContext, app.packageName));
+ holder.appTime.setText(Utils.formatElapsedTime(mContext, app.screenOnTimeMs, false));
+ }
+
+ @Override
+ public int getItemCount() {
+ return mHighUsageAppList.size();
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParser.java b/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParser.java
new file mode 100644
index 0000000..cc5aed6
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParser.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.fuelgauge.batterytip;
+
+import android.os.BatteryStats;
+
+import com.android.settings.fuelgauge.BatteryInfo;
+
+/**
+ * DataParser used to go through battery data and detect whether battery is
+ * heavily used.
+ */
+public class HighUsageDataParser implements BatteryInfo.BatteryDataParser {
+ /**
+ * time period to check the battery usage
+ */
+ private final long mTimePeriodMs;
+ /**
+ * treat device as heavily used if battery usage is more than {@code threshold}. 1 means 1%
+ * battery usage.
+ */
+ private int mThreshold;
+ private long mEndTimeMs;
+ private byte mEndBatteryLevel;
+ private byte mLastPeriodBatteryLevel;
+ private int mBatteryDrain;
+
+ public HighUsageDataParser(long timePeriodMs, int threshold) {
+ mTimePeriodMs = timePeriodMs;
+ mThreshold = threshold;
+ }
+
+ @Override
+ public void onParsingStarted(long startTime, long endTime) {
+ mEndTimeMs = endTime;
+ }
+
+ @Override
+ public void onDataPoint(long time, BatteryStats.HistoryItem record) {
+ if (record.currentTime <= mEndTimeMs - mTimePeriodMs) {
+ // Since onDataPoint is invoked sorted by time, so we could use this way to get the
+ // closet battery level 'mTimePeriodMs' time ago.
+ mLastPeriodBatteryLevel = record.batteryLevel;
+ }
+ mEndBatteryLevel = record.batteryLevel;
+ }
+
+ @Override
+ public void onDataGap() {
+ // do nothing
+ }
+
+ @Override
+ public void onParsingDone() {
+ mBatteryDrain = mLastPeriodBatteryLevel - mEndBatteryLevel;
+ }
+
+ /**
+ * Return {@code true} if the battery drain in {@link #mTimePeriodMs} is too much
+ */
+ public boolean isDeviceHeavilyUsed() {
+ return mBatteryDrain > mThreshold;
+ }
+}
+
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java
new file mode 100644
index 0000000..310d3f8
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.batterytip.actions;
+
+import android.content.Context;
+import android.os.PowerManager;
+
+public class BatterySaverAction extends BatteryTipAction {
+ private PowerManager mPowerManager;
+
+ public BatterySaverAction(Context context) {
+ super(context);
+ mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+ }
+
+ /**
+ * Handle the action when user clicks positive button
+ */
+ @Override
+ public void handlePositiveAction() {
+ mPowerManager.setPowerSaveMode(true);
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/BatteryTipAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/BatteryTipAction.java
new file mode 100644
index 0000000..1bf08b7
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/BatteryTipAction.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.batterytip.actions;
+
+import android.content.Context;
+
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+/**
+ * Abstract class for battery tip action, which is triggered if we need to handle the battery tip
+ */
+public abstract class BatteryTipAction {
+ protected Context mContext;
+
+ public BatteryTipAction(Context context) {
+ mContext = context;
+ }
+
+ /**
+ * Handle the action when user clicks positive button
+ */
+ public abstract void handlePositiveAction();
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
new file mode 100644
index 0000000..cbd1581
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.batterytip.actions;
+
+import android.app.Fragment;
+import android.os.UserHandle;
+import android.support.v14.preference.PreferenceFragment;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.fuelgauge.SmartBatterySettings;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+public class SmartBatteryAction extends BatteryTipAction {
+ private SettingsActivity mSettingsActivity;
+ private Fragment mFragment;
+
+ public SmartBatteryAction(SettingsActivity settingsActivity, Fragment fragment) {
+ super(settingsActivity.getApplicationContext());
+ mSettingsActivity = settingsActivity;
+ mFragment = fragment;
+ }
+
+ /**
+ * Handle the action when user clicks positive button
+ */
+ @Override
+ public void handlePositiveAction() {
+ mSettingsActivity.startPreferencePanelAsUser(mFragment,
+ SmartBatterySettings.class.getName(), null /* args */,
+ R.string.smart_battery_manager_title, null /* titleText */,
+ new UserHandle(UserHandle.myUserId()));
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java
new file mode 100644
index 0000000..cb23e94
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.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.fuelgauge.batterytip.detectors;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.BatteryManager;
+import android.os.PowerManager;
+
+import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
+import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.EarlyWarningTip;
+import com.android.settings.overlay.FeatureFactory;
+
+/**
+ * Detector whether to early warning tip.
+ */
+public class EarlyWarningDetector implements BatteryTipDetector {
+ private BatteryTipPolicy mPolicy;
+ private PowerManager mPowerManager;
+ private Context mContext;
+ private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
+
+ public EarlyWarningDetector(BatteryTipPolicy policy, Context context) {
+ mPolicy = policy;
+ mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+ mContext = context;
+ mPowerUsageFeatureProvider = FeatureFactory.getFactory(
+ context).getPowerUsageFeatureProvider(context);
+ }
+
+ @Override
+ public BatteryTip detect() {
+ final Intent batteryBroadcast = mContext.registerReceiver(null,
+ new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+ final boolean discharging =
+ batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
+ final boolean powerSaveModeOn = mPowerManager.isPowerSaveMode();
+ final boolean earlyWarning = mPowerUsageFeatureProvider.getEarlyWarningSignal(mContext,
+ EarlyWarningDetector.class.getName());
+
+ final int state =
+ mPolicy.batterySaverTipEnabled && !powerSaveModeOn && discharging && earlyWarning
+ ? BatteryTip.StateType.NEW
+ : BatteryTip.StateType.INVISIBLE;
+ return new EarlyWarningTip(state, powerSaveModeOn);
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
new file mode 100644
index 0000000..ed3fa04
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.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.fuelgauge.batterytip.detectors;
+
+import android.content.Context;
+import android.os.BatteryStats;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
+import com.android.settings.fuelgauge.batterytip.AppInfo;
+import com.android.settings.fuelgauge.BatteryInfo;
+import com.android.settings.fuelgauge.batterytip.HighUsageDataParser;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 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}
+ */
+public class HighUsageDetector implements BatteryTipDetector {
+ private BatteryTipPolicy mPolicy;
+ private BatteryStatsHelper mBatteryStatsHelper;
+ private List<AppInfo> mHighUsageAppList;
+ private Context mContext;
+ @VisibleForTesting
+ HighUsageDataParser mDataParser;
+ @VisibleForTesting
+ BatteryUtils mBatteryUtils;
+
+ public HighUsageDetector(Context context, BatteryTipPolicy policy,
+ BatteryStatsHelper batteryStatsHelper) {
+ mContext = context;
+ mPolicy = policy;
+ mBatteryStatsHelper = batteryStatsHelper;
+ mHighUsageAppList = new ArrayList<>();
+ mBatteryUtils = BatteryUtils.getInstance(context);
+ mDataParser = new HighUsageDataParser(mPolicy.highUsagePeriodMs,
+ mPolicy.highUsageBatteryDraining);
+ }
+
+ @Override
+ public BatteryTip detect() {
+ final long screenUsageTimeMs = mBatteryUtils.calculateScreenUsageTime(mBatteryStatsHelper);
+ if (mPolicy.highUsageEnabled) {
+ parseBatteryData();
+ if (mDataParser.isDeviceHeavilyUsed()) {
+ final List<BatterySipper> batterySippers = mBatteryStatsHelper.getUsageList();
+ for (int i = 0, size = batterySippers.size(); i < size; i++) {
+ final BatterySipper batterySipper = batterySippers.get(i);
+ if (!mBatteryUtils.shouldHideSipper(batterySipper)) {
+ final long foregroundTimeMs = mBatteryUtils.getProcessTimeMs(
+ BatteryUtils.StatusType.FOREGROUND, batterySipper.uidObj,
+ BatteryStats.STATS_SINCE_CHARGED);
+ mHighUsageAppList.add(new AppInfo.Builder()
+ .setPackageName(
+ mBatteryUtils.getPackageName(batterySipper.getUid()))
+ .setScreenOnTimeMs(foregroundTimeMs)
+ .build());
+ }
+ }
+
+ mHighUsageAppList = mHighUsageAppList.subList(0,
+ Math.min(mPolicy.highUsageAppCount, mHighUsageAppList.size()));
+ Collections.sort(mHighUsageAppList, Collections.reverseOrder());
+ }
+ }
+
+ return new HighUsageTip(screenUsageTimeMs, mHighUsageAppList);
+ }
+
+ @VisibleForTesting
+ void parseBatteryData() {
+ BatteryInfo.parse(mBatteryStatsHelper.getStats(), mDataParser);
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetector.java
new file mode 100644
index 0000000..bff324d
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetector.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.fuelgauge.batterytip.detectors;
+
+import android.content.ContentResolver;
+import android.provider.Settings;
+
+import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.SmartBatteryTip;
+
+/**
+ * Detect whether to show smart battery tip.
+ */
+public class SmartBatteryDetector implements BatteryTipDetector {
+ private BatteryTipPolicy mPolicy;
+ private ContentResolver mContentResolver;
+
+ public SmartBatteryDetector(BatteryTipPolicy policy, ContentResolver contentResolver) {
+ mPolicy = policy;
+ mContentResolver = contentResolver;
+ }
+
+ @Override
+ public BatteryTip detect() {
+ // Show it if there is no other tips shown
+ final boolean smartBatteryOn = Settings.Global.getInt(mContentResolver,
+ Settings.Global.APP_STANDBY_ENABLED, 1) != 0;
+ final int state =
+ smartBatteryOn ? BatteryTip.StateType.INVISIBLE : BatteryTip.StateType.NEW;
+ return new SmartBatteryTip(state);
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetector.java
index 8c1783b..a45dc09 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetector.java
@@ -26,17 +26,15 @@
*/
public class SummaryDetector implements BatteryTipDetector {
private BatteryTipPolicy mPolicy;
- private int mVisibleTips;
- public SummaryDetector(BatteryTipPolicy policy, int visibleTips) {
+ public SummaryDetector(BatteryTipPolicy policy) {
mPolicy = policy;
- mVisibleTips = visibleTips;
}
@Override
public BatteryTip detect() {
// Show it if there is no other tips shown
- final int state = mPolicy.summaryEnabled && mVisibleTips == 0
+ final int state = mPolicy.summaryEnabled
? BatteryTip.StateType.NEW
: BatteryTip.StateType.INVISIBLE;
return new SummaryTip(state);
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
index 17e395e..09ebc4b 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
@@ -16,8 +16,9 @@
package com.android.settings.fuelgauge.batterytip.tips;
-import android.app.Dialog;
import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
import android.support.annotation.IdRes;
import android.support.annotation.IntDef;
import android.support.v7.preference.Preference;
@@ -31,7 +32,7 @@
* Each {@link BatteryTip} contains basic data(e.g. title, summary, icon) as well as the
* pre-defined action(e.g. turn on battery saver)
*/
-public abstract class BatteryTip implements Comparable<BatteryTip> {
+public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
@Retention(RetentionPolicy.SOURCE)
@IntDef({StateType.NEW,
StateType.HANDLED,
@@ -51,23 +52,45 @@
TipType.REDUCED_BATTERY,
TipType.LOW_BATTERY})
public @interface TipType {
- int SUMMARY = 0;
- int BATTERY_SAVER = 1;
+ int SMART_BATTERY_MANAGER = 0;
+ int APP_RESTRICTION = 1;
int HIGH_DEVICE_USAGE = 2;
- int SMART_BATTERY_MANAGER = 3;
- int APP_RESTRICTION = 4;
- int REDUCED_BATTERY = 5;
- int LOW_BATTERY = 6;
+ int BATTERY_SAVER = 3;
+ int REDUCED_BATTERY = 4;
+ int LOW_BATTERY = 5;
+ int SUMMARY = 6;
}
private static final String KEY_PREFIX = "key_battery_tip";
- @TipType
protected int mType;
- @StateType
protected int mState;
protected boolean mShowDialog;
+ BatteryTip(Parcel in) {
+ mType = in.readInt();
+ mState = in.readInt();
+ mShowDialog = in.readBoolean();
+ }
+
+ BatteryTip(int type, int state, boolean showDialog) {
+ mType = type;
+ mState = state;
+ mShowDialog = showDialog;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeInt(mType);
+ dest.writeInt(mState);
+ dest.writeBoolean(mShowDialog);
+ }
+
public abstract CharSequence getTitle(Context context);
public abstract CharSequence getSummary(Context context);
@@ -77,21 +100,11 @@
/**
* Update the current {@link #mState} using the new {@code tip}.
+ *
* @param tip used to update
*/
public abstract void updateState(BatteryTip tip);
- /**
- * Execute the action for this {@link BatteryTip}
- */
- public abstract void action();
-
- /**
- * Build the dialog to display either the info about {@link BatteryTip} or confirmation
- * about the action.
- */
- public abstract Dialog buildDialog();
-
public Preference buildPreference(Context context) {
Preference preference = new Preference(context);
@@ -110,6 +123,10 @@
return KEY_PREFIX + mType;
}
+ public int getType() {
+ return mType;
+ }
+
@StateType
public int getState() {
return mState;
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java
new file mode 100644
index 0000000..f8d8fa1
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.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.fuelgauge.batterytip.tips;
+
+import android.content.Context;
+import android.os.Parcel;
+
+import com.android.settings.R;
+
+/**
+ * Tip to show early warning if battery couldn't make to usual charging time
+ */
+public class EarlyWarningTip extends BatteryTip {
+ private boolean mPowerSaveModeOn;
+
+ public EarlyWarningTip(@StateType int state, boolean powerSaveModeOn) {
+ super(TipType.BATTERY_SAVER, state, false /* showDialog */);
+ mPowerSaveModeOn = powerSaveModeOn;
+ }
+
+ public EarlyWarningTip(Parcel in) {
+ super(in);
+ mPowerSaveModeOn = in.readBoolean();
+ }
+
+ @Override
+ public CharSequence getTitle(Context context) {
+ return context.getString(
+ mState == StateType.HANDLED
+ ? R.string.battery_tip_early_heads_up_done_title
+ : R.string.battery_tip_early_heads_up_title);
+ }
+
+ @Override
+ public CharSequence getSummary(Context context) {
+ return context.getString(
+ mState == StateType.HANDLED
+ ? R.string.battery_tip_early_heads_up_done_summary
+ : R.string.battery_tip_early_heads_up_summary);
+ }
+
+ @Override
+ public int getIconId() {
+ return mState == StateType.HANDLED
+ ? R.drawable.ic_perm_device_information_green_24dp
+ : R.drawable.ic_battery_alert_24dp;
+ }
+
+ @Override
+ public void updateState(BatteryTip tip) {
+ final EarlyWarningTip earlyHeadsUpTip = (EarlyWarningTip) tip;
+ if (mPowerSaveModeOn != earlyHeadsUpTip.mPowerSaveModeOn) {
+ mPowerSaveModeOn = earlyHeadsUpTip.mPowerSaveModeOn;
+ mState = earlyHeadsUpTip.mPowerSaveModeOn ? StateType.HANDLED : StateType.NEW;
+ } else if (mState != StateType.HANDLED) {
+ mState = earlyHeadsUpTip.getState();
+ }
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ super.writeToParcel(dest, flags);
+ dest.writeBoolean(mPowerSaveModeOn);
+ }
+
+ public boolean isPowerSaveModeOn() {
+ return mPowerSaveModeOn;
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ public BatteryTip createFromParcel(Parcel in) {
+ return new EarlyWarningTip(in);
+ }
+
+ public BatteryTip[] newArray(int size) {
+ return new EarlyWarningTip[size];
+ }
+ };
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java
new file mode 100644
index 0000000..2aabf98
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.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.fuelgauge.batterytip.tips;
+
+import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.fuelgauge.batterytip.AppInfo;
+
+import java.util.List;
+
+/**
+ * Tip to show general summary about battery life
+ */
+public class HighUsageTip extends BatteryTip {
+
+ private final long mScreenTimeMs;
+ @VisibleForTesting
+ final List<AppInfo> mHighUsageAppList;
+
+ public HighUsageTip(long screenTimeMs, List<AppInfo> appList) {
+ super(TipType.HIGH_DEVICE_USAGE, appList.isEmpty() ? StateType.INVISIBLE : StateType.NEW,
+ true /* showDialog */);
+ mScreenTimeMs = screenTimeMs;
+ mHighUsageAppList = appList;
+ }
+
+ @VisibleForTesting
+ HighUsageTip(Parcel in) {
+ super(in);
+ mScreenTimeMs = in.readLong();
+ mHighUsageAppList = in.createTypedArrayList(AppInfo.CREATOR);
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ super.writeToParcel(dest, flags);
+ dest.writeLong(mScreenTimeMs);
+ dest.writeTypedList(mHighUsageAppList);
+ }
+
+ @Override
+ public CharSequence getTitle(Context context) {
+ return context.getString(R.string.battery_tip_high_usage_title);
+ }
+
+ @Override
+ public CharSequence getSummary(Context context) {
+ return context.getString(R.string.battery_tip_high_usage_summary,
+ Utils.formatElapsedTime(context, mScreenTimeMs, false));
+ }
+
+ @Override
+ public int getIconId() {
+ return R.drawable.ic_perm_device_information_red_24dp;
+ }
+
+ @Override
+ public void updateState(BatteryTip tip) {
+ mState = tip.mState;
+ }
+
+ public long getScreenTimeMs() {
+ return mScreenTimeMs;
+ }
+
+ public List<AppInfo> getHighUsageAppList() {
+ return mHighUsageAppList;
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ public BatteryTip createFromParcel(Parcel in) {
+ return new HighUsageTip(in);
+ }
+
+ public BatteryTip[] newArray(int size) {
+ return new HighUsageTip[size];
+ }
+ };
+
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java
index 8605fbb..32cbe02 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java
@@ -16,8 +16,9 @@
package com.android.settings.fuelgauge.batterytip.tips;
-import android.app.Dialog;
import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
import com.android.settings.R;
@@ -27,9 +28,11 @@
public class LowBatteryTip extends BatteryTip {
public LowBatteryTip(@StateType int state) {
- mShowDialog = false;
- mState = state;
- mType = TipType.LOW_BATTERY;
+ super(TipType.LOW_BATTERY, state, false /* showDialog */);
+ }
+
+ private LowBatteryTip(Parcel in) {
+ super(in);
}
@Override
@@ -52,14 +55,14 @@
mState = tip.mState;
}
- @Override
- public void action() {
- // do nothing
- }
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ public BatteryTip createFromParcel(Parcel in) {
+ return new LowBatteryTip(in);
+ }
- @Override
- public Dialog buildDialog() {
- //TODO(b/70570352): create the dialog for low battery tip and add test
- return null;
- }
+ public BatteryTip[] newArray(int size) {
+ return new LowBatteryTip[size];
+ }
+ };
+
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java
new file mode 100644
index 0000000..7b408bb
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.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.fuelgauge.batterytip.tips;
+
+import android.content.Context;
+import android.os.Parcel;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+/**
+ * Tip to suggest turn on smart battery if it is not on
+ */
+public class SmartBatteryTip extends BatteryTip {
+
+ public SmartBatteryTip(@StateType int state) {
+ super(TipType.SMART_BATTERY_MANAGER, state, false /* showDialog */);
+ }
+
+ private SmartBatteryTip(Parcel in) {
+ super(in);
+ }
+
+ @Override
+ public CharSequence getTitle(Context context) {
+ return context.getString(R.string.battery_tip_smart_battery_title);
+ }
+
+ @Override
+ public CharSequence getSummary(Context context) {
+ return context.getString(R.string.battery_tip_smart_battery_summary);
+ }
+
+ @Override
+ public int getIconId() {
+ return R.drawable.ic_perm_device_information_red_24dp;
+ }
+
+ @Override
+ public void updateState(BatteryTip tip) {
+ mState = tip.mState;
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ public BatteryTip createFromParcel(Parcel in) {
+ return new SmartBatteryTip(in);
+ }
+
+ public BatteryTip[] newArray(int size) {
+ return new SmartBatteryTip[size];
+ }
+ };
+
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java
index 2a2deab..458bd2e 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java
@@ -16,8 +16,9 @@
package com.android.settings.fuelgauge.batterytip.tips;
-import android.app.Dialog;
import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
import com.android.settings.R;
@@ -27,9 +28,11 @@
public class SummaryTip extends BatteryTip {
public SummaryTip(@StateType int state) {
- mShowDialog = false;
- mState = state;
- mType = TipType.SUMMARY;
+ super(TipType.SUMMARY, state, false /* showDialog */);
+ }
+
+ private SummaryTip(Parcel in) {
+ super(in);
}
@Override
@@ -52,14 +55,13 @@
mState = tip.mState;
}
- @Override
- public void action() {
- // do nothing
- }
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ public BatteryTip createFromParcel(Parcel in) {
+ return new SummaryTip(in);
+ }
- @Override
- public Dialog buildDialog() {
- //TODO(b/70570352): create the dialog for summary tip and add test
- return null;
- }
+ public BatteryTip[] newArray(int size) {
+ return new SummaryTip[size];
+ }
+ };
}
diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
index 6a0e853..c4e998a 100644
--- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
+++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
@@ -27,6 +27,7 @@
import android.view.InputDevice;
import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -73,6 +74,11 @@
@Override
public boolean isAvailable() {
+ // If device explicitly wants to hide this, return early.
+ if (!mContext.getResources().getBoolean(R.bool.config_show_vibrate_input_devices)) {
+ return false;
+ }
+
final int[] devices = mIm.getInputDeviceIds();
for (int deviceId : devices) {
InputDevice device = mIm.getInputDevice(deviceId);
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
index 7b0d1ce..ec0aecd 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
@@ -50,7 +50,7 @@
@Override
public boolean isAvailable() {
- return true;
+ return mContext.getResources().getBoolean(R.bool.config_show_physical_keyboard_pref);
}
@Override
diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
index 270aaba..1396889 100644
--- a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
+++ b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
@@ -51,7 +51,7 @@
@Override
public boolean isAvailable() {
- return true;
+ return mContext.getResources().getBoolean(R.bool.config_show_spellcheckers_settings);
}
@Override
diff --git a/src/com/android/settings/inputmethod/UserDictionarySettings.java b/src/com/android/settings/inputmethod/UserDictionarySettings.java
index 9680af1..3bbc581 100644
--- a/src/com/android/settings/inputmethod/UserDictionarySettings.java
+++ b/src/com/android/settings/inputmethod/UserDictionarySettings.java
@@ -42,10 +42,11 @@
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.core.instrumentation.Instrumentable;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
public class UserDictionarySettings extends ListFragment implements Instrumentable,
LoaderManager.LoaderCallbacks<Cursor> {
@@ -59,8 +60,7 @@
private static final int OPTIONS_MENU_ADD = Menu.FIRST;
private static final int LOADER_ID = 1;
- private final VisibilityLoggerMixin mVisibilityLoggerMixin =
- new VisibilityLoggerMixin(getMetricsCategory());
+ private VisibilityLoggerMixin mVisibilityLoggerMixin;
private Cursor mCursor;
private String mLocale;
@@ -71,15 +71,12 @@
}
@Override
- public void onAttach(Context context) {
- super.onAttach(context);
- mVisibilityLoggerMixin.onAttach(context);
- }
-
- @Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
+ FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider());
+
final Intent intent = getActivity().getIntent();
final String localeFromIntent =
null == intent ? null : intent.getStringExtra("locale");
diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
index c3443d2..c4dbef1 100644
--- a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
+++ b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
@@ -47,7 +47,7 @@
@Override
public boolean isAvailable() {
- return true;
+ return mContext.getResources().getBoolean(R.bool.config_show_virtual_keyboard_pref);
}
@Override
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index bf61116..cb60ef5 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -21,6 +21,7 @@
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.PackageManager;
+import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.speech.tts.TtsEngines;
@@ -40,6 +41,7 @@
import com.android.settings.inputmethod.SpellCheckerPreferenceController;
import com.android.settings.inputmethod.VirtualKeyboardPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.PreferenceCategoryController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -51,7 +53,10 @@
private static final String TAG = "LangAndInputSettings";
+ 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_GAME_CONTROLLER_CATEGORY = "game_controller_settings_category";
private static final String KEY_PHYSICAL_KEYBOARD = "physical_keyboard_pref";
@Override
@@ -92,20 +97,45 @@
final List<AbstractPreferenceController> controllers = new ArrayList<>();
// Language
controllers.add(new PhoneLanguagePreferenceController(context));
- controllers.add(new SpellCheckerPreferenceController(context));
- controllers.add(new UserDictionaryPreferenceController(context));
- controllers.add(new TtsPreferenceController(context, new TtsEngines(context)));
+
// Input
- controllers.add(new VirtualKeyboardPreferenceController(context));
- controllers.add(new PhysicalKeyboardPreferenceController(context, lifecycle));
+ final VirtualKeyboardPreferenceController virtualKeyboardPreferenceController =
+ new VirtualKeyboardPreferenceController(context);
+ final PhysicalKeyboardPreferenceController physicalKeyboardPreferenceController =
+ new PhysicalKeyboardPreferenceController(context, lifecycle);
+ controllers.add(virtualKeyboardPreferenceController);
+ controllers.add(physicalKeyboardPreferenceController);
+ controllers.add(new PreferenceCategoryController(context,
+ KEY_KEYBOARDS_CATEGORY,
+ Arrays.asList(virtualKeyboardPreferenceController,
+ physicalKeyboardPreferenceController)));
+
+ // Pointer and Tts
+ final TtsPreferenceController ttsPreferenceController =
+ new TtsPreferenceController(context, new TtsEngines(context));
+ controllers.add(ttsPreferenceController);
+ final PointerSpeedController pointerController = new PointerSpeedController(context);
+ controllers.add(pointerController);
+ controllers.add(new PreferenceCategoryController(context,
+ KEY_POINTER_AND_TTS_CATEGORY,
+ Arrays.asList(pointerController, ttsPreferenceController)));
+
+ // Input Assistance
+ controllers.add(new SpellCheckerPreferenceController(context));
+ controllers.add(new DefaultAutofillPreferenceController(context));
+ controllers.add(new UserDictionaryPreferenceController(context));
+
+ // Game Controller
final GameControllerPreferenceController gameControllerPreferenceController
= new GameControllerPreferenceController(context);
if (lifecycle != null) {
lifecycle.addObserver(gameControllerPreferenceController);
}
-
controllers.add(gameControllerPreferenceController);
- controllers.add(new DefaultAutofillPreferenceController(context));
+ controllers.add(new PreferenceCategoryController(context,
+ KEY_GAME_CONTROLLER_CATEGORY,
+ Arrays.asList(gameControllerPreferenceController)));
+
return controllers;
}
diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java
index 49f7f21..1fd7db7 100644
--- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java
+++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java
@@ -41,7 +41,8 @@
@Override
public boolean isAvailable() {
- return mContext.getAssets().getLocales().length > 1;
+ return mContext.getResources().getBoolean(R.bool.config_show_phone_language)
+ && mContext.getAssets().getLocales().length > 1;
}
@Override
diff --git a/src/com/android/settings/language/PointerSpeedController.java b/src/com/android/settings/language/PointerSpeedController.java
new file mode 100644
index 0000000..857751c
--- /dev/null
+++ b/src/com/android/settings/language/PointerSpeedController.java
@@ -0,0 +1,41 @@
+/*
+ * 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.language;
+
+import android.content.Context;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.R;
+
+import android.support.annotation.VisibleForTesting;
+
+
+public class PointerSpeedController extends BasePreferenceController {
+
+ @VisibleForTesting static final String KEY_POINTER_SPEED = "pointer_speed";
+
+ public PointerSpeedController(Context context) {
+ super(context, KEY_POINTER_SPEED);
+ }
+
+ @AvailabilityStatus
+ public int getAvailabilityStatus() {
+ return mContext.getResources().getBoolean(R.bool.config_show_pointer_speed)
+ ? AVAILABLE
+ : DISABLED_UNSUPPORTED;
+ }
+}
diff --git a/src/com/android/settings/language/TtsPreferenceController.java b/src/com/android/settings/language/TtsPreferenceController.java
index ef26d5f..f19047b 100644
--- a/src/com/android/settings/language/TtsPreferenceController.java
+++ b/src/com/android/settings/language/TtsPreferenceController.java
@@ -20,6 +20,7 @@
import android.speech.tts.TtsEngines;
import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
public class TtsPreferenceController extends AbstractPreferenceController
@@ -37,7 +38,8 @@
@Override
public boolean isAvailable() {
- return !mTtsEngines.getEngines().isEmpty();
+ return !mTtsEngines.getEngines().isEmpty() &&
+ mContext.getResources().getBoolean(R.bool.config_show_tts_settings_summary);
}
@Override
diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
index 1d21c12..0d8cbaf 100644
--- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
+++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
@@ -34,7 +34,7 @@
import com.android.internal.app.LocalePicker;
import com.android.internal.app.LocaleStore;
-import com.android.settings.CreateShortcut;
+import com.android.settings.shortcut.CreateShortcut;
import com.android.settings.R;
import java.text.NumberFormat;
diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java
index 5c5399c..30ecf2e 100644
--- a/src/com/android/settings/location/LocationEnabler.java
+++ b/src/com/android/settings/location/LocationEnabler.java
@@ -34,6 +34,9 @@
import com.android.settingslib.core.lifecycle.events.OnResume;
import static com.android.settingslib.Utils.updateLocationMode;
+import static com.android.settingslib.Utils.updateLocationEnabled;
+import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
+
/**
* A class that listens to location settings change and modifies location settings
@@ -105,6 +108,26 @@
}
}
+ void setLocationEnabled(boolean enabled) {
+ final int currentMode = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+
+ if (isRestricted()) {
+ // Location toggling disabled by user restriction. Read the current location mode to
+ // update the location master switch.
+ if (Log.isLoggable(TAG, Log.INFO)) {
+ Log.i(TAG, "Restricted user, not setting location mode");
+ }
+ if (mListener != null) {
+ mListener.onLocationModeChanged(currentMode, true);
+ }
+ return;
+ }
+ updateLocationEnabled(mContext, enabled, UserHandle.myUserId(),
+ Settings.Secure.LOCATION_CHANGER_SYSTEM_SETTINGS);
+ refreshLocationMode();
+ }
+
void setLocationMode(int mode) {
final int currentMode = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
@@ -120,7 +143,8 @@
return;
}
- updateLocationMode(mContext, currentMode, mode, ActivityManager.getCurrentUser());
+ updateLocationMode(mContext, currentMode, mode, ActivityManager.getCurrentUser(),
+ Settings.Secure.LOCATION_CHANGER_SYSTEM_SETTINGS);
refreshLocationMode();
}
@@ -140,8 +164,14 @@
}
RestrictedLockUtils.EnforcedAdmin getShareLocationEnforcedAdmin(int userId) {
- return RestrictedLockUtils.checkIfRestrictionEnforced(
+ RestrictedLockUtils.EnforcedAdmin admin = checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_SHARE_LOCATION, userId);
+
+ if (admin == null) {
+ admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ mContext, UserManager.DISALLOW_CONFIG_LOCATION_MODE, userId);
+ }
+ return admin;
}
boolean hasShareLocationRestriction(int userId) {
diff --git a/src/com/android/settings/location/LocationMode.java b/src/com/android/settings/location/LocationMode.java
deleted file mode 100644
index 5931f9e..0000000
--- a/src/com/android/settings/location/LocationMode.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.Context;
-import android.provider.SearchIndexableResource;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-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.core.lifecycle.Lifecycle;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * A page with 3 radio buttons to choose the location mode.
- *
- * There are 3 location modes when location access is enabled:
- *
- * High accuracy: use both GPS and network location.
- *
- * Battery saving: use network location only to reduce the power consumption.
- *
- * Sensors only: use GPS location only.
- */
-public class LocationMode extends DashboardFragment {
-
- private static final String TAG = "LocationMode";
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.LOCATION_MODE;
- }
-
- @Override
- protected int getPreferenceScreenResId() {
- return R.xml.location_mode;
- }
-
- @Override
- protected String getLogTag() {
- return TAG;
- }
-
- @Override
- protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
- return buildPreferenceControllers(context, getLifecycle());
- }
-
- @Override
- public int getHelpResource() {
- return R.string.help_url_location_access;
- }
-
- private static List<AbstractPreferenceController> buildPreferenceControllers(
- Context context, Lifecycle lifecycle) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new LocationModeHighAccuracyPreferenceController(context, lifecycle));
- controllers.add(
- new LocationModeBatterySavingPreferenceController(context, lifecycle));
- controllers.add(new LocationModeSensorsOnlyPreferenceController(context, lifecycle));
- return controllers;
- }
-
- /**
- * For Search.
- */
- public static final Indexable.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.location_mode;
- return Arrays.asList(sir);
- }
-
- @Override
- protected boolean isPageSearchEnabled(Context context) {
- return context.getResources().getBoolean(R.bool.config_location_mode_available);
- }
-
- @Override
- public List<AbstractPreferenceController> getPreferenceControllers(Context
- context) {
- return buildPreferenceControllers(context, null /* lifecycle */);
- }
- };
-}
diff --git a/src/com/android/settings/location/LocationModeBatterySavingPreferenceController.java b/src/com/android/settings/location/LocationModeBatterySavingPreferenceController.java
deleted file mode 100644
index 70c7013..0000000
--- a/src/com/android/settings/location/LocationModeBatterySavingPreferenceController.java
+++ /dev/null
@@ -1,40 +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.Context;
-import android.provider.Settings;
-
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-public class LocationModeBatterySavingPreferenceController
- extends LocationModeRadioButtonPreferenceController {
-
- private static final String KEY_BATTERY_SAVING = "battery_saving";
-
- public LocationModeBatterySavingPreferenceController(Context context,
- Lifecycle lifecycle) {
- super(context, lifecycle);
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_BATTERY_SAVING;
- }
-
- @Override
- protected int getLocationMode() {
- return Settings.Secure.LOCATION_MODE_BATTERY_SAVING;
- }
-}
diff --git a/src/com/android/settings/location/LocationModeHighAccuracyPreferenceController.java b/src/com/android/settings/location/LocationModeHighAccuracyPreferenceController.java
deleted file mode 100644
index bd2d07e..0000000
--- a/src/com/android/settings/location/LocationModeHighAccuracyPreferenceController.java
+++ /dev/null
@@ -1,40 +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.Context;
-import android.provider.Settings;
-
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-public class LocationModeHighAccuracyPreferenceController
- extends LocationModeRadioButtonPreferenceController {
-
- private static final String KEY_HIGH_ACCURACY = "high_accuracy";
-
- public LocationModeHighAccuracyPreferenceController(Context context,
- Lifecycle lifecycle) {
- super(context, lifecycle);
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_HIGH_ACCURACY;
- }
-
- @Override
- protected int getLocationMode() {
- return Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
- }
-}
diff --git a/src/com/android/settings/location/LocationModePreferenceController.java b/src/com/android/settings/location/LocationModePreferenceController.java
deleted file mode 100644
index 265a9df..0000000
--- a/src/com/android/settings/location/LocationModePreferenceController.java
+++ /dev/null
@@ -1,76 +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.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-public class LocationModePreferenceController extends LocationBasePreferenceController {
-
- /** Key for preference screen "Mode" */
- private static final String KEY_LOCATION_MODE = "location_mode";
-
- private final LocationSettings mParentFragment;
- private Preference mPreference;
-
- public LocationModePreferenceController(Context context, LocationSettings parent,
- Lifecycle lifecycle) {
- super(context, lifecycle);
- mParentFragment = parent;
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_LOCATION_MODE;
- }
-
- @Override
- public boolean isAvailable() {
- return mContext.getResources().getBoolean(R.bool.config_location_mode_available);
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mPreference = screen.findPreference(KEY_LOCATION_MODE);
- }
-
- @Override
- public boolean handlePreferenceTreeClick(Preference preference) {
- if (KEY_LOCATION_MODE.equals(preference.getKey())) {
- final SettingsActivity activity = (SettingsActivity) mParentFragment.getActivity();
- activity.startPreferencePanel(mParentFragment, LocationMode.class.getName(), null,
- R.string.location_mode_screen_title, null, mParentFragment, 0);
- return true;
- }
- return false;
- }
-
- @Override
- public void onLocationModeChanged(int mode, boolean restricted) {
- final int modeDescription = LocationPreferenceController.getLocationString(mode);
- if (modeDescription != 0) {
- mPreference.setSummary(modeDescription);
- }
- // Restricted user can't change the location mode, so disable the master switch. But in some
- // corner cases, the location might still be enabled. In such case the master switch should
- // be disabled but checked.
- mPreference.setEnabled(mLocationEnabler.isEnabled(mode));
- }
-}
diff --git a/src/com/android/settings/location/LocationModeRadioButtonPreferenceController.java b/src/com/android/settings/location/LocationModeRadioButtonPreferenceController.java
deleted file mode 100644
index bdf7c8f..0000000
--- a/src/com/android/settings/location/LocationModeRadioButtonPreferenceController.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.location;
-
-import android.content.Context;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.widget.RadioButtonPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-public abstract class LocationModeRadioButtonPreferenceController
- extends LocationBasePreferenceController
- implements RadioButtonPreference.OnClickListener {
-
- protected RadioButtonPreference mPreference;
-
- public LocationModeRadioButtonPreferenceController(Context context, Lifecycle lifecycle) {
- super(context, lifecycle);
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mPreference = (RadioButtonPreference) screen.findPreference(getPreferenceKey());
- mPreference.setOnClickListener(this);
- }
-
- @Override
- public void onRadioButtonClicked(RadioButtonPreference emiter) {
- mLocationEnabler.setLocationMode(getLocationMode());
- }
-
- @Override
- public void onLocationModeChanged(int mode, boolean restricted) {
- mPreference.setChecked(mode == getLocationMode());
- mPreference.setEnabled(mLocationEnabler.isEnabled(mode));
- }
-
- /** Gets the location mode that this controller monitors. */
- protected abstract int getLocationMode();
-
-}
diff --git a/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceController.java b/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceController.java
deleted file mode 100644
index b79dbf2..0000000
--- a/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceController.java
+++ /dev/null
@@ -1,40 +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.Context;
-import android.provider.Settings;
-
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-public class LocationModeSensorsOnlyPreferenceController
- extends LocationModeRadioButtonPreferenceController {
-
- private static final String KEY_SENSORS_ONLY = "sensors_only";
-
- public LocationModeSensorsOnlyPreferenceController(Context context,
- Lifecycle lifecycle) {
- super(context, lifecycle);
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_SENSORS_ONLY;
- }
-
- @Override
- protected int getLocationMode() {
- return Settings.Secure.LOCATION_MODE_SENSORS_ONLY;
- }
-}
diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java
index 9b68848..5760ab7 100644
--- a/src/com/android/settings/location/LocationPreferenceController.java
+++ b/src/com/android/settings/location/LocationPreferenceController.java
@@ -105,26 +105,11 @@
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,
- context.getString(getLocationString(mode)));
+ return context.getString(R.string.location_on_summary);
}
return context.getString(R.string.location_off_summary);
}
- public static int getLocationString(int mode) {
- switch (mode) {
- case Secure.LOCATION_MODE_OFF:
- return R.string.location_mode_location_off_title;
- case Secure.LOCATION_MODE_SENSORS_ONLY:
- return R.string.location_mode_sensors_only_title;
- case Secure.LOCATION_MODE_BATTERY_SAVING:
- return R.string.location_mode_battery_saving_title;
- case Secure.LOCATION_MODE_HIGH_ACCURACY:
- return R.string.location_mode_high_accuracy_title;
- }
- return 0;
- }
-
@Override
public ResultPayload getResultPayload() {
final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationScanningPreferenceController.java
new file mode 100644
index 0000000..ec487e4
--- /dev/null
+++ b/src/com/android/settings/location/LocationScanningPreferenceController.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.content.Context;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.R;
+
+import android.support.annotation.VisibleForTesting;
+
+
+public class LocationScanningPreferenceController extends BasePreferenceController {
+
+ @VisibleForTesting static final String KEY_LOCATION_SCANNING = "location_scanning";
+
+ public LocationScanningPreferenceController(Context context) {
+ super(context, KEY_LOCATION_SCANNING);
+ }
+
+ @AvailabilityStatus
+ public int getAvailabilityStatus() {
+ return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
+ ? AVAILABLE
+ : DISABLED_UNSUPPORTED;
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 1279d67..3cc5b84 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -31,6 +31,7 @@
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
+import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.location.RecentLocationApps;
@@ -46,15 +47,8 @@
* <ul>
* <li>Platform location controls</li>
* <ul>
- * <li>In switch bar: location master switch. Used to toggle
- * {@link android.provider.Settings.Secure#LOCATION_MODE} between
- * {@link android.provider.Settings.Secure#LOCATION_MODE_OFF} and another location mode.
+ * <li>In switch bar: location master switch. Used to toggle location on and off.
* </li>
- * <li>Mode preference: only available if the master switch is on, selects between
- * {@link android.provider.Settings.Secure#LOCATION_MODE} of
- * {@link android.provider.Settings.Secure#LOCATION_MODE_HIGH_ACCURACY},
- * {@link android.provider.Settings.Secure#LOCATION_MODE_BATTERY_SAVING}, or
- * {@link android.provider.Settings.Secure#LOCATION_MODE_SENSORS_ONLY}.</li>
* </ul>
* <li>Recent location requests: automatically populated by {@link RecentLocationApps}</li>
* <li>Location services: multi-app settings provided from outside the Android framework. Each
@@ -91,8 +85,10 @@
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
final SettingsActivity activity = (SettingsActivity) getActivity();
- mSwitchBarController = new LocationSwitchBarController(
- activity, activity.getSwitchBar(), getLifecycle());
+ final SwitchBar switchBar = activity.getSwitchBar();
+ switchBar.setSwitchBarText(R.string.location_settings_master_switch_title,
+ R.string.location_settings_master_switch_title);
+ mSwitchBarController = new LocationSwitchBarController(activity, switchBar, getLifecycle());
}
@Override
@@ -131,13 +127,13 @@
private static List<AbstractPreferenceController> buildPreferenceControllers(
Context context, LocationSettings fragment, Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new LocationModePreferenceController(context, fragment, lifecycle));
controllers.add(new AppLocationPermissionPreferenceController(context));
controllers.add(new LocationForWorkPreferenceController(context, lifecycle));
controllers.add(
new RecentLocationRequestPreferenceController(context, fragment, lifecycle));
controllers.add(
new LocationServicePreferenceController(context, fragment, lifecycle));
+ controllers.add(new LocationScanningPreferenceController(context));
return controllers;
}
diff --git a/src/com/android/settings/location/LocationSwitchBarController.java b/src/com/android/settings/location/LocationSwitchBarController.java
index 6522dc7..ca1932f 100644
--- a/src/com/android/settings/location/LocationSwitchBarController.java
+++ b/src/com/android/settings/location/LocationSwitchBarController.java
@@ -96,9 +96,6 @@
*/
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
- mLocationEnabler.setLocationMode(isChecked
- ? android.provider.Settings.Secure.LOCATION_MODE_PREVIOUS
- : android.provider.Settings.Secure.LOCATION_MODE_OFF);
+ mLocationEnabler.setLocationEnabled(isChecked);
}
-
}
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index d86f7f7..0b77179 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -28,9 +28,10 @@
import com.android.internal.telephony.TelephonyProperties;
import com.android.settings.AirplaneModeEnabler;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -91,7 +92,8 @@
}
public static boolean isAvailable(Context context) {
- return !context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+ return context.getResources().getBoolean(R.bool.config_show_toggle_airplane)
+ && !context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);
}
@Override
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index 4b1da31..74c1910 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -31,13 +31,13 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
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;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.ArrayList;
diff --git a/src/com/android/settings/nfc/NfcForegroundPreference.java b/src/com/android/settings/nfc/NfcForegroundPreference.java
index f2d98bf..89095a4 100644
--- a/src/com/android/settings/nfc/NfcForegroundPreference.java
+++ b/src/com/android/settings/nfc/NfcForegroundPreference.java
@@ -17,18 +17,27 @@
import android.content.Context;
import android.support.v7.preference.DropDownPreference;
+import android.support.v7.preference.Preference;
import com.android.settings.R;
public class NfcForegroundPreference extends DropDownPreference implements
- PaymentBackend.Callback {
+ PaymentBackend.Callback, Preference.OnPreferenceChangeListener {
private final PaymentBackend mPaymentBackend;
public NfcForegroundPreference(Context context, PaymentBackend backend) {
super(context);
mPaymentBackend = backend;
mPaymentBackend.registerCallback(this);
+
+ setTitle(getContext().getString(R.string.nfc_payment_use_default));
+ setEntries(new CharSequence[] {
+ getContext().getString(R.string.nfc_payment_favor_open),
+ getContext().getString(R.string.nfc_payment_favor_default)
+ });
+ setEntryValues(new CharSequence[] { "1", "0" });
refresh();
+ setOnPreferenceChangeListener(this);
}
@Override
@@ -37,27 +46,20 @@
}
void refresh() {
- PaymentBackend.PaymentAppInfo defaultApp = mPaymentBackend.getDefaultApp();
boolean foregroundMode = mPaymentBackend.isForegroundMode();
- setPersistent(false);
- setTitle(getContext().getString(R.string.nfc_payment_use_default));
- CharSequence favorOpen;
- CharSequence favorDefault;
- setEntries(new CharSequence[] {
- getContext().getString(R.string.nfc_payment_favor_open),
- getContext().getString(R.string.nfc_payment_favor_default)
- });
- setEntryValues(new CharSequence[] { "1", "0" });
if (foregroundMode) {
setValue("1");
} else {
setValue("0");
}
+ setSummary(getEntry());
}
@Override
- protected boolean persistString(String value) {
- mPaymentBackend.setForegroundMode(Integer.parseInt(value) != 0);
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ String newValueString = (String) newValue;
+ setSummary(getEntries()[findIndexOfValue(newValueString)]);
+ mPaymentBackend.setForegroundMode(Integer.parseInt(newValueString) != 0);
return true;
}
}
diff --git a/src/com/android/settings/notification/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/AbstractZenModePreferenceController.java
index 33c027c..9180791 100644
--- a/src/com/android/settings/notification/AbstractZenModePreferenceController.java
+++ b/src/com/android/settings/notification/AbstractZenModePreferenceController.java
@@ -31,13 +31,12 @@
import android.service.notification.ZenModeConfig;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import android.util.Slog;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
+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.OnPause;
@@ -54,6 +53,7 @@
final private NotificationManager mNotificationManager;
protected static ZenModeConfigWrapper mZenModeConfigWrapper;
protected MetricsFeatureProvider mMetricsFeatureProvider;
+ protected final ZenModeBackend mBackend;
public AbstractZenModePreferenceController(Context context, String key,
Lifecycle lifecycle) {
@@ -68,6 +68,7 @@
final FeatureFactory featureFactory = FeatureFactory.getFactory(mContext);
mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();
+ mBackend = ZenModeBackend.getInstance(context);
}
@Override
@@ -90,6 +91,14 @@
}
}
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+
+ mBackend.updatePolicy();
+ mBackend.updateZenMode();
+ }
+
protected NotificationManager.Policy getPolicy() {
return mNotificationManager.getNotificationPolicy();
}
@@ -99,8 +108,8 @@
}
protected int getZenMode() {
- return Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.ZEN_MODE, 0);
+ return Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.ZEN_MODE,
+ mBackend.mZenMode);
}
class SettingObserver extends ContentObserver {
@@ -188,7 +197,6 @@
}
}
-
return endTimeMs;
}
diff --git a/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
index cd1f6e3..c9b283b 100644
--- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java
+++ b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
@@ -21,6 +21,7 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class AlarmVolumePreferenceController extends
@@ -43,7 +44,8 @@
@Override
public boolean isAvailable() {
- return !mHelper.isSingleVolume();
+ return mContext.getResources().getBoolean(R.bool.config_show_alarm_volume)
+ && !mHelper.isSingleVolume();
}
@Override
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index ef0f40b..333e060 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -176,15 +176,6 @@
} else {
groupCategory.setTitle(group.getName());
groupCategory.setKey(group.getId());
- Bundle groupArgs = new Bundle();
- groupArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
- groupArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
- groupArgs.putString(Settings.EXTRA_CHANNEL_GROUP_ID, group.getId());
- Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
- ChannelGroupNotificationSettings.class.getName(),
- groupArgs, null, R.string.notification_group_title,
- null, false, getMetricsCategory());
- groupCategory.setIntent(channelIntent);
populateGroupToggle(groupCategory, group);
}
diff --git a/src/com/android/settings/notification/ChargingSoundPreferenceController.java b/src/com/android/settings/notification/ChargingSoundPreferenceController.java
index 55cba96..e280177 100644
--- a/src/com/android/settings/notification/ChargingSoundPreferenceController.java
+++ b/src/com/android/settings/notification/ChargingSoundPreferenceController.java
@@ -21,6 +21,7 @@
import android.content.Context;
import android.provider.Settings.Global;
+import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -33,7 +34,10 @@
super(context, parent, lifecycle);
mPreference = new SettingPref(
TYPE_GLOBAL, KEY_CHARGING_SOUNDS, Global.CHARGING_SOUNDS_ENABLED, DEFAULT_ON);
-
}
+ @Override
+ public boolean isAvailable() {
+ return mContext.getResources().getBoolean(R.bool.config_show_charging_sounds);
+ }
}
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index 2533466..7cfa124 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -17,6 +17,8 @@
package com.android.settings.notification;
import android.app.Activity;
+import android.app.Application;
+import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -77,11 +79,18 @@
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
- return buildPreferenceControllers(context, getLifecycle());
+ final Activity activity = getActivity();
+ final Application app;
+ if (activity != null) {
+ app = activity.getApplication();
+ } else {
+ app = null;
+ }
+ return buildPreferenceControllers(context, getLifecycle(), app, this);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
- Lifecycle lifecycle) {
+ Lifecycle lifecycle, Application app, Fragment host) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
final BadgingNotificationPreferenceController badgeController =
new BadgingNotificationPreferenceController(context);
@@ -96,6 +105,8 @@
lifecycle.addObserver(pulseController);
lifecycle.addObserver(lockScreenNotificationController);
}
+ controllers.add(new RecentNotifyingAppsPreferenceController(
+ context, new NotificationBackend(), app, host));
controllers.add(new SwipeToNotificationPreferenceController(context, lifecycle,
KEY_SWIPE_DOWN));
controllers.add(badgeController);
@@ -167,7 +178,7 @@
@Override
public List<AbstractPreferenceController> getPreferenceControllers(
Context context) {
- return buildPreferenceControllers(context, null);
+ return buildPreferenceControllers(context, null, null, null);
}
@Override
diff --git a/src/com/android/settings/notification/EnableZenModeDialog.java b/src/com/android/settings/notification/EnableZenModeDialog.java
new file mode 100644
index 0000000..f683a21
--- /dev/null
+++ b/src/com/android/settings/notification/EnableZenModeDialog.java
@@ -0,0 +1,467 @@
+package com.android.settings.notification;
+
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import static android.util.Log.wtf;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.AlarmManager;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.service.notification.Condition;
+import android.service.notification.ZenModeConfig;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Objects;
+
+public class EnableZenModeDialog extends InstrumentedDialogFragment {
+
+ private static final String TAG = "EnableZenModeDialog";
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+ private static final int[] MINUTE_BUCKETS = ZenModeConfig.MINUTE_BUCKETS;
+ private static final int MIN_BUCKET_MINUTES = MINUTE_BUCKETS[0];
+ private static final int MAX_BUCKET_MINUTES = MINUTE_BUCKETS[MINUTE_BUCKETS.length - 1];
+ private static final int DEFAULT_BUCKET_INDEX = Arrays.binarySearch(MINUTE_BUCKETS, 60);
+
+ @VisibleForTesting
+ public static final int FOREVER_CONDITION_INDEX = 0;
+ @VisibleForTesting
+ public static final int COUNTDOWN_CONDITION_INDEX = 1;
+ @VisibleForTesting
+ public static final int COUNTDOWN_ALARM_CONDITION_INDEX = 2;
+ @VisibleForTesting
+ protected Activity mActivity;
+
+ private static final int SECONDS_MS = 1000;
+ private static final int MINUTES_MS = 60 * SECONDS_MS;
+
+ @VisibleForTesting
+ protected Uri mForeverId;
+ private int mBucketIndex = -1;
+
+ private AlarmManager mAlarmManager;
+ private int mUserId;
+ private boolean mAttached;
+
+ @VisibleForTesting
+ protected Context mContext;
+
+ private RadioGroup mZenRadioGroup;
+ @VisibleForTesting
+ protected LinearLayout mZenRadioGroupContent;
+ private int MAX_MANUAL_DND_OPTIONS = 3;
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ NotificationManager noMan = (NotificationManager) getContext().
+ getSystemService(Context.NOTIFICATION_SERVICE);
+ mContext = getContext();
+ mForeverId = Condition.newId(mContext).appendPath("forever").build();
+ mAlarmManager = (AlarmManager) getContext().getSystemService(Context.ALARM_SERVICE);
+ mUserId = mContext.getUserId();
+ mAttached = false;
+
+ final AlertDialog.Builder builder = new AlertDialog.Builder(getContext())
+ .setTitle(R.string.zen_mode_settings_turn_on_dialog_title)
+ .setNegativeButton(R.string.cancel, null)
+ .setPositiveButton(R.string.zen_mode_enable_dialog_turn_on,
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ int checkedId = mZenRadioGroup.getCheckedRadioButtonId();
+ ConditionTag tag = getConditionTagAt(checkedId);
+
+ if (isForever(tag.condition)) {
+ MetricsLogger.action(getContext(),
+ MetricsProto.MetricsEvent.
+ NOTIFICATION_ZEN_MODE_TOGGLE_ON_FOREVER);
+ } else if (isAlarm(tag.condition)) {
+ MetricsLogger.action(getContext(),
+ MetricsProto.MetricsEvent.
+ NOTIFICATION_ZEN_MODE_TOGGLE_ON_ALARM);
+ } else if (isCountdown(tag.condition)) {
+ MetricsLogger.action(getContext(),
+ MetricsProto.MetricsEvent.
+ NOTIFICATION_ZEN_MODE_TOGGLE_ON_COUNTDOWN);
+ } else {
+ wtf(TAG, "Invalid manual condition: " + tag.condition);
+ }
+ // always triggers priority-only dnd with chosen condition
+ noMan.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
+ getRealConditionId(tag.condition), TAG);
+ }
+ });
+
+ View contentView = getContentView();
+ bindConditions(forever());
+ builder.setView(contentView);
+ return builder.create();
+ }
+
+ private void hideAllConditions() {
+ final int N = mZenRadioGroupContent.getChildCount();
+ for (int i = 0; i < N; i++) {
+ mZenRadioGroupContent.getChildAt(i).setVisibility(View.GONE);
+ }
+ }
+
+ protected View getContentView() {
+ if (mActivity == null) {
+ mActivity = getActivity();
+ }
+ final LayoutInflater inflater = mActivity.getLayoutInflater();
+ View contentView = inflater.inflate(R.layout.zen_mode_turn_on_dialog_container, null);
+ ScrollView container = (ScrollView) contentView.findViewById(R.id.container);
+
+ mZenRadioGroup = container.findViewById(R.id.zen_radio_buttons);
+ mZenRadioGroupContent = container.findViewById(R.id.zen_radio_buttons_content);
+
+ for (int i = 0; i < MAX_MANUAL_DND_OPTIONS; i++) {
+ final View radioButton = inflater.inflate(R.layout.zen_mode_radio_button,
+ mZenRadioGroup, false);
+ mZenRadioGroup.addView(radioButton);
+ radioButton.setId(i);
+
+ final View radioButtonContent = inflater.inflate(R.layout.zen_mode_condition,
+ mZenRadioGroupContent, false);
+ radioButtonContent.setId(i + MAX_MANUAL_DND_OPTIONS);
+ mZenRadioGroupContent.addView(radioButtonContent);
+ }
+ hideAllConditions();
+ return contentView;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.NOTIFICATION_ZEN_MODE_ENABLE_DIALOG;
+ }
+
+ @VisibleForTesting
+ protected void bind(final Condition condition, final View row, final int rowId) {
+ if (condition == null) throw new IllegalArgumentException("condition must not be null");
+ final boolean enabled = condition.state == Condition.STATE_TRUE;
+ final ConditionTag tag = row.getTag() != null ? (ConditionTag) row.getTag() :
+ new ConditionTag();
+ row.setTag(tag);
+ final boolean first = tag.rb == null;
+ if (tag.rb == null) {
+ tag.rb = (RadioButton) mZenRadioGroup.getChildAt(rowId);
+ }
+ tag.condition = condition;
+ final Uri conditionId = getConditionId(tag.condition);
+ if (DEBUG) Log.d(TAG, "bind i=" + mZenRadioGroupContent.indexOfChild(row) + " first="
+ + first + " condition=" + conditionId);
+ tag.rb.setEnabled(enabled);
+ tag.rb.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (isChecked) {
+ tag.rb.setChecked(true);
+ if (DEBUG) Log.d(TAG, "onCheckedChanged " + conditionId);
+ MetricsLogger.action(mContext,
+ MetricsProto.MetricsEvent.QS_DND_CONDITION_SELECT);
+ announceConditionSelection(tag);
+ }
+ }
+ });
+
+ updateUi(tag, row, condition, enabled, rowId, conditionId);
+ row.setVisibility(View.VISIBLE);
+ }
+
+ @VisibleForTesting
+ protected ConditionTag getConditionTagAt(int index) {
+ return (ConditionTag) mZenRadioGroupContent.getChildAt(index).getTag();
+ }
+
+ @VisibleForTesting
+ protected void bindConditions(Condition c) {
+ // forever
+ bind(forever(), mZenRadioGroupContent.getChildAt(FOREVER_CONDITION_INDEX),
+ FOREVER_CONDITION_INDEX);
+ if (c == null) {
+ bindGenericCountdown();
+ bindNextAlarm(getTimeUntilNextAlarmCondition());
+ } else if (isForever(c)) {
+ getConditionTagAt(FOREVER_CONDITION_INDEX).rb.setChecked(true);
+ bindGenericCountdown();
+ bindNextAlarm(getTimeUntilNextAlarmCondition());
+ } else {
+ if (isAlarm(c)) {
+ bindGenericCountdown();
+ bindNextAlarm(c);
+ getConditionTagAt(COUNTDOWN_ALARM_CONDITION_INDEX).rb.setChecked(true);
+ } else if (isCountdown(c)) {
+ bindNextAlarm(getTimeUntilNextAlarmCondition());
+ bind(c, mZenRadioGroupContent.getChildAt(COUNTDOWN_CONDITION_INDEX),
+ COUNTDOWN_CONDITION_INDEX);
+ getConditionTagAt(COUNTDOWN_CONDITION_INDEX).rb.setChecked(true);
+ } else {
+ wtf(TAG, "Invalid manual condition: " + c);
+ }
+ }
+ }
+
+ public static Uri getConditionId(Condition condition) {
+ return condition != null ? condition.id : null;
+ }
+
+ public Condition forever() {
+ Uri foreverId = Condition.newId(mContext).appendPath("forever").build();
+ return new Condition(foreverId, foreverSummary(mContext), "", "", 0 /*icon*/,
+ Condition.STATE_TRUE, 0 /*flags*/);
+ }
+
+ public long getNextAlarm() {
+ final AlarmManager.AlarmClockInfo info = mAlarmManager.getNextAlarmClock(mUserId);
+ return info != null ? info.getTriggerTime() : 0;
+ }
+
+ @VisibleForTesting
+ protected boolean isAlarm(Condition c) {
+ return c != null && ZenModeConfig.isValidCountdownToAlarmConditionId(c.id);
+ }
+
+ @VisibleForTesting
+ protected boolean isCountdown(Condition c) {
+ return c != null && ZenModeConfig.isValidCountdownConditionId(c.id);
+ }
+
+ private boolean isForever(Condition c) {
+ return c != null && mForeverId.equals(c.id);
+ }
+
+ private Uri getRealConditionId(Condition condition) {
+ return isForever(condition) ? null : getConditionId(condition);
+ }
+
+ private String foreverSummary(Context context) {
+ return context.getString(com.android.internal.R.string.zen_mode_forever);
+ }
+
+ private static void setToMidnight(Calendar calendar) {
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.set(Calendar.MILLISECOND, 0);
+ }
+
+ // Returns a time condition if the next alarm is within the next week.
+ @VisibleForTesting
+ protected Condition getTimeUntilNextAlarmCondition() {
+ GregorianCalendar weekRange = new GregorianCalendar();
+ setToMidnight(weekRange);
+ weekRange.add(Calendar.DATE, 6);
+ final long nextAlarmMs = getNextAlarm();
+ if (nextAlarmMs > 0) {
+ GregorianCalendar nextAlarm = new GregorianCalendar();
+ nextAlarm.setTimeInMillis(nextAlarmMs);
+ setToMidnight(nextAlarm);
+
+ if (weekRange.compareTo(nextAlarm) >= 0) {
+ return ZenModeConfig.toNextAlarmCondition(mContext, nextAlarmMs,
+ ActivityManager.getCurrentUser());
+ }
+ }
+ return null;
+ }
+
+ @VisibleForTesting
+ protected void bindGenericCountdown() {
+ mBucketIndex = DEFAULT_BUCKET_INDEX;
+ Condition countdown = ZenModeConfig.toTimeCondition(mContext,
+ MINUTE_BUCKETS[mBucketIndex], ActivityManager.getCurrentUser());
+ if (!mAttached || getConditionTagAt(COUNTDOWN_CONDITION_INDEX).condition == null) {
+ bind(countdown, mZenRadioGroupContent.getChildAt(COUNTDOWN_CONDITION_INDEX),
+ COUNTDOWN_CONDITION_INDEX);
+ }
+ }
+
+ private void updateUi(ConditionTag tag, View row, Condition condition,
+ boolean enabled, int rowId, Uri conditionId) {
+ if (tag.lines == null) {
+ tag.lines = row.findViewById(android.R.id.content);
+ }
+ if (tag.line1 == null) {
+ tag.line1 = (TextView) row.findViewById(android.R.id.text1);
+ }
+
+ if (tag.line2 == null) {
+ tag.line2 = (TextView) row.findViewById(android.R.id.text2);
+ }
+
+ final String line1 = !TextUtils.isEmpty(condition.line1) ? condition.line1
+ : condition.summary;
+ final String line2 = condition.line2;
+ tag.line1.setText(line1);
+ if (TextUtils.isEmpty(line2)) {
+ tag.line2.setVisibility(View.GONE);
+ } else {
+ tag.line2.setVisibility(View.VISIBLE);
+ tag.line2.setText(line2);
+ }
+ tag.lines.setEnabled(enabled);
+ tag.lines.setAlpha(enabled ? 1 : .4f);
+
+ tag.lines.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ tag.rb.setChecked(true);
+ }
+ });
+
+ // minus button
+ final ImageView button1 = (ImageView) row.findViewById(android.R.id.button1);
+ button1.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ onClickTimeButton(row, tag, false /*down*/, rowId);
+ }
+ });
+
+ // plus button
+ final ImageView button2 = (ImageView) row.findViewById(android.R.id.button2);
+ button2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ onClickTimeButton(row, tag, true /*up*/, rowId);
+ }
+ });
+
+ final long time = ZenModeConfig.tryParseCountdownConditionId(conditionId);
+ if (rowId == COUNTDOWN_CONDITION_INDEX && time > 0) {
+ button1.setVisibility(View.VISIBLE);
+ button2.setVisibility(View.VISIBLE);
+ if (mBucketIndex > -1) {
+ button1.setEnabled(mBucketIndex > 0);
+ button2.setEnabled(mBucketIndex < MINUTE_BUCKETS.length - 1);
+ } else {
+ final long span = time - System.currentTimeMillis();
+ button1.setEnabled(span > MIN_BUCKET_MINUTES * MINUTES_MS);
+ final Condition maxCondition = ZenModeConfig.toTimeCondition(mContext,
+ MAX_BUCKET_MINUTES, ActivityManager.getCurrentUser());
+ button2.setEnabled(!Objects.equals(condition.summary, maxCondition.summary));
+ }
+
+ button1.setAlpha(button1.isEnabled() ? 1f : .5f);
+ button2.setAlpha(button2.isEnabled() ? 1f : .5f);
+ } else {
+ button1.setVisibility(View.GONE);
+ button2.setVisibility(View.GONE);
+ }
+ }
+
+ @VisibleForTesting
+ protected void bindNextAlarm(Condition c) {
+ View alarmContent = mZenRadioGroupContent.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX);
+ ConditionTag tag = (ConditionTag) alarmContent.getTag();
+
+ if (c != null && (!mAttached || tag == null || tag.condition == null)) {
+ bind(c, alarmContent, COUNTDOWN_ALARM_CONDITION_INDEX);
+ }
+
+ // hide the alarm radio button if there isn't a "next alarm condition"
+ tag = (ConditionTag) alarmContent.getTag();
+ boolean showAlarm = tag != null && tag.condition != null;
+ mZenRadioGroup.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(
+ showAlarm ? View.VISIBLE : View.GONE);
+ alarmContent.setVisibility(showAlarm ? View.VISIBLE : View.GONE);
+ }
+
+ private void onClickTimeButton(View row, ConditionTag tag, boolean up, int rowId) {
+ MetricsLogger.action(mContext, MetricsProto.MetricsEvent.QS_DND_TIME, up);
+ Condition newCondition = null;
+ final int N = MINUTE_BUCKETS.length;
+ if (mBucketIndex == -1) {
+ // not on a known index, search for the next or prev bucket by time
+ final Uri conditionId = getConditionId(tag.condition);
+ final long time = ZenModeConfig.tryParseCountdownConditionId(conditionId);
+ final long now = System.currentTimeMillis();
+ for (int i = 0; i < N; i++) {
+ int j = up ? i : N - 1 - i;
+ final int bucketMinutes = MINUTE_BUCKETS[j];
+ final long bucketTime = now + bucketMinutes * MINUTES_MS;
+ if (up && bucketTime > time || !up && bucketTime < time) {
+ mBucketIndex = j;
+ newCondition = ZenModeConfig.toTimeCondition(mContext,
+ bucketTime, bucketMinutes, ActivityManager.getCurrentUser(),
+ false /*shortVersion*/);
+ break;
+ }
+ }
+ if (newCondition == null) {
+ mBucketIndex = DEFAULT_BUCKET_INDEX;
+ newCondition = ZenModeConfig.toTimeCondition(mContext,
+ MINUTE_BUCKETS[mBucketIndex], ActivityManager.getCurrentUser());
+ }
+ } else {
+ // on a known index, simply increment or decrement
+ mBucketIndex = Math.max(0, Math.min(N - 1, mBucketIndex + (up ? 1 : -1)));
+ newCondition = ZenModeConfig.toTimeCondition(mContext,
+ MINUTE_BUCKETS[mBucketIndex], ActivityManager.getCurrentUser());
+ }
+ bind(newCondition, row, rowId);
+ tag.rb.setChecked(true);
+ announceConditionSelection(tag);
+ }
+
+ private void announceConditionSelection(ConditionTag tag) {
+ // condition will always be priority-only
+ String modeText = mContext.getString(R.string.zen_interruption_level_priority);
+ if (tag.line1 != null) {
+ mZenRadioGroupContent.announceForAccessibility(mContext.getString(
+ R.string.zen_mode_and_condition, modeText, tag.line1.getText()));
+ }
+ }
+
+ // used as the view tag on condition rows
+ @VisibleForTesting
+ protected static class ConditionTag {
+ public RadioButton rb;
+ public View lines;
+ public TextView line1;
+ public TextView line2;
+ public Condition condition;
+ }
+}
diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
index d56febb..bf821db 100644
--- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
@@ -34,6 +34,7 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
+import com.android.settings.RestrictedListPreference;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
@@ -55,8 +56,8 @@
private final String mWorkSettingCategoryKey;
private final String mWorkSettingKey;
- private RestrictedDropDownPreference mLockscreen;
- private RestrictedDropDownPreference mLockscreenProfile;
+ private RestrictedListPreference mLockscreen;
+ private RestrictedListPreference mLockscreenProfile;
private final int mProfileChallengeUserId;
private final boolean mSecure;
@@ -92,13 +93,13 @@
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mLockscreen =
- (RestrictedDropDownPreference) screen.findPreference(mSettingKey);
+ (RestrictedListPreference) screen.findPreference(mSettingKey);
if (mLockscreen == null) {
Log.i(TAG, "Preference not found: " + mSettingKey);
return;
}
if (mProfileChallengeUserId != UserHandle.USER_NULL) {
- mLockscreenProfile = (RestrictedDropDownPreference) screen.findPreference(
+ mLockscreenProfile = (RestrictedListPreference) screen.findPreference(
mWorkSettingKey);
} else {
setVisible(screen, mWorkSettingKey, false /* visible */);
@@ -180,11 +181,6 @@
entries.add(mContext.getString(R.string.lock_screen_notifications_summary_disable_profile));
values.add(Integer.toString(R.string.lock_screen_notifications_summary_disable_profile));
- mLockscreenProfile.setOnPreClickListener(
- (Preference p) -> Utils.startQuietModeDialogIfNecessary(mContext,
- UserManager.get(mContext), mProfileChallengeUserId)
- );
-
mLockscreenProfile.setEntries(entries.toArray(new CharSequence[entries.size()]));
mLockscreenProfile.setEntryValues(values.toArray(new CharSequence[values.size()]));
updateLockscreenNotificationsForProfile();
@@ -224,36 +220,40 @@
public boolean onPreferenceChange(Preference preference, Object newValue) {
final String key = preference.getKey();
if (TextUtils.equals(mWorkSettingKey, key)) {
- final int val = Integer.parseInt((String) newValue);
- if (val == mLockscreenSelectedValueProfile) {
- return false;
- }
- final boolean enabled =
- val != R.string.lock_screen_notifications_summary_disable_profile;
- final boolean show =
- val == R.string.lock_screen_notifications_summary_show_profile;
- Settings.Secure.putIntForUser(mContext.getContentResolver(),
- Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
- show ? 1 : 0, mProfileChallengeUserId);
- Settings.Secure.putIntForUser(mContext.getContentResolver(),
- Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS,
- enabled ? 1 : 0, mProfileChallengeUserId);
- mLockscreenSelectedValueProfile = val;
- return true;
+ if (Utils.startQuietModeDialogIfNecessary(mContext, UserManager.get(mContext),
+ mProfileChallengeUserId)) {
+ return false;
+ }
+ final int val = Integer.parseInt((String) newValue);
+ if (val == mLockscreenSelectedValueProfile) {
+ return false;
+ }
+ final boolean enabled =
+ val != R.string.lock_screen_notifications_summary_disable_profile;
+ final boolean show =
+ val == R.string.lock_screen_notifications_summary_show_profile;
+ Settings.Secure.putIntForUser(mContext.getContentResolver(),
+ Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+ show ? 1 : 0, mProfileChallengeUserId);
+ Settings.Secure.putIntForUser(mContext.getContentResolver(),
+ Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS,
+ enabled ? 1 : 0, mProfileChallengeUserId);
+ mLockscreenSelectedValueProfile = val;
+ return true;
} else if (TextUtils.equals(mSettingKey, key)) {
- final int val = Integer.parseInt((String) newValue);
- if (val == mLockscreenSelectedValue) {
- return false;
- }
- final boolean enabled =
- val != R.string.lock_screen_notifications_summary_disable;
- final boolean show = val == R.string.lock_screen_notifications_summary_show;
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, show ? 1 : 0);
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, enabled ? 1 : 0);
- mLockscreenSelectedValue = val;
- return true;
+ final int val = Integer.parseInt((String) newValue);
+ if (val == mLockscreenSelectedValue) {
+ return false;
+ }
+ final boolean enabled =
+ val != R.string.lock_screen_notifications_summary_disable;
+ final boolean show = val == R.string.lock_screen_notifications_summary_show;
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, show ? 1 : 0);
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, enabled ? 1 : 0);
+ mLockscreenSelectedValue = val;
+ return true;
}
return false;
}
@@ -264,8 +264,8 @@
RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
mContext, keyguardNotificationFeatures, UserHandle.myUserId());
if (admin != null && mLockscreen != null) {
- RestrictedDropDownPreference.RestrictedItem item =
- new RestrictedDropDownPreference.RestrictedItem(entry, entryValue, admin);
+ RestrictedListPreference.RestrictedItem item =
+ new RestrictedListPreference.RestrictedItem(entry, entryValue, admin);
mLockscreen.addRestrictedItem(item);
}
if (mProfileChallengeUserId != UserHandle.USER_NULL) {
@@ -273,8 +273,8 @@
RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
mContext, keyguardNotificationFeatures, mProfileChallengeUserId);
if (profileAdmin != null && mLockscreenProfile != null) {
- RestrictedDropDownPreference.RestrictedItem item =
- new RestrictedDropDownPreference.RestrictedItem(
+ RestrictedListPreference.RestrictedItem item =
+ new RestrictedListPreference.RestrictedItem(
entry, entryValue, profileAdmin);
mLockscreenProfile.addRestrictedItem(item);
}
diff --git a/src/com/android/settings/notification/MediaVolumePreferenceController.java b/src/com/android/settings/notification/MediaVolumePreferenceController.java
index 4f167f8..381135e 100644
--- a/src/com/android/settings/notification/MediaVolumePreferenceController.java
+++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.media.AudioManager;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class MediaVolumePreferenceController extends
@@ -32,7 +33,7 @@
@Override
public boolean isAvailable() {
- return true;
+ return mContext.getResources().getBoolean(R.bool.config_show_media_volume);
}
@Override
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 4de528e..e047efa 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -27,12 +27,16 @@
import android.graphics.drawable.Drawable;
import android.os.ServiceManager;
import android.os.UserHandle;
+import android.service.notification.NotifyingApp;
import android.util.IconDrawableFactory;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settingslib.Utils;
+import java.util.ArrayList;
+import java.util.List;
+
public class NotificationBackend {
private static final String TAG = "NotificationBackend";
@@ -185,7 +189,6 @@
}
}
-
public int getDeletedChannelCount(String pkg, int uid) {
try {
return sINM.getDeletedChannelCount(pkg, uid);
@@ -204,6 +207,15 @@
}
}
+ public List<NotifyingApp> getRecentApps() {
+ try {
+ return sINM.getRecentNotifyingAppsForUser(UserHandle.myUserId()).getList();
+ } catch (Exception e) {
+ Log.w(TAG, "Error calling NoMan", e);
+ return new ArrayList<>();
+ }
+ }
+
static class Row {
public String section;
}
diff --git a/src/com/android/settings/notification/NotificationRingtonePreferenceController.java b/src/com/android/settings/notification/NotificationRingtonePreferenceController.java
index 72e8d8f..00f478f 100644
--- a/src/com/android/settings/notification/NotificationRingtonePreferenceController.java
+++ b/src/com/android/settings/notification/NotificationRingtonePreferenceController.java
@@ -19,6 +19,8 @@
import android.content.Context;
import android.media.RingtoneManager;
+import com.android.settings.R;
+
public class NotificationRingtonePreferenceController extends RingtonePreferenceControllerBase {
private static final String KEY_NOTIFICATION_RINGTONE = "notification_ringtone";
@@ -28,6 +30,11 @@
}
@Override
+ public boolean isAvailable() {
+ return mContext.getResources().getBoolean(R.bool.config_show_notification_ringtone);
+ }
+
+ @Override
public String getPreferenceKey() {
return KEY_NOTIFICATION_RINGTONE;
}
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index 2a7e7d5..18b77bc 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -30,6 +30,7 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
+import com.android.settings.widget.MasterCheckBoxPreference;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settings.widget.SwitchBar;
import com.android.settings.wrapper.NotificationChannelGroupWrapper;
@@ -168,14 +169,7 @@
mChannel = (args != null && args.containsKey(Settings.EXTRA_CHANNEL_ID)) ?
mBackend.getChannel(mPkg, mUid, args.getString(Settings.EXTRA_CHANNEL_ID)) : null;
- NotificationChannelGroup group =
- (args != null && args.containsKey(Settings.EXTRA_CHANNEL_GROUP_ID))
- ? mBackend.getGroupWithChannels(mPkg, mUid,
- args.getString(Settings.EXTRA_CHANNEL_GROUP_ID))
- : null;
- if (group != null) {
- mChannelGroup = new NotificationChannelGroupWrapper(group);
- }
+ NotificationChannelGroup group = null;
mSuspendedAppsAdmin = RestrictedLockUtils.checkIfApplicationIsSuspended(
mContext, mPkg, mUserId);
@@ -284,9 +278,9 @@
protected Preference populateSingleChannelPrefs(PreferenceGroup parent,
final NotificationChannel channel, final boolean groupBlocked) {
- MasterSwitchPreference channelPref = new MasterSwitchPreference(
+ MasterCheckBoxPreference channelPref = new MasterCheckBoxPreference(
getPrefContext());
- channelPref.setSwitchEnabled(mSuspendedAppsAdmin == null
+ channelPref.setCheckBoxEnabled(mSuspendedAppsAdmin == null
&& isChannelBlockable(channel)
&& isChannelConfigurable(channel)
&& !groupBlocked);
diff --git a/src/com/android/settings/notification/NotificationVolumePreferenceController.java b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
index 5f888f8..4024f9f 100644
--- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java
+++ b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
@@ -20,6 +20,7 @@
import android.media.AudioManager;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -45,7 +46,8 @@
@Override
public boolean isAvailable() {
- return !Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume();
+ return mContext.getResources().getBoolean(R.bool.config_show_notification_volume)
+ && !Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume();
}
@Override
diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
new file mode 100644
index 0000000..dbffc55
--- /dev/null
+++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Application;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+import android.service.notification.NotifyingApp;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+import android.util.ArraySet;
+import android.util.IconDrawableFactory;
+import android.util.Log;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.applications.InstalledAppCounter;
+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.wrapper.PackageManagerWrapper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 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".
+ */
+public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceController
+ implements PreferenceControllerMixin {
+
+ private static final String TAG = "RecentNotisCtrl";
+ private static final String KEY_PREF_CATEGORY = "recent_notifications_category";
+ @VisibleForTesting
+ static final String KEY_DIVIDER = "all_notifications_divider";
+ @VisibleForTesting
+ static final String KEY_SEE_ALL = "all_notifications";
+ private static final int SHOW_RECENT_APP_COUNT = 5;
+ private static final Set<String> SKIP_SYSTEM_PACKAGES = new ArraySet<>();
+
+ private final Fragment mHost;
+ private final PackageManager mPm;
+ private final NotificationBackend mNotificationBackend;
+ private final int mUserId;
+ private final IconDrawableFactory mIconDrawableFactory;
+
+ private List<NotifyingApp> mApps;
+ private final ApplicationsState mApplicationsState;
+
+ private PreferenceCategory mCategory;
+ private Preference mSeeAllPref;
+ private Preference mDivider;
+ private boolean mHasRecentApps;
+
+ 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);
+ }
+
+ @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+ RecentNotifyingAppsPreferenceController(Context context, NotificationBackend backend,
+ ApplicationsState appState, Fragment host) {
+ super(context);
+ mIconDrawableFactory = IconDrawableFactory.newInstance(context);
+ mUserId = UserHandle.myUserId();
+ mPm = context.getPackageManager();
+ mHost = host;
+ mApplicationsState = appState;
+ mNotificationBackend = backend;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_PREF_CATEGORY;
+ }
+
+ @Override
+ public void updateNonIndexableKeys(List<String> keys) {
+ PreferenceControllerMixin.super.updateNonIndexableKeys(keys);
+ // Don't index category name into search. It's not actionable.
+ keys.add(KEY_PREF_CATEGORY);
+ keys.add(KEY_DIVIDER);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ mCategory = (PreferenceCategory) screen.findPreference(getPreferenceKey());
+ mSeeAllPref = screen.findPreference(KEY_SEE_ALL);
+ mDivider = screen.findPreference(KEY_DIVIDER);
+ super.displayPreference(screen);
+ refreshUi(mCategory.getContext());
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ refreshUi(mCategory.getContext());
+ // Show total number of installed apps as See all's summary.
+ new InstalledAppCounter(mContext, InstalledAppCounter.IGNORE_INSTALL_REASON,
+ new PackageManagerWrapper(mContext.getPackageManager())) {
+ @Override
+ protected void onCountComplete(int num) {
+ if (mHasRecentApps) {
+ mSeeAllPref.setTitle(mContext.getString(R.string.see_all_apps_title, num));
+ } else {
+ mSeeAllPref.setSummary(mContext.getString(R.string.apps_summary, num));
+ }
+ }
+ }.execute();
+
+ }
+
+ @VisibleForTesting
+ void refreshUi(Context prefContext) {
+ reloadData();
+ final List<NotifyingApp> recentApps = getDisplayableRecentAppList();
+ if (recentApps != null && !recentApps.isEmpty()) {
+ mHasRecentApps = true;
+ displayRecentApps(prefContext, recentApps);
+ } else {
+ mHasRecentApps = false;
+ displayOnlyAllAppsLink();
+ }
+ }
+
+ @VisibleForTesting
+ void reloadData() {
+ mApps = mNotificationBackend.getRecentApps();
+ }
+
+ private void displayOnlyAllAppsLink() {
+ mCategory.setTitle(null);
+ mDivider.setVisible(false);
+ mSeeAllPref.setTitle(R.string.notifications_title);
+ mSeeAllPref.setIcon(null);
+ int prefCount = mCategory.getPreferenceCount();
+ for (int i = prefCount - 1; i >= 0; i--) {
+ final Preference pref = mCategory.getPreference(i);
+ if (!TextUtils.equals(pref.getKey(), KEY_SEE_ALL)) {
+ mCategory.removePreference(pref);
+ }
+ }
+ }
+
+ private void displayRecentApps(Context prefContext, List<NotifyingApp> recentApps) {
+ mCategory.setTitle(R.string.recent_notifications);
+ mDivider.setVisible(true);
+ mSeeAllPref.setSummary(null);
+ mSeeAllPref.setIcon(R.drawable.ic_chevron_right_24dp);
+
+ // Rebind prefs/avoid adding new prefs if possible. Adding/removing prefs causes jank.
+ // Build a cached preference pool
+ final Map<String, Preference> appPreferences = new ArrayMap<>();
+ int prefCount = mCategory.getPreferenceCount();
+ for (int i = 0; i < prefCount; i++) {
+ final Preference pref = mCategory.getPreference(i);
+ final String key = pref.getKey();
+ if (!TextUtils.equals(key, KEY_SEE_ALL)) {
+ appPreferences.put(key, pref);
+ }
+ }
+ final int recentAppsCount = recentApps.size();
+ for (int i = 0; i < recentAppsCount; i++) {
+ final NotifyingApp app = recentApps.get(i);
+ // Bind recent apps to existing prefs if possible, or create a new pref.
+ final String pkgName = app.getPackage();
+ final ApplicationsState.AppEntry appEntry =
+ mApplicationsState.getEntry(app.getPackage(), mUserId);
+ if (appEntry == null) {
+ continue;
+ }
+
+ boolean rebindPref = true;
+ Preference pref = appPreferences.remove(pkgName);
+ if (pref == null) {
+ pref = new AppPreference(prefContext);
+ rebindPref = false;
+ }
+ pref.setKey(pkgName);
+ pref.setTitle(appEntry.label);
+ pref.setIcon(mIconDrawableFactory.getBadgedIcon(appEntry.info));
+ pref.setSummary(Utils.formatRelativeTime(mContext,
+ System.currentTimeMillis() - app.getLastNotified(), false));
+ pref.setOrder(i);
+ pref.setOnPreferenceClickListener(preference -> {
+ AppInfoBase.startAppInfoFragment(AppNotificationSettings.class,
+ R.string.notifications_title, pkgName, appEntry.info.uid, mHost,
+ 1001 /*RequestCode */,
+ MetricsProto.MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS);
+ return true;
+ });
+ if (!rebindPref) {
+ mCategory.addPreference(pref);
+ }
+ }
+ // Remove unused prefs from pref cache pool
+ for (Preference unusedPrefs : appPreferences.values()) {
+ mCategory.removePreference(unusedPrefs);
+ }
+ }
+
+ private List<NotifyingApp> getDisplayableRecentAppList() {
+ Collections.sort(mApps);
+ List<NotifyingApp> displayableApps = new ArrayList<>(SHOW_RECENT_APP_COUNT);
+ int count = 0;
+ for (NotifyingApp app : mApps) {
+ final ApplicationsState.AppEntry appEntry = mApplicationsState.getEntry(
+ app.getPackage(), mUserId);
+ if (appEntry == null) {
+ continue;
+ }
+ if (!shouldIncludePkgInRecents(app.getPackage())) {
+ continue;
+ }
+ displayableApps.add(app);
+ count++;
+ if (count >= SHOW_RECENT_APP_COUNT) {
+ break;
+ }
+ }
+ return displayableApps;
+ }
+
+
+ /**
+ * 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);
+
+ if (mPm.resolveActivity(launchIntent, 0) == null) {
+ // Not visible on launcher -> likely not a user visible app, skip if non-instant.
+ final ApplicationsState.AppEntry appEntry =
+ mApplicationsState.getEntry(pkgName, mUserId);
+ if (appEntry == null || appEntry.info == null || !AppUtils.isInstant(appEntry.info)) {
+ Log.d(TAG, "Not a user visible or instant app, skipping " + pkgName);
+ return false;
+ }
+ }
+ return true;
+ }
+}
diff --git a/src/com/android/settings/notification/RestrictedDropDownPreference.java b/src/com/android/settings/notification/RestrictedDropDownPreference.java
deleted file mode 100644
index d19cf8d..0000000
--- a/src/com/android/settings/notification/RestrictedDropDownPreference.java
+++ /dev/null
@@ -1,262 +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.notification;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.support.v7.preference.DropDownPreference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.RestrictedPreferenceHelper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RestrictedDropDownPreference extends DropDownPreference {
- private final RestrictedPreferenceHelper mHelper;
- private ReselectionSpinner mSpinner;
- private List<RestrictedItem> mRestrictedItems = new ArrayList<>();
- private boolean mUserClicked = false;
- private OnPreferenceClickListener mPreClickListener;
-
- public RestrictedDropDownPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- setLayoutResource(R.layout.restricted_preference_dropdown);
- setWidgetLayoutResource(R.layout.restricted_icon);
- mHelper = new RestrictedPreferenceHelper(context, this, attrs);
- }
-
- @Override
- protected ArrayAdapter createAdapter() {
- return new RestrictedArrayItemAdapter(getContext());
- }
-
- @Override
- public void setValue(String value) {
- if (getRestrictedItemForEntryValue(value) != null) {
- return;
- }
- super.setValue(value);
- }
-
- @Override
- public void onBindViewHolder(PreferenceViewHolder view) {
- mSpinner = (ReselectionSpinner) view.itemView.findViewById(R.id.spinner);
- mSpinner.setPreference(this);
- super.onBindViewHolder(view);
- mHelper.onBindViewHolder(view);
- mSpinner.setOnItemSelectedListener(mItemSelectedListener);
- final View restrictedIcon = view.findViewById(R.id.restricted_icon);
- if (restrictedIcon != null) {
- restrictedIcon.setVisibility(isDisabledByAdmin() ? View.VISIBLE : View.GONE);
- }
- }
-
- private boolean isRestrictedForEntry(CharSequence entry) {
- if (entry == null) {
- return false;
- }
- for (RestrictedItem item : mRestrictedItems) {
- if (entry.equals(item.entry)) {
- return true;
- }
- }
- return false;
- }
-
- private RestrictedItem getRestrictedItemForEntryValue(CharSequence entryValue) {
- if (entryValue == null) {
- return null;
- }
- for (RestrictedItem item : mRestrictedItems) {
- if (entryValue.equals(item.entryValue)) {
- return item;
- }
- }
- return null;
- }
-
- private RestrictedItem getRestrictedItemForPosition(int position) {
- if (position < 0 || position >= getEntryValues().length) {
- return null;
- }
- CharSequence entryValue = getEntryValues()[position];
- return getRestrictedItemForEntryValue(entryValue);
- }
-
- public void addRestrictedItem(RestrictedItem item) {
- mRestrictedItems.add(item);
- }
-
- public void clearRestrictedItems() {
- mRestrictedItems.clear();
- }
-
- @Override
- public void performClick() {
- if (mPreClickListener != null && mPreClickListener.onPreferenceClick(this)) {
- return;
- }
- if (!mHelper.performClick()) {
- mUserClicked = true;
- super.performClick();
- }
- }
-
- @Override
- public void setEnabled(boolean enabled) {
- if (enabled && isDisabledByAdmin()) {
- mHelper.setDisabledByAdmin(null);
- return;
- }
- super.setEnabled(enabled);
- }
-
- public void setDisabledByAdmin(EnforcedAdmin admin) {
- if (mHelper.setDisabledByAdmin(admin)) {
- notifyChanged();
- }
- }
-
- /**
- * Similar to {@link #setOnPreferenceClickListener(OnPreferenceClickListener)}, but can
- * preempt {@link #onClick()}.
- */
- public void setOnPreClickListener(OnPreferenceClickListener l) {
- mPreClickListener = l;
- }
-
- public boolean isDisabledByAdmin() {
- return mHelper.isDisabledByAdmin();
- }
-
- private void setUserClicked(boolean userClicked) {
- mUserClicked = userClicked;
- }
-
- private boolean isUserClicked() {
- return mUserClicked;
- }
-
- private final OnItemSelectedListener mItemSelectedListener = new OnItemSelectedListener() {
- @Override
- public void onItemSelected(AdapterView<?> parent, View v, int position, long id) {
- if (mUserClicked) {
- mUserClicked = false;
- } else {
- return;
- }
- if (position >= 0 && position < getEntryValues().length) {
- String value = getEntryValues()[position].toString();
- RestrictedItem item = getRestrictedItemForEntryValue(value);
- if (item != null) {
- RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
- item.enforcedAdmin);
- mSpinner.setSelection(findIndexOfValue(getValue()));
- } else if (!value.equals(getValue()) && callChangeListener(value)) {
- setValue(value);
- }
- }
- }
-
- @Override
- public void onNothingSelected(AdapterView<?> parent) {
- // noop
- }
- };
-
- /**
- * Extension of {@link ArrayAdapter} which updates the state of the dropdown item
- * depending on whether it is restricted by the admin.
- */
- private class RestrictedArrayItemAdapter extends ArrayAdapter<String> {
- private static final int TEXT_RES_ID = android.R.id.text1;
- public RestrictedArrayItemAdapter(Context context) {
- super(context, R.layout.spinner_dropdown_restricted_item, TEXT_RES_ID);
- }
-
- @Override
- public View getDropDownView(int position, View convertView, ViewGroup parent) {
- View rootView = super.getView(position, convertView, parent);
- CharSequence entry = getItem(position);
- boolean isEntryRestricted = isRestrictedForEntry(entry);
- TextView text = (TextView) rootView.findViewById(TEXT_RES_ID);
- if (text != null) {
- text.setEnabled(!isEntryRestricted);
- }
- View restrictedIcon = rootView.findViewById(R.id.restricted_icon);
- if (restrictedIcon != null) {
- restrictedIcon.setVisibility(isEntryRestricted ? View.VISIBLE : View.GONE);
- }
- return rootView;
- }
- }
-
- /**
- * Extension of {@link Spinner} which triggers the admin support dialog on user clicking a
- * restricted item even if was already selected.
- */
- public static class ReselectionSpinner extends Spinner {
- private RestrictedDropDownPreference pref;
-
- public ReselectionSpinner(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public void setPreference(RestrictedDropDownPreference pref) {
- this.pref = pref;
- }
-
- @Override
- public void setSelection(int position) {
- int previousSelectedPosition = getSelectedItemPosition();
- super.setSelection(position);
- if (position == previousSelectedPosition && pref.isUserClicked()) {
- pref.setUserClicked(false);
- RestrictedItem item = pref.getRestrictedItemForPosition(position);
- if (item != null) {
- RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
- item.enforcedAdmin);
- }
- }
- }
- }
-
- public static class RestrictedItem {
- public final CharSequence entry;
- public final CharSequence entryValue;
- public final EnforcedAdmin enforcedAdmin;
-
- public RestrictedItem(CharSequence entry, CharSequence entryValue,
- EnforcedAdmin enforcedAdmin) {
- this.entry = entry;
- this.entryValue = entryValue;
- this.enforcedAdmin = enforcedAdmin;
- }
- }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
index b08b8f8..11aaa92 100644
--- a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
+++ b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
@@ -21,6 +21,7 @@
import android.content.Context;
import android.provider.Settings.System;
+import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -35,4 +36,8 @@
TYPE_SYSTEM, KEY_SCREEN_LOCKING_SOUNDS, System.LOCKSCREEN_SOUNDS_ENABLED, DEFAULT_ON);
}
+ @Override
+ public boolean isAvailable() {
+ return mContext.getResources().getBoolean(R.bool.config_show_screen_locking_sounds);
+ }
}
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 6e998f6..132dea6 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -33,6 +33,7 @@
import com.android.settings.RingtonePreference;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.PreferenceCategoryController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,7 +44,6 @@
public class SoundSettings extends DashboardFragment {
private static final String TAG = "SoundSettings";
- private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
private static final String SELECTED_PREFERENCE_KEY = "selected_preference";
private static final int REQUEST_CODE = 200;
@@ -181,8 +181,6 @@
Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new ZenModePreferenceController(context));
- controllers.add(new EmergencyBroadcastPreferenceController(
- context, KEY_CELL_BROADCAST_SETTINGS));
controllers.add(new VibrateWhenRingPreferenceController(context));
// === Volumes ===
@@ -201,15 +199,45 @@
controllers.add(new WorkSoundPreferenceController(context, fragment, lifecycle));
// === Other Sound Settings ===
- controllers.add(new DialPadTonePreferenceController(context, fragment, lifecycle));
- controllers.add(new ScreenLockSoundPreferenceController(context, fragment, lifecycle));
- controllers.add(new ChargingSoundPreferenceController(context, fragment, lifecycle));
- controllers.add(new DockingSoundPreferenceController(context, fragment, lifecycle));
- controllers.add(new TouchSoundPreferenceController(context, fragment, lifecycle));
- controllers.add(new VibrateOnTouchPreferenceController(context, fragment, lifecycle));
- controllers.add(new DockAudioMediaPreferenceController(context, fragment, lifecycle));
- controllers.add(new BootSoundPreferenceController(context));
- controllers.add(new EmergencyTonePreferenceController(context, fragment, lifecycle));
+ final DialPadTonePreferenceController dialPadTonePreferenceController =
+ new DialPadTonePreferenceController(context, fragment, lifecycle);
+ final ScreenLockSoundPreferenceController screenLockSoundPreferenceController =
+ new ScreenLockSoundPreferenceController(context, fragment, lifecycle);
+ final ChargingSoundPreferenceController chargingSoundPreferenceController =
+ new ChargingSoundPreferenceController(context, fragment, lifecycle);
+ final DockingSoundPreferenceController dockingSoundPreferenceController =
+ new DockingSoundPreferenceController(context, fragment, lifecycle);
+ final TouchSoundPreferenceController touchSoundPreferenceController =
+ new TouchSoundPreferenceController(context, fragment, lifecycle);
+ final VibrateOnTouchPreferenceController vibrateOnTouchPreferenceController =
+ new VibrateOnTouchPreferenceController(context, fragment, lifecycle);
+ final DockAudioMediaPreferenceController dockAudioMediaPreferenceController =
+ new DockAudioMediaPreferenceController(context, fragment, lifecycle);
+ final BootSoundPreferenceController bootSoundPreferenceController =
+ new BootSoundPreferenceController(context);
+ final EmergencyTonePreferenceController emergencyTonePreferenceController =
+ new EmergencyTonePreferenceController(context, fragment, lifecycle);
+
+ controllers.add(dialPadTonePreferenceController);
+ controllers.add(screenLockSoundPreferenceController);
+ controllers.add(chargingSoundPreferenceController);
+ controllers.add(dockingSoundPreferenceController);
+ controllers.add(touchSoundPreferenceController);
+ controllers.add(vibrateOnTouchPreferenceController);
+ controllers.add(dockAudioMediaPreferenceController);
+ controllers.add(bootSoundPreferenceController);
+ controllers.add(emergencyTonePreferenceController);
+ controllers.add(new PreferenceCategoryController(context,
+ "other_sounds_and_vibrations_category",
+ Arrays.asList(dialPadTonePreferenceController,
+ screenLockSoundPreferenceController,
+ chargingSoundPreferenceController,
+ dockingSoundPreferenceController,
+ touchSoundPreferenceController,
+ vibrateOnTouchPreferenceController,
+ dockAudioMediaPreferenceController,
+ bootSoundPreferenceController,
+ emergencyTonePreferenceController)));
return controllers;
}
@@ -237,7 +265,6 @@
List<String> keys = super.getNonIndexableKeys(context);
// Duplicate results
keys.add((new ZenModePreferenceController(context)).getPreferenceKey());
- keys.add(KEY_CELL_BROADCAST_SETTINGS);
return keys;
}
};
diff --git a/src/com/android/settings/notification/TouchSoundPreferenceController.java b/src/com/android/settings/notification/TouchSoundPreferenceController.java
index 4e25507..20c9cee0 100644
--- a/src/com/android/settings/notification/TouchSoundPreferenceController.java
+++ b/src/com/android/settings/notification/TouchSoundPreferenceController.java
@@ -23,6 +23,7 @@
import android.media.AudioManager;
import android.os.AsyncTask;
import android.provider.Settings.System;
+import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -53,4 +54,9 @@
}
};
}
+
+ @Override
+ public boolean isAvailable() {
+ return mContext.getResources().getBoolean(R.bool.config_show_touch_sounds);
+ }
}
diff --git a/src/com/android/settings/notification/VisibilityPreferenceController.java b/src/com/android/settings/notification/VisibilityPreferenceController.java
index 76caac0..62ca183 100644
--- a/src/com/android/settings/notification/VisibilityPreferenceController.java
+++ b/src/com/android/settings/notification/VisibilityPreferenceController.java
@@ -29,6 +29,7 @@
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;
@@ -65,7 +66,7 @@
public void updateState(Preference preference) {
if (mChannel != null && mAppRow != null) {
- RestrictedDropDownPreference pref = (RestrictedDropDownPreference) preference;
+ RestrictedListPreference pref = (RestrictedListPreference) preference;
ArrayList<CharSequence> entries = new ArrayList<>();
ArrayList<CharSequence> values = new ArrayList<>();
@@ -120,14 +121,14 @@
return true;
}
- private void setRestrictedIfNotificationFeaturesDisabled(RestrictedDropDownPreference pref,
+ private void setRestrictedIfNotificationFeaturesDisabled(RestrictedListPreference pref,
CharSequence entry, CharSequence entryValue, int keyguardNotificationFeatures) {
RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
mContext, keyguardNotificationFeatures, mAppRow.userId);
if (admin != null) {
- RestrictedDropDownPreference.RestrictedItem item =
- new RestrictedDropDownPreference.RestrictedItem(entry, entryValue, admin);
+ RestrictedListPreference.RestrictedItem item =
+ new RestrictedListPreference.RestrictedItem(entry, entryValue, admin);
pref.addRestrictedItem(item);
}
}
diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java
index d92bc5a..ec378f3 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/ZenAccessSettings.java
@@ -137,6 +137,7 @@
final String pkg = app.packageName;
final CharSequence label = app.loadLabel(mPkgMan);
final SwitchPreference pref = new AppSwitchPreference(getPrefContext());
+ pref.setKey(pkg);
pref.setPersistent(false);
pref.setIcon(app.loadIcon(mPkgMan));
pref.setTitle(label);
diff --git a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java
index 8494998..39cbf5d 100644
--- a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java
+++ b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java
@@ -19,6 +19,7 @@
import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER;
import android.app.AutomaticZenRule;
+import android.app.Fragment;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
@@ -28,6 +29,7 @@
import android.util.Slog;
import android.view.View;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.PreferenceControllerMixin;
@@ -40,6 +42,7 @@
private final String KEY = PREF_KEY_APP_HEADER;
private final PreferenceFragment mFragment;
private AutomaticZenRule mRule;
+ private String mId;
private EntityHeaderController mController;
public ZenAutomaticRuleHeaderPreferenceController(Context context, PreferenceFragment fragment,
@@ -70,6 +73,14 @@
mController = EntityHeaderController
.newInstance(mFragment.getActivity(), mFragment,
pref.findViewById(R.id.entity_header));
+
+ mController.setEditZenRuleNameListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ ZenRuleNameDialog.show(mFragment, mRule.getName(), null,
+ new RuleNameChangeListener());
+ }
+ });
}
pref = mController.setIcon(getIcon())
@@ -77,7 +88,7 @@
.setPackageName(mRule.getOwner().getPackageName())
.setUid(mContext.getUserId())
.setHasAppInfoLink(false)
- .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
+ .setButtonActions(EntityHeaderController.ActionType.ACTION_DND_RULE_PREFERENCE,
EntityHeaderController.ActionType.ACTION_NONE)
.done(mFragment.getActivity(), mContext);
@@ -98,7 +109,20 @@
return null;
}
- protected void onResume(AutomaticZenRule rule) {
+ protected void onResume(AutomaticZenRule rule, String id) {
mRule = rule;
+ mId = id;
+ }
+
+ public class RuleNameChangeListener implements ZenRuleNameDialog.PositiveClickListener {
+ public RuleNameChangeListener() {}
+
+ @Override
+ public void onOk(String ruleName, Fragment parent) {
+ mMetricsFeatureProvider.action(mContext,
+ MetricsProto.MetricsEvent.ACTION_ZEN_MODE_RULE_NAME_CHANGE_OK);
+ mRule.setName(ruleName);
+ mBackend.setZenRule(mId, mRule);
+ }
}
}
diff --git a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java
index bc3fa25..a684d3e 100644
--- a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java
+++ b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java
@@ -20,6 +20,7 @@
import android.app.Fragment;
import android.content.Context;
import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
import android.widget.Switch;
import android.widget.Toast;
@@ -37,6 +38,7 @@
private String mId;
private Toast mEnabledToast;
private int mToastTextResource;
+ private SwitchBar mSwitchBar;
public ZenAutomaticRuleSwitchPreferenceController(Context context, Fragment parent,
int toastTextResource, Lifecycle lifecycle) {
@@ -54,26 +56,34 @@
return mRule != null && mId != null;
}
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ LayoutPreference pref = (LayoutPreference) screen.findPreference(KEY);
+ mSwitchBar = pref.findViewById(R.id.switch_bar);
+
+ if (mSwitchBar != null) {
+ mSwitchBar.setSwitchBarText(R.string.zen_mode_use_automatic_rule,
+ R.string.zen_mode_use_automatic_rule);
+ try {
+ mSwitchBar.addOnSwitchChangeListener(this);
+ } catch (IllegalStateException e) {
+ // an exception is thrown if you try to add the listener twice
+ }
+ mSwitchBar.show();
+ }
+ }
+
+
public void onResume(AutomaticZenRule rule, String id) {
mRule = rule;
mId = id;
}
public void updateState(Preference preference) {
- LayoutPreference pref = (LayoutPreference) preference;
- SwitchBar bar = pref.findViewById(R.id.switch_bar);
if (mRule != null) {
- bar.setChecked(mRule.isEnabled());
+ mSwitchBar.setChecked(mRule.isEnabled());
}
- if (bar != null) {
- bar.show();
- try {
- bar.addOnSwitchChangeListener(this);
- } catch (IllegalStateException e) {
- // an exception is thrown if you try to add the listener twice
- }
- }
- bar.show();
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
index a15f7fc..af59107 100644
--- a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
@@ -30,11 +30,9 @@
AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
protected static final String KEY = "zen_mode_alarms";
- private final ZenModeBackend mBackend;
public ZenModeAlarmsPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/ZenModeBackend.java
index 945da0b..e8f103e 100644
--- a/src/com/android/settings/notification/ZenModeBackend.java
+++ b/src/com/android/settings/notification/ZenModeBackend.java
@@ -82,7 +82,6 @@
mZenMode = zenMode;
}
- /** gets last zen mode set by setZenMode or updateZenMode **/
protected int getZenMode() {
mZenMode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ZEN_MODE, mZenMode);
@@ -104,11 +103,18 @@
}
protected int getPriorityCallSenders() {
- return mPolicy.priorityCallSenders;
+ if (isPriorityCategoryEnabled(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS)) {
+ return mPolicy.priorityCallSenders;
+ }
+
+ return SOURCE_NONE;
}
protected int getPriorityMessageSenders() {
- return mPolicy.priorityMessageSenders;
+ if (isPriorityCategoryEnabled(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES)) {
+ return mPolicy.priorityMessageSenders;
+ }
+ return SOURCE_NONE;
}
protected void saveVisualEffectsPolicy(int category, boolean canBypass) {
@@ -167,8 +173,8 @@
savePolicy(getNewPriorityCategories(allowSenders, category),
priorityCallSenders, priorityMessagesSenders, mPolicy.suppressedVisualEffects);
- if (ZenModeSettingsBase.DEBUG) Log.d(TAG, "onPrefChange allow=" +
- stringCategory + allowSenders + " allow" + stringCategory + "From="
+ if (ZenModeSettingsBase.DEBUG) Log.d(TAG, "onPrefChange allow" +
+ stringCategory + "=" + allowSenders + " allow" + stringCategory + "From="
+ ZenModeConfig.sourceToString(allowSendersFrom));
}
diff --git a/src/com/android/settings/notification/ZenModeBehaviorSettings.java b/src/com/android/settings/notification/ZenModeBehaviorSettings.java
index bfa95a7..e2e85f3 100644
--- a/src/com/android/settings/notification/ZenModeBehaviorSettings.java
+++ b/src/com/android/settings/notification/ZenModeBehaviorSettings.java
@@ -45,7 +45,9 @@
controllers.add(new ZenModeRemindersPreferenceController(context, lifecycle));
controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle));
controllers.add(new ZenModeCallsPreferenceController(context, lifecycle));
- controllers.add(new ZenModeRepeatCallersPreferenceController(context, lifecycle));
+ controllers.add(new ZenModeRepeatCallersPreferenceController(context, lifecycle,
+ context.getResources().getInteger(com.android.internal.R.integer
+ .config_zen_repeat_callers_threshold)));
controllers.add(new ZenModeScreenOnPreferenceController(context, lifecycle));
controllers.add(new ZenModeScreenOffPreferenceController(context, lifecycle));
controllers.add(new ZenModeBehaviorFooterPreferenceController(context, lifecycle));
diff --git a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java
index 1886dab..da540f4 100644
--- a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java
@@ -16,6 +16,7 @@
package com.android.settings.notification;
+import android.app.FragmentManager;
import android.content.Context;
import android.provider.Settings;
import android.support.v7.preference.Preference;
@@ -31,14 +32,16 @@
public class ZenModeButtonPreferenceController extends AbstractZenModePreferenceController
implements PreferenceControllerMixin {
+ private static final String TAG = "EnableZenModeButton";
protected static final String KEY = "zen_mode_settings_button_container";
private Button mZenButtonOn;
private Button mZenButtonOff;
- private ZenModeBackend mBackend;
+ private FragmentManager mFragment;
- public ZenModeButtonPreferenceController(Context context, Lifecycle lifecycle) {
+ public ZenModeButtonPreferenceController(Context context, Lifecycle lifecycle, FragmentManager
+ fragment) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
+ mFragment = fragment;
}
@Override
@@ -58,11 +61,8 @@
if (null == mZenButtonOn) {
mZenButtonOn = (Button) ((LayoutPreference) preference)
.findViewById(R.id.zen_mode_settings_turn_on_button);
- mZenButtonOn.setOnClickListener(v -> {
- mMetricsFeatureProvider.action(mContext,
- MetricsProto.MetricsEvent.ACTION_ZEN_TOGGLE_DND_BUTTON, true);
- mBackend.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- });
+ mZenButtonOn.setOnClickListener(v ->
+ new EnableZenModeDialog().show(mFragment, TAG));
}
if (null == mZenButtonOff) {
diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java
index d952c11..ef1b09a 100644
--- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java
@@ -19,18 +19,27 @@
import android.app.NotificationManager;
import android.content.Context;
import android.provider.Settings;
+import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
-public class ZenModeCallsPreferenceController extends AbstractZenModePreferenceController {
+public class ZenModeCallsPreferenceController 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 ZenModeCallsPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
mBackend = ZenModeBackend.getInstance(context);
+ mListValues = context.getResources().getStringArray(R.array.zen_mode_contacts_values);
}
@Override
@@ -44,20 +53,54 @@
}
@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:
- preference.setEnabled(false);
- preference.setSummary(mBackend.getContactsSummary(mBackend.SOURCE_NONE));
+ 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/ZenModeCallsSettings.java b/src/com/android/settings/notification/ZenModeCallsSettings.java
deleted file mode 100644
index 6874dc0..0000000
--- a/src/com/android/settings/notification/ZenModeCallsSettings.java
+++ /dev/null
@@ -1,113 +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.app.NotificationManager;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.widget.RadioButtonPickerFragment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ZenModeCallsSettings extends RadioButtonPickerFragment {
- private ZenModeBackend mBackend;
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
- mBackend = ZenModeBackend.getInstance(context);
- }
-
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.NOTIFICATION_ZEN_MODE_CALLS;
- }
-
- @Override
- protected int getPreferenceScreenResId() {
- return R.xml.zen_mode_calls_settings;
- }
-
- @Override
- protected List<? extends RadioButtonPickerFragment.CandidateInfo> getCandidates() {
- final String[] entries = entries();
- final String[] values = keys();
- final List<CallsCandidateInfo> candidates = new ArrayList<>();
-
- if (entries == null || entries.length <= 0) return null;
- if (values == null || values.length != entries.length) {
- throw new IllegalArgumentException("Entries and values must be of the same length.");
- }
-
- for (int i = 0; i < entries.length; i++) {
- candidates.add(new CallsCandidateInfo(entries[i], values[i]));
- }
-
- return candidates;
- }
-
- private String[] entries() {
- return getResources().getStringArray(R.array.zen_mode_contacts_entries);
- }
-
- private String[] keys() {
- return getResources().getStringArray(R.array.zen_mode_contacts_values);
- }
-
- @Override
- protected String getDefaultKey() {
- return mBackend.getSendersKey(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS);
- }
-
- @Override
- protected boolean setDefaultKey(String key) {
- mBackend.saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
- mBackend.getSettingFromPrefKey(key));
- return true;
- }
-
- private static final class CallsCandidateInfo extends RadioButtonPickerFragment.CandidateInfo {
- private final String name;
- private final String key;
-
- CallsCandidateInfo(String title, String value) {
- super(true);
-
- name = title;
- key = value;
- }
-
- @Override
- public CharSequence loadLabel() {
- return name;
- }
-
- @Override
- public Drawable loadIcon() {
- return null;
- }
-
- @Override
- public String getKey() {
- return key;
- }
- }
-}
diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
index be5e6d6..4423494 100644
--- a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
@@ -31,11 +31,9 @@
implements Preference.OnPreferenceChangeListener {
protected static final String KEY = "zen_mode_events";
- private final ZenModeBackend mBackend;
public ZenModeEventsPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
index dad6cf1..93d4aa7 100644
--- a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
@@ -3,18 +3,28 @@
import android.app.NotificationManager;
import android.content.Context;
import android.provider.Settings;
+import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
-public class ZenModeMessagesPreferenceController extends AbstractZenModePreferenceController {
+public class ZenModeMessagesPreferenceController 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 ZenModeMessagesPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
mBackend = ZenModeBackend.getInstance(context);
+ mListValues = context.getResources().getStringArray(R.array.zen_mode_contacts_values);
}
@Override
@@ -28,19 +38,54 @@
}
@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:
- preference.setEnabled(false);
- preference.setSummary(mBackend.getContactsSummary(mBackend.SOURCE_NONE));
+ 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/ZenModeMessagesSettings.java b/src/com/android/settings/notification/ZenModeMessagesSettings.java
deleted file mode 100644
index 9cbf248..0000000
--- a/src/com/android/settings/notification/ZenModeMessagesSettings.java
+++ /dev/null
@@ -1,112 +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.app.NotificationManager;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.widget.RadioButtonPickerFragment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ZenModeMessagesSettings extends RadioButtonPickerFragment {
- private ZenModeBackend mBackend;
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
- mBackend = ZenModeBackend.getInstance(context);
- }
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.NOTIFICATION_ZEN_MODE_MESSAGES;
- }
-
- @Override
- protected int getPreferenceScreenResId() {
- return R.xml.zen_mode_messages_settings;
- }
-
- @Override
- protected List<? extends RadioButtonPickerFragment.CandidateInfo> getCandidates() {
- final String[] entries = entries();
- final String[] values = keys();
- final List<MessagesCandidateInfo> candidates = new ArrayList<>();
-
- if (entries == null || entries.length <= 0) return null;
- if (values == null || values.length != entries.length) {
- throw new IllegalArgumentException("Entries and values must be of the same length.");
- }
-
- for (int i = 0; i < entries.length; i++) {
- candidates.add(new MessagesCandidateInfo(entries[i], values[i]));
- }
-
- return candidates;
- }
-
- private String[] entries() {
- return getResources().getStringArray(R.array.zen_mode_contacts_entries);
- }
-
- private String[] keys() {
- return getResources().getStringArray(R.array.zen_mode_contacts_values);
- }
-
- @Override
- protected String getDefaultKey() {
- return mBackend.getSendersKey(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES);
- }
-
- @Override
- protected boolean setDefaultKey(String key) {
- mBackend.saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
- mBackend.getSettingFromPrefKey(key));
- return true;
- }
-
- private final class MessagesCandidateInfo extends RadioButtonPickerFragment.CandidateInfo {
- private final String name;
- private final String key;
-
- MessagesCandidateInfo(String title, String value) {
- super(true);
-
- name = title;
- key = value;
- }
-
- @Override
- public CharSequence loadLabel() {
- return name;
- }
-
- @Override
- public Drawable loadIcon() {
- return null;
- }
-
- @Override
- public String getKey() {
- return key;
- }
- }
-}
diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
index 99a4f0d7..b6c2922 100644
--- a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
@@ -30,11 +30,9 @@
implements Preference.OnPreferenceChangeListener {
protected static final String KEY = "zen_mode_reminders";
- private final ZenModeBackend mBackend;
public ZenModeRemindersPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
index 82fe865..765d407 100644
--- a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
@@ -21,19 +21,26 @@
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
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 {
protected static final String KEY = "zen_mode_repeat_callers";
- private final ZenModeBackend mBackend;
- public ZenModeRepeatCallersPreferenceController(Context context, Lifecycle lifecycle) {
+ private final ZenModeBackend mBackend;
+ private final int mRepeatCallersThreshold;
+
+ public ZenModeRepeatCallersPreferenceController(Context context, Lifecycle lifecycle,
+ int repeatCallersThreshold) {
super(context, KEY, lifecycle);
+
+ mRepeatCallersThreshold = repeatCallersThreshold;
mBackend = ZenModeBackend.getInstance(context);
}
@@ -48,11 +55,16 @@
}
@Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ setRepeatCallerSummary(screen.findPreference(KEY));
+ }
+
+ @Override
public void updateState(Preference preference) {
super.updateState(preference);
SwitchPreference pref = (SwitchPreference) preference;
-
switch (getZenMode()) {
case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
case Settings.Global.ZEN_MODE_ALARMS:
@@ -86,4 +98,9 @@
mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allowRepeatCallers);
return true;
}
+
+ private void setRepeatCallerSummary(Preference preference) {
+ preference.setSummary(mContext.getString(R.string.zen_mode_repeat_callers_summary,
+ mRepeatCallersThreshold));
+ }
}
diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
index 0234c8e..b5ea9c4 100644
--- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
+++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
@@ -17,7 +17,6 @@
package com.android.settings.notification;
import android.app.AutomaticZenRule;
-import android.app.Fragment;
import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
@@ -25,12 +24,10 @@
import android.os.Bundle;
import android.service.notification.ConditionProviderService;
import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import android.widget.Toast;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -39,14 +36,11 @@
protected static final String TAG = ZenModeSettingsBase.TAG;
protected static final boolean DEBUG = ZenModeSettingsBase.DEBUG;
- private static final String KEY_RULE_NAME = "rule_name";
-
protected Context mContext;
protected boolean mDisableListeners;
protected AutomaticZenRule mRule;
protected String mId;
- private Preference mRuleName;
protected ZenAutomaticRuleHeaderPreferenceController mHeader;
protected ZenAutomaticRuleSwitchPreferenceController mSwitch;
@@ -79,18 +73,7 @@
}
super.onCreate(icicle);
-
onCreateInternal();
-
- final PreferenceScreen root = getPreferenceScreen();
- mRuleName = root.findPreference(KEY_RULE_NAME);
- mRuleName.setOnPreferenceClickListener(new OnPreferenceClickListener() {
- @Override
- public boolean onPreferenceClick(Preference preference) {
- showRuleNameDialog();
- return true;
- }
- });
}
@Override
@@ -113,11 +96,11 @@
protected void updateHeader() {
final PreferenceScreen screen = getPreferenceScreen();
- mSwitch.onResume(mRule,mId);
+ mSwitch.onResume(mRule, mId);
mSwitch.displayPreference(screen);
updatePreference(mSwitch);
- mHeader.onResume(mRule);
+ mHeader.onResume(mRule, mId);
mHeader.displayPreference(screen);
updatePreference(mHeader);
}
@@ -161,46 +144,20 @@
return false;
}
- private void showRuleNameDialog() {
- ZenRuleNameDialog.show(this, mRule.getName(), null, new RuleNameChangeListener());
- }
-
private void toastAndFinish() {
Toast.makeText(mContext, R.string.zen_mode_rule_not_found_text, Toast.LENGTH_SHORT)
.show();
getActivity().finish();
}
- private void updateRuleName() {
- if (mRule != null) {
- mRuleName.setSummary(mRule.getName());
- } else {
- if (DEBUG) Log.d(TAG, "updateRuleName - mRuleName "
- + "not updated; mRuleName returned null");
- }
- }
-
private AutomaticZenRule getZenRule() {
return NotificationManager.from(mContext).getAutomaticZenRule(mId);
}
private void updateControls() {
mDisableListeners = true;
- updateRuleName();
updateControlsInternal();
updateHeader();
mDisableListeners = false;
}
-
- public class RuleNameChangeListener implements ZenRuleNameDialog.PositiveClickListener {
- public RuleNameChangeListener() {}
-
- @Override
- public void onOk(String ruleName, Fragment parent) {
- mMetricsFeatureProvider.action(mContext,
- MetricsProto.MetricsEvent.ACTION_ZEN_MODE_RULE_NAME_CHANGE_OK);
- mRule.setName(ruleName);
- mBackend.setZenRule(mId, mRule);
- }
- }
}
diff --git a/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java b/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java
index 0ba24c0..81c9b0d 100644
--- a/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java
@@ -29,11 +29,9 @@
AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
protected static final String KEY = "zen_mode_screen_off";
- private final ZenModeBackend mBackend;
public ZenModeScreenOffPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java b/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java
index bcb1af8..bab4dd1 100644
--- a/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java
@@ -29,11 +29,9 @@
AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
protected static final String KEY = "zen_mode_screen_on";
- private final ZenModeBackend mBackend;
public ZenModeScreenOnPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 1ee20d3..a6145c4 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import android.app.AutomaticZenRule;
+import android.app.FragmentManager;
import android.app.NotificationManager;
import android.app.NotificationManager.Policy;
import android.content.Context;
@@ -50,7 +51,7 @@
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
- return buildPreferenceControllers(context, getLifecycle());
+ return buildPreferenceControllers(context, getLifecycle(), getFragmentManager());
}
@Override
@@ -59,11 +60,11 @@
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
- Lifecycle lifecycle) {
+ Lifecycle lifecycle, FragmentManager fragmentManager) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new ZenModeBehaviorPreferenceController(context, lifecycle));
controllers.add(new ZenModeAutomationPreferenceController(context));
- controllers.add(new ZenModeButtonPreferenceController(context, lifecycle));
+ controllers.add(new ZenModeButtonPreferenceController(context, lifecycle, fragmentManager));
controllers.add(new ZenModeSettingsFooterPreferenceController(context, lifecycle));
return controllers;
}
@@ -211,7 +212,7 @@
@Override
public List<AbstractPreferenceController> getPreferenceControllers(Context
context) {
- return buildPreferenceControllers(context, null);
+ return buildPreferenceControllers(context, null, null);
}
};
}
diff --git a/src/com/android/settings/notification/ZenRulePreference.java b/src/com/android/settings/notification/ZenRulePreference.java
index 7193873..fee390f 100644
--- a/src/com/android/settings/notification/ZenRulePreference.java
+++ b/src/com/android/settings/notification/ZenRulePreference.java
@@ -30,10 +30,10 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.utils.ManagedServiceSettings;
import com.android.settings.utils.ZenServiceListing;
import com.android.settingslib.TwoTargetPreference;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.Map;
@@ -145,4 +145,4 @@
? mContext.getResources().getString(R.string.switch_off_text)
: mContext.getResources().getString(R.string.switch_on_text);
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index dc9df83..80d435f 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -21,10 +21,10 @@
import android.util.Log;
import com.android.settings.R;
+import com.android.settings.accounts.AccountFeatureProvider;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
import com.android.settings.connecteddevice.SmsMirroringFeatureProvider;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.datausage.DataPlanFeatureProvider;
@@ -36,6 +36,7 @@
import com.android.settings.search.SearchFeatureProvider;
import com.android.settings.slices.SlicesFeatureProvider;
import com.android.settings.users.UserFeatureProvider;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Abstract class for creating feature controllers. Allows OEM implementations to define their own
@@ -109,6 +110,8 @@
public abstract SlicesFeatureProvider getSlicesFeatureProvider();
+ public abstract AccountFeatureProvider getAccountFeatureProvider();
+
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 275ebb6..55f408d 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -23,13 +23,14 @@
import android.os.UserManager;
import android.support.annotation.Keep;
+import com.android.settings.accounts.AccountFeatureProvider;
+import com.android.settings.accounts.AccountFeatureProviderImpl;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.ApplicationFeatureProviderImpl;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
import com.android.settings.bluetooth.BluetoothFeatureProviderImpl;
import com.android.settings.connecteddevice.SmsMirroringFeatureProvider;
import com.android.settings.connecteddevice.SmsMirroringFeatureProviderImpl;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProviderImpl;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -55,6 +56,7 @@
import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
import com.android.settings.wrapper.IPackageManagerWrapper;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.wrapper.PackageManagerWrapper;
/**
@@ -78,6 +80,7 @@
private DataPlanFeatureProvider mDataPlanFeatureProvider;
private SmsMirroringFeatureProvider mSmsMirroringFeatureProvider;
private SlicesFeatureProvider mSlicesFeatureProvider;
+ private AccountFeatureProvider mAccountFeatureProvider;
@Override
public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -219,4 +222,12 @@
}
return mSlicesFeatureProvider;
}
+
+ @Override
+ public AccountFeatureProvider getAccountFeatureProvider() {
+ if (mAccountFeatureProvider == null) {
+ mAccountFeatureProvider = new AccountFeatureProviderImpl();
+ }
+ return mAccountFeatureProvider;
+ }
}
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 746a977..972fac8 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -412,7 +412,7 @@
private ChooseLockSettingsHelper mChooseLockSettingsHelper;
private SaveAndFinishWorker mSaveAndFinishWorker;
protected int mUserId;
- private boolean mForFingerprint;
+ protected boolean mForFingerprint;
private static final String KEY_UI_STAGE = "uiStage";
private static final String KEY_PATTERN_CHOICE = "chosenPattern";
@@ -657,13 +657,7 @@
mFooterText.setText(stage.footerMessage);
}
- if (stage.leftMode == LeftButtonMode.Gone) {
- mFooterLeftButton.setVisibility(View.GONE);
- } else {
- mFooterLeftButton.setVisibility(View.VISIBLE);
- mFooterLeftButton.setText(stage.leftMode.text);
- mFooterLeftButton.setEnabled(stage.leftMode.enabled);
- }
+ updateFooterLeftButton(stage, mFooterLeftButton);
setRightButtonText(stage.rightMode.text);
setRightButtonEnabled(stage.rightMode.enabled);
@@ -713,6 +707,16 @@
}
}
+ protected void updateFooterLeftButton(Stage stage, TextView footerLeftButton) {
+ if (stage.leftMode == LeftButtonMode.Gone) {
+ footerLeftButton.setVisibility(View.GONE);
+ } else {
+ footerLeftButton.setVisibility(View.VISIBLE);
+ footerLeftButton.setText(stage.leftMode.text);
+ footerLeftButton.setEnabled(stage.leftMode.enabled);
+ }
+ }
+
// clear the wrong pattern unless they have started a new one
// already
private void postClearPatternRunnable() {
diff --git a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
index 6a66ffb..1050a54 100644
--- a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
+++ b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
@@ -72,31 +72,31 @@
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
// Copy the original extras into the new intent
+ copyBooleanExtra(activityIntent, intent,
+ ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+ copyBooleanExtra(activityIntent, intent,
+ ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);
if (activityIntent.hasExtra(
ChooseLockGenericFragment.EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS)) {
intent.putExtras(activityIntent.getBundleExtra(
ChooseLockGenericFragment.EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS));
}
intent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, selectedLockType.defaultQuality);
-
- // Propagate the fingerprint challenge
- intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE,
- activityIntent.getBooleanExtra(
- ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE,
activityIntent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0));
-
- // The user is already given the choice of the what screen lock to set up. No need to
- // show this button again.
- intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);
-
WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
-
activity.startActivity(intent);
activity.finish();
}
+
}
+ private static void copyBooleanExtra(Intent from, Intent to, String name,
+ boolean defaultValue) {
+ to.putExtra(name, from.getBooleanExtra(name, defaultValue));
+ }
+
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java
index b1c9fac..4ae5839 100644
--- a/src/com/android/settings/password/SetupChooseLockPattern.java
+++ b/src/com/android/settings/password/SetupChooseLockPattern.java
@@ -22,6 +22,7 @@
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
+import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.SetupRedactionInterstitial;
@@ -72,6 +73,24 @@
}
@Override
+ protected void updateFooterLeftButton(Stage stage, TextView footerLeftButton) {
+ super.updateFooterLeftButton(stage, footerLeftButton);
+ // enable skip button only during setupwizard and not with fingerprint flow.
+ if (!mForFingerprint) {
+ footerLeftButton.setVisibility(View.VISIBLE);
+ footerLeftButton.setText(R.string.skip_label);
+ }
+ }
+
+ @Override
+ public void handleLeftButton() {
+ SetupSkipDialog dialog = SetupSkipDialog.newInstance(
+ getActivity().getIntent()
+ .getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false));
+ dialog.show(getFragmentManager());
+ }
+
+ @Override
protected Intent getRedactionInterstitialIntent(Context context) {
// Setup wizard's redaction interstitial is deferred to optional step. Enable that
// optional step if the lock screen was set up.
diff --git a/src/com/android/settings/search/AccessibilityServiceResultLoader.java b/src/com/android/settings/search/AccessibilityServiceResultLoader.java
deleted file mode 100644
index 327aef2..0000000
--- a/src/com/android/settings/search/AccessibilityServiceResultLoader.java
+++ /dev/null
@@ -1,141 +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.search;
-
-import static com.android.settings.search.InstalledAppResultLoader.getWordDifference;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.content.ContextCompat;
-import android.util.IconDrawableFactory;
-import android.util.Log;
-import android.view.accessibility.AccessibilityManager;
-
-import com.android.settings.R;
-import com.android.settings.accessibility.AccessibilitySettings;
-import com.android.settings.dashboard.SiteMapManager;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-
-public class AccessibilityServiceResultLoader extends
- FutureTask<List<? extends SearchResult>> {
-
- private static final String TAG = "A11yResultFutureTask";
-
- public AccessibilityServiceResultLoader(Context context, String query,
- SiteMapManager manager) {
- super(new AccessibilityServiceResultCallable(context, query, manager));
- }
-
- static class AccessibilityServiceResultCallable implements
- Callable<List<? extends SearchResult>> {
-
- private static final int NAME_NO_MATCH = -1;
-
- private final Context mContext;
- private List<String> mBreadcrumb;
- private SiteMapManager mSiteMapManager;
- @VisibleForTesting
- final String mQuery;
- private final AccessibilityManager mAccessibilityManager;
- private final PackageManager mPackageManager;
- private final int mUserId;
-
- public AccessibilityServiceResultCallable(Context context, String query,
- SiteMapManager mapManager) {
- mUserId = UserHandle.myUserId();
- mContext = context;
- mSiteMapManager = mapManager;
- mPackageManager = context.getPackageManager();
- mAccessibilityManager =
- (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
- mQuery = query;
- }
-
- @Override
- public List<? extends SearchResult> call() throws Exception {
- long startTime = System.currentTimeMillis();
- final List<SearchResult> results = new ArrayList<>();
- final List<AccessibilityServiceInfo> services = mAccessibilityManager
- .getInstalledAccessibilityServiceList();
- final IconDrawableFactory iconFactory = IconDrawableFactory.newInstance(mContext);
- final String screenTitle = mContext.getString(R.string.accessibility_settings);
- for (AccessibilityServiceInfo service : services) {
- if (service == null) {
- continue;
- }
- final ResolveInfo resolveInfo = service.getResolveInfo();
- if (service.getResolveInfo() == null) {
- continue;
- }
- final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
- final CharSequence title = resolveInfo.loadLabel(mPackageManager);
- final int wordDiff = getWordDifference(title.toString(), mQuery);
- if (wordDiff == NAME_NO_MATCH) {
- continue;
- }
- final Drawable icon;
- if (resolveInfo.getIconResource() == 0) {
- icon = ContextCompat.getDrawable(mContext, R.mipmap.ic_accessibility_generic);
- } else {
- icon = iconFactory.getBadgedIcon(
- resolveInfo.serviceInfo,
- resolveInfo.serviceInfo.applicationInfo,
- mUserId);
- }
- final String componentName = new ComponentName(serviceInfo.packageName,
- serviceInfo.name).flattenToString();
- final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
- AccessibilitySettings.class.getName(), componentName, screenTitle);
-
- results.add(new SearchResult.Builder()
- .setTitle(title)
- .addBreadcrumbs(getBreadCrumb())
- .setPayload(new ResultPayload(intent))
- .setRank(wordDiff)
- .setIcon(icon)
- .setStableId(Objects.hash(screenTitle, componentName))
- .build());
- }
- Collections.sort(results);
- Log.i(TAG, "A11y search loading took:" + (System.currentTimeMillis() - startTime));
- return results;
- }
-
- private List<String> getBreadCrumb() {
- if (mBreadcrumb == null || mBreadcrumb.isEmpty()) {
- mBreadcrumb = mSiteMapManager.buildBreadCrumb(
- mContext, AccessibilitySettings.class.getName(),
- mContext.getString(R.string.accessibility_settings));
- }
- return mBreadcrumb;
- }
- }
-}
diff --git a/src/com/android/settings/search/AppSearchResult.java b/src/com/android/settings/search/AppSearchResult.java
deleted file mode 100644
index b59e32e..0000000
--- a/src/com/android/settings/search/AppSearchResult.java
+++ /dev/null
@@ -1,50 +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.search;
-
-import android.content.pm.ApplicationInfo;
-import android.os.UserHandle;
-
-public class AppSearchResult extends SearchResult {
- /**
- * Installed app's ApplicationInfo for delayed loading of icons
- */
- public final ApplicationInfo info;
-
- public AppSearchResult(Builder builder) {
- super(builder);
- info = builder.mInfo;
- }
-
- public UserHandle getAppUserHandle() {
- return new UserHandle(UserHandle.getUserId(info.uid));
- }
-
- public static class Builder extends SearchResult.Builder {
- protected ApplicationInfo mInfo;
-
- public SearchResult.Builder setAppInfo(ApplicationInfo info) {
- mInfo = info;
- return this;
- }
-
- public AppSearchResult build() {
- return new AppSearchResult(this);
- }
- }
-}
diff --git a/src/com/android/settings/search/CursorToSearchResultConverter.java b/src/com/android/settings/search/CursorToSearchResultConverter.java
index 8528c56..8e5577d 100644
--- a/src/com/android/settings/search/CursorToSearchResultConverter.java
+++ b/src/com/android/settings/search/CursorToSearchResultConverter.java
@@ -17,6 +17,9 @@
package com.android.settings.search;
+import static com.android.settings.search.DatabaseResultLoader.BASE_RANKS;
+import static com.android.settings.search.SearchResult.TOP_RANK;
+
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.Resources;
@@ -26,18 +29,12 @@
import android.text.TextUtils;
import android.util.Log;
-import com.android.settings.dashboard.SiteMapManager;
-
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
import java.util.Set;
-import static com.android.settings.search.DatabaseResultLoader.BASE_RANKS;
-import static com.android.settings.search.SearchResult.TOP_RANK;
-
/**
* Controller to Build search results from {@link Cursor} Objects.
*
@@ -94,8 +91,7 @@
mContext = context;
}
- public Set<SearchResult> convertCursor(SiteMapManager sitemapManager,
- Cursor cursorResults, int baseRank) {
+ public Set<SearchResult> convertCursor(Cursor cursorResults, int baseRank) {
if (cursorResults == null) {
return null;
}
@@ -103,8 +99,8 @@
final Set<SearchResult> results = new HashSet<>();
while (cursorResults.moveToNext()) {
- SearchResult result = buildSingleSearchResultFromCursor(sitemapManager,
- contextMap, cursorResults, baseRank);
+ SearchResult result = buildSingleSearchResultFromCursor(contextMap, cursorResults,
+ baseRank);
if (result != null) {
results.add(result);
}
@@ -132,8 +128,8 @@
return null;
}
- private SearchResult buildSingleSearchResultFromCursor(SiteMapManager sitemapManager,
- Map<String, Context> contextMap, Cursor cursor, int baseRank) {
+ private SearchResult buildSingleSearchResultFromCursor(Map<String, Context> contextMap,
+ Cursor cursor, int baseRank) {
final int docId = cursor.getInt(COLUMN_INDEX_ID);
final String pkgName = cursor.getString(COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE);
final String title = cursor.getString(COLUMN_INDEX_TITLE);
@@ -145,14 +141,12 @@
final byte[] marshalledPayload = cursor.getBlob(COLUMN_INDEX_PAYLOAD);
final ResultPayload payload = getUnmarshalledPayload(marshalledPayload, payloadType);
- final List<String> breadcrumbs = getBreadcrumbs(sitemapManager, cursor);
final int rank = getRank(title, baseRank, key);
final SearchResult.Builder builder = new SearchResult.Builder()
.setStableId(docId)
.setTitle(title)
.setSummary(summaryOn)
- .addBreadcrumbs(breadcrumbs)
.setRank(rank)
.setIcon(getIconForPackage(contextMap, pkgName, className, iconResStr))
.setPayload(payload);
@@ -191,12 +185,6 @@
return icon;
}
- private List<String> getBreadcrumbs(SiteMapManager siteMapManager, Cursor cursor) {
- final String screenTitle = cursor.getString(COLUMN_INDEX_SCREEN_TITLE);
- final String screenClass = cursor.getString(COLUMN_INDEX_CLASS_NAME);
- return siteMapManager == null ? null : siteMapManager.buildBreadCrumb(mContext, screenClass,
- screenTitle);
- }
/** Uses the breadcrumbs to determine the offset to the base rank.
* There are three checks
diff --git a/src/com/android/settings/search/DatabaseIndexingManager.java b/src/com/android/settings/search/DatabaseIndexingManager.java
index 0aeda66..7b9a635 100644
--- a/src/com/android/settings/search/DatabaseIndexingManager.java
+++ b/src/com/android/settings/search/DatabaseIndexingManager.java
@@ -19,7 +19,8 @@
import static com.android.settings.search.CursorToSearchResultConverter.COLUMN_INDEX_ID;
-import static com.android.settings.search.CursorToSearchResultConverter.COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
+import static com.android.settings.search.CursorToSearchResultConverter
+ .COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
import static com.android.settings.search.CursorToSearchResultConverter.COLUMN_INDEX_KEY;
import static com.android.settings.search.DatabaseResultLoader.SELECT_COLUMNS;
import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.CLASS_NAME;
@@ -27,7 +28,8 @@
import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS;
import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_KEY_REF;
import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON;
-import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED;
+import static com.android.settings.search.IndexDatabaseHelper.IndexColumns
+ .DATA_SUMMARY_ON_NORMALIZED;
import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_TITLE;
import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED;
import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DOCID;
@@ -50,7 +52,6 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
-import android.os.AsyncTask;
import android.os.Build;
import android.provider.SearchIndexablesContract;
import android.provider.SearchIndexablesContract.SiteMapColumns;
@@ -58,7 +59,6 @@
import android.text.TextUtils;
import android.util.Log;
-import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.indexing.IndexData;
import com.android.settings.search.indexing.IndexDataConverter;
import com.android.settings.search.indexing.PreIndexData;
@@ -68,7 +68,6 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* Consumes the SearchIndexableProvider content providers.
@@ -80,15 +79,6 @@
private static final String LOG_TAG = "DatabaseIndexingManager";
- private static final String METRICS_ACTION_SETTINGS_ASYNC_INDEX =
- "search_asynchronous_indexing";
-
- public static final String FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER =
- "SEARCH_INDEX_DATA_PROVIDER";
-
- @VisibleForTesting
- final AtomicBoolean mIsIndexingComplete = new AtomicBoolean(false);
-
private PreIndexDataCollector mCollector;
private IndexDataConverter mConverter;
@@ -98,15 +88,6 @@
mContext = context;
}
- public boolean isIndexingComplete() {
- return mIsIndexingComplete.get();
- }
-
- public void indexDatabase(IndexingCallback callback) {
- IndexingTask task = new IndexingTask(callback);
- task.execute();
- }
-
/**
* Accumulate all data and non-indexable keys from each of the content-providers.
* Only the first indexing for the default language gets static search results - subsequent
@@ -363,39 +344,4 @@
return null;
}
}
-
- public class IndexingTask extends AsyncTask<Void, Void, Void> {
-
- @VisibleForTesting
- IndexingCallback mCallback;
- private long mIndexStartTime;
-
- public IndexingTask(IndexingCallback callback) {
- mCallback = callback;
- }
-
- @Override
- protected void onPreExecute() {
- mIndexStartTime = System.currentTimeMillis();
- mIsIndexingComplete.set(false);
- }
-
- @Override
- protected Void doInBackground(Void... voids) {
- performIndexing();
- return null;
- }
-
- @Override
- protected void onPostExecute(Void aVoid) {
- int indexingTime = (int) (System.currentTimeMillis() - mIndexStartTime);
- FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()
- .histogram(mContext, METRICS_ACTION_SETTINGS_ASYNC_INDEX, indexingTime);
-
- mIsIndexingComplete.set(true);
- if (mCallback != null) {
- mCallback.onIndexingFinished();
- }
- }
- }
}
\ No newline at end of file
diff --git a/src/com/android/settings/search/DatabaseResultLoader.java b/src/com/android/settings/search/DatabaseResultLoader.java
index 66548a4..3b5cc47 100644
--- a/src/com/android/settings/search/DatabaseResultLoader.java
+++ b/src/com/android/settings/search/DatabaseResultLoader.java
@@ -18,35 +18,11 @@
package com.android.settings.search;
import static com.android.settings.search.IndexDatabaseHelper.IndexColumns;
-import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-import android.util.Pair;
-
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.overlay.FeatureFactory;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
/**
* AsyncTask to retrieve Settings, first party app and any intent based results.
*/
-public class DatabaseResultLoader extends FutureTask<List<? extends SearchResult>> {
+public class DatabaseResultLoader {
private static final String TAG = "DatabaseResultLoader";
@@ -66,18 +42,6 @@
IndexColumns.PAYLOAD
};
- public static final String[] MATCH_COLUMNS_PRIMARY = {
- IndexColumns.DATA_TITLE,
- IndexColumns.DATA_TITLE_NORMALIZED,
- };
-
- public static final String[] MATCH_COLUMNS_SECONDARY = {
- IndexColumns.DATA_SUMMARY_ON,
- IndexColumns.DATA_SUMMARY_ON_NORMALIZED,
- IndexColumns.DATA_SUMMARY_OFF,
- IndexColumns.DATA_SUMMARY_OFF_NORMALIZED,
- };
-
/**
* Base ranks defines the best possible rank based on what the query matches.
* If the query matches the prefix of the first word in the title, the best rank it can be
@@ -89,256 +53,4 @@
*/
public static final int[] BASE_RANKS = {1, 3, 7, 9};
- public DatabaseResultLoader(Context context, String query, SiteMapManager manager) {
- super(new StaticSearchResultCallable(context, query, manager));
- }
-
- static class StaticSearchResultCallable implements
- Callable<List<? extends SearchResult>> {
-
- public final String[] MATCH_COLUMNS_TERTIARY = {
- IndexColumns.DATA_KEYWORDS,
- IndexColumns.DATA_ENTRIES
- };
-
- @VisibleForTesting
- final String mQueryText;
- private final Context mContext;
- private final CursorToSearchResultConverter mConverter;
- private final SiteMapManager mSiteMapManager;
- private final SearchFeatureProvider mFeatureProvider;
-
- public StaticSearchResultCallable(Context context, String queryText,
- SiteMapManager mapManager) {
- mContext = context;
- mSiteMapManager = mapManager;
- mQueryText = queryText;
- mConverter = new CursorToSearchResultConverter(context);
- mFeatureProvider = FeatureFactory.getFactory(context).getSearchFeatureProvider();
- }
-
- @Override
- public List<? extends SearchResult> call() {
- if (mQueryText == null || mQueryText.isEmpty()) {
- return new ArrayList<>();
- }
-
- // TODO (b/68656233) Consolidate timing metrics
- long startTime = System.currentTimeMillis();
- // Start a Future to get search result scores.
- FutureTask<List<Pair<String, Float>>> rankerTask = mFeatureProvider.getRankerTask(
- mContext, mQueryText);
-
- if (rankerTask != null) {
- ExecutorService executorService = mFeatureProvider.getExecutorService();
- executorService.execute(rankerTask);
- }
-
- final Set<SearchResult> resultSet = new HashSet<>();
-
- resultSet.addAll(firstWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[0]));
- resultSet.addAll(secondaryWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[1]));
- resultSet.addAll(anyWordQuery(MATCH_COLUMNS_SECONDARY, BASE_RANKS[2]));
- resultSet.addAll(anyWordQuery(MATCH_COLUMNS_TERTIARY, BASE_RANKS[3]));
-
- // Try to retrieve the scores in time. Otherwise use static ranking.
- if (rankerTask != null) {
- try {
- final long timeoutMs = mFeatureProvider.smartSearchRankingTimeoutMs(mContext);
- List<Pair<String, Float>> searchRankScores = rankerTask.get(timeoutMs,
- TimeUnit.MILLISECONDS);
- return getDynamicRankedResults(resultSet, searchRankScores);
- } catch (TimeoutException | InterruptedException | ExecutionException e) {
- Log.d(TAG, "Error waiting for result scores: " + e);
- }
- }
-
- List<SearchResult> resultList = new ArrayList<>(resultSet);
- Collections.sort(resultList);
- Log.i(TAG, "Static search loading took:" + (System.currentTimeMillis() - startTime));
- return resultList;
- }
-
- // TODO (b/33577327) Retrieve all search results with a single query.
-
- /**
- * Creates and executes the query which matches prefixes of the first word of the given
- * columns.
- *
- * @param matchColumns The columns to match on
- * @param baseRank The highest rank achievable by these results
- * @return A set of the matching results.
- */
- private Set<SearchResult> firstWordQuery(String[] matchColumns, int baseRank) {
- final String whereClause = buildSingleWordWhereClause(matchColumns);
- final String query = mQueryText + "%";
- final String[] selection = buildSingleWordSelection(query, matchColumns.length);
-
- return query(whereClause, selection, baseRank);
- }
-
- /**
- * Creates and executes the query which matches prefixes of the non-first words of the
- * given columns.
- *
- * @param matchColumns The columns to match on
- * @param baseRank The highest rank achievable by these results
- * @return A set of the matching results.
- */
- private Set<SearchResult> secondaryWordQuery(String[] matchColumns, int baseRank) {
- final String whereClause = buildSingleWordWhereClause(matchColumns);
- final String query = "% " + mQueryText + "%";
- final String[] selection = buildSingleWordSelection(query, matchColumns.length);
-
- return query(whereClause, selection, baseRank);
- }
-
- /**
- * Creates and executes the query which matches prefixes of the any word of the given
- * columns.
- *
- * @param matchColumns The columns to match on
- * @param baseRank The highest rank achievable by these results
- * @return A set of the matching results.
- */
- private Set<SearchResult> anyWordQuery(String[] matchColumns, int baseRank) {
- final String whereClause = buildTwoWordWhereClause(matchColumns);
- final String[] selection = buildAnyWordSelection(matchColumns.length * 2);
-
- return query(whereClause, selection, baseRank);
- }
-
- /**
- * Generic method used by all of the query methods above to execute a query.
- *
- * @param whereClause Where clause for the SQL query which uses bindings.
- * @param selection List of the transformed query to match each bind in the whereClause
- * @param baseRank The highest rank achievable by these results.
- * @return A set of the matching results.
- */
- private Set<SearchResult> query(String whereClause, String[] selection, int baseRank) {
- final SQLiteDatabase database =
- IndexDatabaseHelper.getInstance(mContext).getReadableDatabase();
- try (Cursor resultCursor = database.query(TABLE_PREFS_INDEX, SELECT_COLUMNS,
- whereClause,
- selection, null, null, null)) {
- return mConverter.convertCursor(mSiteMapManager, resultCursor, baseRank);
- }
- }
-
- /**
- * Builds the SQLite WHERE clause that matches all matchColumns for a single query.
- *
- * @param matchColumns List of columns that will be used for matching.
- * @return The constructed WHERE clause.
- */
- private static String buildSingleWordWhereClause(String[] matchColumns) {
- StringBuilder sb = new StringBuilder(" (");
- final int count = matchColumns.length;
- for (int n = 0; n < count; n++) {
- sb.append(matchColumns[n]);
- sb.append(" like ? ");
- if (n < count - 1) {
- sb.append(" OR ");
- }
- }
- sb.append(") AND enabled = 1");
- return sb.toString();
- }
-
- /**
- * Builds the SQLite WHERE clause that matches all matchColumns to two different queries.
- *
- * @param matchColumns List of columns that will be used for matching.
- * @return The constructed WHERE clause.
- */
- private static String buildTwoWordWhereClause(String[] matchColumns) {
- StringBuilder sb = new StringBuilder(" (");
- final int count = matchColumns.length;
- for (int n = 0; n < count; n++) {
- sb.append(matchColumns[n]);
- sb.append(" like ? OR ");
- sb.append(matchColumns[n]);
- sb.append(" like ?");
- if (n < count - 1) {
- sb.append(" OR ");
- }
- }
- sb.append(") AND enabled = 1");
- return sb.toString();
- }
-
- /**
- * Fills out the selection array to match the query as the prefix of a single word.
- *
- * @param size is the number of columns to be matched.
- */
- private String[] buildSingleWordSelection(String query, int size) {
- String[] selection = new String[size];
-
- for (int i = 0; i < size; i++) {
- selection[i] = query;
- }
- return selection;
- }
-
- /**
- * Fills out the selection array to match the query as the prefix of a word.
- *
- * @param size is twice the number of columns to be matched. The first match is for the
- * prefix
- * of the first word in the column. The second match is for any subsequent word
- * prefix match.
- */
- private String[] buildAnyWordSelection(int size) {
- String[] selection = new String[size];
- final String query = mQueryText + "%";
- final String subStringQuery = "% " + mQueryText + "%";
-
- for (int i = 0; i < (size - 1); i += 2) {
- selection[i] = query;
- selection[i + 1] = subStringQuery;
- }
- return selection;
- }
-
- private List<SearchResult> getDynamicRankedResults(Set<SearchResult> unsortedSet,
- List<Pair<String, Float>> searchRankScores) {
- TreeSet<SearchResult> dbResultsSortedByScores = new TreeSet<>(
- (o1, o2) -> {
- float score1 = getRankingScoreByStableId(searchRankScores, o1.stableId);
- float score2 = getRankingScoreByStableId(searchRankScores, o2.stableId);
- if (score1 > score2) {
- return -1;
- } else if (score1 == score2) {
- return 0;
- } else {
- return 1;
- }
- });
- dbResultsSortedByScores.addAll(unsortedSet);
-
- return new ArrayList<>(dbResultsSortedByScores);
- }
-
- /**
- * Looks up ranking score for stableId
- *
- * @param stableId String of stableId
- * @return the ranking score corresponding to the given stableId. If there is no score
- * available for this stableId, -Float.MAX_VALUE is returned.
- */
- @VisibleForTesting
- Float getRankingScoreByStableId(List<Pair<String, Float>> searchRankScores, int stableId) {
- for (Pair<String, Float> rankingScore : searchRankScores) {
- if (Integer.toString(stableId).compareTo(rankingScore.first) == 0) {
- return rankingScore.second;
- }
- }
- // If stableId not found in the list, we assign the minimum score so it will appear at
- // the end of the list.
- Log.w(TAG, "stableId " + stableId + " was not in the ranking scores.");
- return -Float.MAX_VALUE;
- }
- }
}
\ No newline at end of file
diff --git a/src/com/android/settings/search/IndexingCallback.java b/src/com/android/settings/search/IndexingCallback.java
deleted file mode 100644
index b4b6eab..0000000
--- a/src/com/android/settings/search/IndexingCallback.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.android.settings.search;
-
-/**
- * Callback for Settings search indexing.
- */
-public interface IndexingCallback {
-
- /**
- * Called when Indexing is finished.
- */
- void onIndexingFinished();
-}
diff --git a/src/com/android/settings/search/InlineSwitchViewHolder.java b/src/com/android/settings/search/InlineSwitchViewHolder.java
deleted file mode 100644
index bb8320d..0000000
--- a/src/com/android/settings/search/InlineSwitchViewHolder.java
+++ /dev/null
@@ -1,65 +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.search;
-
-import android.content.Context;
-import android.util.Pair;
-import android.view.View;
-import android.widget.Switch;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-
-/**
- * ViewHolder for Settings represented as SwitchPreferences.
- */
-public class InlineSwitchViewHolder extends SearchViewHolder {
-
- public final Switch switchView;
-
- private final Context mContext;
-
- public InlineSwitchViewHolder(View view, Context context) {
- super(view);
- mContext = context;
- switchView = view.findViewById(R.id.switchView);
- }
-
- @Override
- public int getClickActionMetricName() {
- return MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_INLINE_RESULT;
- }
-
- @Override
- public void onBind(SearchFragment fragment, final SearchResult result) {
- super.onBind(fragment, result);
- if (mContext == null) {
- return;
- }
- final InlineSwitchPayload payload = (InlineSwitchPayload) result.payload;
- switchView.setChecked(payload.getValue(mContext) == InlineSwitchPayload.TRUE);
- switchView.setOnCheckedChangeListener((buttonView, isChecked) -> {
- final Pair<Integer, Object> value = Pair.create(
- MetricsEvent.FIELD_SETTINGS_SEARCH_INLINE_RESULT_VALUE, isChecked
- ? 1L : 0L);
- fragment.onSearchResultClicked(this, result, value);
- int newValue = isChecked ? InlineSwitchPayload.TRUE : InlineSwitchPayload.FALSE;
- payload.setValue(mContext, newValue);
- });
- }
-}
diff --git a/src/com/android/settings/search/InputDeviceResultLoader.java b/src/com/android/settings/search/InputDeviceResultLoader.java
deleted file mode 100644
index 598281c..0000000
--- a/src/com/android/settings/search/InputDeviceResultLoader.java
+++ /dev/null
@@ -1,211 +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.search;
-
-import static android.content.Context.INPUT_METHOD_SERVICE;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.hardware.input.InputManager;
-import android.hardware.input.KeyboardLayout;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-import android.view.InputDevice;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.view.inputmethod.InputMethodSubtype;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
-import com.android.settings.inputmethod.PhysicalKeyboardFragment;
-import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-
-/**
- * Search result for input devices (physical/virtual keyboard, game controllers, etc)
- */
-
-public class InputDeviceResultLoader extends FutureTask<List<? extends SearchResult>> {
-
- private static final String TAG = "InputResultFutureTask";
-
- @VisibleForTesting
- static final String PHYSICAL_KEYBOARD_FRAGMENT = PhysicalKeyboardFragment.class.getName();
- @VisibleForTesting
- static final String VIRTUAL_KEYBOARD_FRAGMENT =
- AvailableVirtualKeyboardFragment.class.getName();
-
- public InputDeviceResultLoader(Context context, String query, SiteMapManager manager) {
- super(new InputDeviceResultCallable(context, query, manager));
- }
-
- static class InputDeviceResultCallable implements
- Callable<List<? extends SearchResult>> {
- private static final int NAME_NO_MATCH = -1;
-
- private final Context mContext;
- private final SiteMapManager mSiteMapManager;
- private final InputManager mInputManager;
- private final InputMethodManager mImm;
- private final PackageManager mPackageManager;
- @VisibleForTesting
- final String mQuery;
-
- private List<String> mPhysicalKeyboardBreadcrumb;
- private List<String> mVirtualKeyboardBreadcrumb;
-
- public InputDeviceResultCallable(Context context, String query, SiteMapManager mapManager) {
- mContext = context;
- mQuery = query;
- mSiteMapManager = mapManager;
- mInputManager = (InputManager) context.getSystemService(Context.INPUT_SERVICE);
- mImm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
- mPackageManager = context.getPackageManager();
- }
-
- @Override
- public List<? extends SearchResult> call() {
- long startTime = System.currentTimeMillis();
- final List<SearchResult> results = new ArrayList<>();
- results.addAll(buildPhysicalKeyboardSearchResults());
- results.addAll(buildVirtualKeyboardSearchResults());
- Collections.sort(results);
- Log.i(TAG, "Input search loading took:" + (System.currentTimeMillis() - startTime));
- return results;
- }
-
- private Set<SearchResult> buildPhysicalKeyboardSearchResults() {
- final Set<SearchResult> results = new HashSet<>();
- final String screenTitle = mContext.getString(R.string.physical_keyboard_title);
-
- for (final InputDevice device : getPhysicalFullKeyboards()) {
- final String deviceName = device.getName();
- final int wordDiff = InstalledAppResultLoader.getWordDifference(deviceName,
- mQuery);
- if (wordDiff == NAME_NO_MATCH) {
- continue;
- }
- final String keyboardLayoutDescriptor = mInputManager
- .getCurrentKeyboardLayoutForInputDevice(device.getIdentifier());
- final KeyboardLayout keyboardLayout = (keyboardLayoutDescriptor != null)
- ? mInputManager.getKeyboardLayout(keyboardLayoutDescriptor) : null;
- final String summary = (keyboardLayout != null)
- ? keyboardLayout.toString()
- : mContext.getString(R.string.keyboard_layout_default_label);
-
- final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
- PHYSICAL_KEYBOARD_FRAGMENT, deviceName, screenTitle);
- results.add(new SearchResult.Builder()
- .setTitle(deviceName)
- .setPayload(new ResultPayload(intent))
- .setStableId(Objects.hash(PHYSICAL_KEYBOARD_FRAGMENT, deviceName))
- .setSummary(summary)
- .setRank(wordDiff)
- .addBreadcrumbs(getPhysicalKeyboardBreadCrumb())
- .build());
- }
- return results;
- }
-
- private Set<SearchResult> buildVirtualKeyboardSearchResults() {
- final Set<SearchResult> results = new HashSet<>();
- final String screenTitle = mContext.getString(R.string.add_virtual_keyboard);
- final List<InputMethodInfo> inputMethods = mImm.getInputMethodList();
- for (InputMethodInfo info : inputMethods) {
- final String title = info.loadLabel(mPackageManager).toString();
- final String summary = InputMethodAndSubtypeUtil
- .getSubtypeLocaleNameListAsSentence(getAllSubtypesOf(info), mContext, info);
- int wordDiff = InstalledAppResultLoader.getWordDifference(title, mQuery);
- if (wordDiff == NAME_NO_MATCH) {
- wordDiff = InstalledAppResultLoader.getWordDifference(summary, mQuery);
- }
- if (wordDiff == NAME_NO_MATCH) {
- continue;
- }
- final ServiceInfo serviceInfo = info.getServiceInfo();
- final String key = new ComponentName(serviceInfo.packageName, serviceInfo.name)
- .flattenToString();
- final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
- VIRTUAL_KEYBOARD_FRAGMENT, key, screenTitle);
- results.add(new SearchResult.Builder()
- .setTitle(title)
- .setSummary(summary)
- .setRank(wordDiff)
- .setStableId(Objects.hash(VIRTUAL_KEYBOARD_FRAGMENT, key))
- .addBreadcrumbs(getVirtualKeyboardBreadCrumb())
- .setPayload(new ResultPayload(intent))
- .build());
- }
- return results;
- }
-
- private List<String> getPhysicalKeyboardBreadCrumb() {
- if (mPhysicalKeyboardBreadcrumb == null || mPhysicalKeyboardBreadcrumb.isEmpty()) {
- mPhysicalKeyboardBreadcrumb = mSiteMapManager.buildBreadCrumb(
- mContext, PHYSICAL_KEYBOARD_FRAGMENT,
- mContext.getString(R.string.physical_keyboard_title));
- }
- return mPhysicalKeyboardBreadcrumb;
- }
-
-
- private List<String> getVirtualKeyboardBreadCrumb() {
- if (mVirtualKeyboardBreadcrumb == null || mVirtualKeyboardBreadcrumb.isEmpty()) {
- final Context context = mContext;
- mVirtualKeyboardBreadcrumb = mSiteMapManager.buildBreadCrumb(
- context, VIRTUAL_KEYBOARD_FRAGMENT,
- context.getString(R.string.add_virtual_keyboard));
- }
- return mVirtualKeyboardBreadcrumb;
- }
-
- private List<InputDevice> getPhysicalFullKeyboards() {
- final List<InputDevice> keyboards = new ArrayList<>();
- final int[] deviceIds = InputDevice.getDeviceIds();
- if (deviceIds != null) {
- for (int deviceId : deviceIds) {
- final InputDevice device = InputDevice.getDevice(deviceId);
- if (device != null && !device.isVirtual() && device.isFullKeyboard()) {
- keyboards.add(device);
- }
- }
- }
- return keyboards;
- }
-
- private static List<InputMethodSubtype> getAllSubtypesOf(final InputMethodInfo imi) {
- final int subtypeCount = imi.getSubtypeCount();
- final List<InputMethodSubtype> allSubtypes = new ArrayList<>(subtypeCount);
- for (int index = 0; index < subtypeCount; index++) {
- allSubtypes.add(imi.getSubtypeAt(index));
- }
- return allSubtypes;
- }
- }
-}
diff --git a/src/com/android/settings/search/InstalledAppResultLoader.java b/src/com/android/settings/search/InstalledAppResultLoader.java
deleted file mode 100644
index e5d8ac1..0000000
--- a/src/com/android/settings/search/InstalledAppResultLoader.java
+++ /dev/null
@@ -1,260 +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.search;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.net.Uri;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.applications.manageapplications.ManageApplications;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-
-/**
- * Search loader for installed apps.
- */
-public class InstalledAppResultLoader extends FutureTask<List<? extends SearchResult>> {
-
- private static final String TAG = "InstalledAppFutureTask";
-
- private static final int NAME_NO_MATCH = -1;
- private static final Intent LAUNCHER_PROBE = new Intent(Intent.ACTION_MAIN)
- .addCategory(Intent.CATEGORY_LAUNCHER);
-
- public InstalledAppResultLoader(Context context, PackageManagerWrapper wrapper,
- String query, SiteMapManager manager) {
- super(new InstalledAppResultCallable(context, wrapper, query, manager));
- }
-
- /**
- * Returns "difference" between appName and query string. appName must contain all
- * characters from query as a prefix to a word, in the same order.
- * If not, returns NAME_NO_MATCH.
- * If they do match, returns an int value representing how different they are,
- * and larger values means they are less similar.
- * <p/>
- * Example:
- * appName: Abcde, query: Abcde, Returns 0
- * appName: Abcde, query: abc, Returns 2
- * appName: Abcde, query: ab, Returns 3
- * appName: Abcde, query: bc, Returns NAME_NO_MATCH
- * appName: Abcde, query: xyz, Returns NAME_NO_MATCH
- * appName: Abc de, query: de, Returns 4
- * TODO: Move this to a common util class.
- */
- static int getWordDifference(String appName, String query) {
- if (TextUtils.isEmpty(appName) || TextUtils.isEmpty(query)) {
- return NAME_NO_MATCH;
- }
-
- final char[] queryTokens = query.toLowerCase().toCharArray();
- final char[] appTokens = appName.toLowerCase().toCharArray();
- final int appLength = appTokens.length;
- if (queryTokens.length > appLength) {
- return NAME_NO_MATCH;
- }
-
- int i = 0;
- int j;
-
- while (i < appLength) {
- j = 0;
- // Currently matching a prefix
- while ((i + j < appLength) && (queryTokens[j] == appTokens[i + j])) {
- // Matched the entire query
- if (++j >= queryTokens.length) {
- // Use the diff in length as a proxy of how close the 2 words match.
- // Value range from 0 to infinity.
- return appLength - queryTokens.length;
- }
- }
-
- i += j;
-
- // Remaining string is longer that the query or we have search the whole app name.
- if (queryTokens.length > appLength - i) {
- return NAME_NO_MATCH;
- }
-
- // This is the first index where app name and query name are different
- // Find the next space in the app name or the end of the app name.
- while ((i < appLength) && (!Character.isWhitespace(appTokens[i++]))) ;
-
- // Find the start of the next word
- while ((i < appLength) && !(Character.isLetter(appTokens[i])
- || Character.isDigit(appTokens[i]))) {
- // Increment in body because we cannot guarantee which condition was true
- i++;
- }
- }
- return NAME_NO_MATCH;
- }
-
- static class InstalledAppResultCallable implements
- Callable<List<? extends SearchResult>> {
-
- private final Context mContext;
- private List<String> mBreadcrumb;
- private SiteMapManager mSiteMapManager;
- @VisibleForTesting
- final String mQuery;
- private final UserManager mUserManager;
- private final PackageManagerWrapper mPackageManager;
- private final List<ResolveInfo> mHomeActivities = new ArrayList<>();
-
- public InstalledAppResultCallable(Context context, PackageManagerWrapper pmWrapper,
- String query, SiteMapManager mapManager) {
- mContext = context;
- mSiteMapManager = mapManager;
- mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
- mPackageManager = pmWrapper;
- mQuery = query;
- }
-
- @Override
- public List<? extends SearchResult> call() throws Exception {
- long startTime = System.currentTimeMillis();
- final List<AppSearchResult> results = new ArrayList<>();
- final PackageManager pm = mPackageManager.getPackageManager();
-
- mHomeActivities.clear();
- mPackageManager.getHomeActivities(mHomeActivities);
-
- for (UserInfo user : getUsersToCount()) {
- final List<ApplicationInfo> apps =
- mPackageManager.getInstalledApplicationsAsUser(
- PackageManager.MATCH_DISABLED_COMPONENTS
- | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
- | (user.isAdmin() ? PackageManager.MATCH_ANY_USER : 0),
- user.id);
- for (ApplicationInfo info : apps) {
- if (!shouldIncludeAsCandidate(info, user)) {
- continue;
- }
- final CharSequence label = info.loadLabel(pm);
- final int wordDiff = getWordDifference(label.toString(), mQuery);
- if (wordDiff == NAME_NO_MATCH) {
- continue;
- }
- final Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
- .setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
- .setData(Uri.fromParts("package", info.packageName, null))
- .putExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY,
- MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS);
-
- final AppSearchResult.Builder builder = new AppSearchResult.Builder();
- builder.setAppInfo(info)
- .setStableId(Objects.hash(info.packageName, user.id))
- .setTitle(info.loadLabel(pm))
- .setRank(getRank(wordDiff))
- .addBreadcrumbs(getBreadCrumb())
- .setPayload(new ResultPayload(intent));
- results.add(builder.build());
- }
- }
- Collections.sort(results);
- Log.i(TAG, "App search loading took:" + (System.currentTimeMillis() - startTime));
- return results;
- }
-
- /**
- * Returns true if the candidate should be included in candidate list
- * <p/>
- * This method matches logic in {@code ApplicationState#FILTER_DOWNLOADED_AND_LAUNCHER}.
- */
- private boolean shouldIncludeAsCandidate(ApplicationInfo info, UserInfo user) {
- // Not system app
- if ((info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0
- || (info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
- return true;
- }
- // Shows up in launcher
- final Intent launchIntent = new Intent(LAUNCHER_PROBE)
- .setPackage(info.packageName);
- final List<ResolveInfo> intents = mPackageManager.queryIntentActivitiesAsUser(
- launchIntent,
- PackageManager.MATCH_DISABLED_COMPONENTS
- | PackageManager.MATCH_DIRECT_BOOT_AWARE
- | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
- user.id);
- if (intents != null && intents.size() != 0) {
- return true;
- }
- // Is launcher app itself
- return isPackageInList(mHomeActivities, info.packageName);
- }
-
- private List<UserInfo> getUsersToCount() {
- return mUserManager.getProfiles(UserHandle.myUserId());
- }
-
- private boolean isPackageInList(List<ResolveInfo> resolveInfos, String pkg) {
- for (ResolveInfo info : resolveInfos) {
- if (TextUtils.equals(info.activityInfo.packageName, pkg)) {
- return true;
- }
- }
- return false;
- }
-
- private List<String> getBreadCrumb() {
- if (mBreadcrumb == null || mBreadcrumb.isEmpty()) {
- mBreadcrumb = mSiteMapManager.buildBreadCrumb(
- mContext, ManageApplications.class.getName(),
- mContext.getString(R.string.applications_settings));
- }
- return mBreadcrumb;
- }
-
- /**
- * A temporary ranking scheme for installed apps.
- *
- * @param wordDiff difference between query length and app name length.
- * @return the ranking.
- */
- private int getRank(int wordDiff) {
- if (wordDiff < 6) {
- return 2;
- }
- return 3;
- }
- }
-}
diff --git a/src/com/android/settings/search/IntentSearchViewHolder.java b/src/com/android/settings/search/IntentSearchViewHolder.java
deleted file mode 100644
index 8f6aa2c..0000000
--- a/src/com/android/settings/search/IntentSearchViewHolder.java
+++ /dev/null
@@ -1,74 +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.search;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.UserHandle;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-import android.view.View;
-
-import com.android.internal.logging.nano.MetricsProto;
-
-import java.util.List;
-
-/**
- * ViewHolder for intent based search results.
- * The DatabaseResultLoader is the primary use case for this ViewHolder.
- */
-public class IntentSearchViewHolder extends SearchViewHolder {
-
- private static final String TAG = "IntentSearchViewHolder";
- @VisibleForTesting
- static final int REQUEST_CODE_NO_OP = 0;
-
- public IntentSearchViewHolder(View view) {
- super(view);
- }
-
- @Override
- public int getClickActionMetricName() {
- return MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT;
- }
-
- @Override
- public void onBind(final SearchFragment fragment, final SearchResult result) {
- super.onBind(fragment, result);
-
- itemView.setOnClickListener(v -> {
- fragment.onSearchResultClicked(this, result);
- final Intent intent = result.payload.getIntent();
- // Use app user id to support work profile use case.
- if (result instanceof AppSearchResult) {
- AppSearchResult appResult = (AppSearchResult) result;
- UserHandle userHandle = appResult.getAppUserHandle();
- fragment.getActivity().startActivityAsUser(intent, userHandle);
- } else {
- final PackageManager pm = fragment.getActivity().getPackageManager();
- final List<ResolveInfo> info = pm.queryIntentActivities(intent, 0 /* flags */);
- if (info != null && !info.isEmpty()) {
- fragment.startActivityForResult(intent, REQUEST_CODE_NO_OP);
- } else {
- Log.e(TAG, "Cannot launch search result, title: "
- + result.title + ", " + intent);
- }
- }
- });
- }
-}
diff --git a/src/com/android/settings/search/SavedQueryController.java b/src/com/android/settings/search/SavedQueryController.java
deleted file mode 100644
index eaba3d6..0000000
--- a/src/com/android/settings/search/SavedQueryController.java
+++ /dev/null
@@ -1,127 +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.search;
-
-import android.app.LoaderManager;
-import android.content.Context;
-import android.content.Loader;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.android.settings.R;
-import com.android.settings.overlay.FeatureFactory;
-
-import java.util.List;
-
-public class SavedQueryController implements LoaderManager.LoaderCallbacks,
- MenuItem.OnMenuItemClickListener {
-
- // TODO: make a generic background task manager to handle one-off tasks like this one.
- private static final String ARG_QUERY = "remove_query";
- private static final String TAG = "SearchSavedQueryCtrl";
-
- private static final int MENU_SEARCH_HISTORY = 1000;
-
- private final Context mContext;
- private final LoaderManager mLoaderManager;
- private final SearchFeatureProvider mSearchFeatureProvider;
- private final SearchResultsAdapter mResultAdapter;
-
- public SavedQueryController(Context context, LoaderManager loaderManager,
- SearchResultsAdapter resultsAdapter) {
- mContext = context;
- mLoaderManager = loaderManager;
- mResultAdapter = resultsAdapter;
- mSearchFeatureProvider = FeatureFactory.getFactory(context)
- .getSearchFeatureProvider();
- }
-
- @Override
- public Loader onCreateLoader(int id, Bundle args) {
- switch (id) {
- case SearchFragment.SearchLoaderId.SAVE_QUERY_TASK:
- return new SavedQueryRecorder(mContext, args.getString(ARG_QUERY));
- case SearchFragment.SearchLoaderId.REMOVE_QUERY_TASK:
- return new SavedQueryRemover(mContext);
- case SearchFragment.SearchLoaderId.SAVED_QUERIES:
- return mSearchFeatureProvider.getSavedQueryLoader(mContext);
- }
- return null;
- }
-
- @Override
- public void onLoadFinished(Loader loader, Object data) {
- switch (loader.getId()) {
- case SearchFragment.SearchLoaderId.REMOVE_QUERY_TASK:
- mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.SAVED_QUERIES,
- null /* args */, this /* callback */);
- break;
- case SearchFragment.SearchLoaderId.SAVED_QUERIES:
- if (SettingsSearchIndexablesProvider.DEBUG) {
- Log.d(TAG, "Saved queries loaded");
- }
- mResultAdapter.displaySavedQuery((List<SearchResult>) data);
- break;
- }
- }
-
- @Override
- public void onLoaderReset(Loader loader) {
- }
-
- @Override
- public boolean onMenuItemClick(MenuItem item) {
- if (item.getItemId() != MENU_SEARCH_HISTORY) {
- return false;
- }
- removeQueries();
- return true;
- }
-
- public void buildMenuItem(Menu menu) {
- final MenuItem item =
- menu.add(Menu.NONE, MENU_SEARCH_HISTORY, Menu.NONE, R.string.search_clear_history);
- item.setOnMenuItemClickListener(this);
- }
-
- public void saveQuery(String query) {
- final Bundle args = new Bundle();
- args.putString(ARG_QUERY, query);
- mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.SAVE_QUERY_TASK, args,
- this /* callback */);
- }
-
- /**
- * Remove all saved queries from DB
- */
- public void removeQueries() {
- final Bundle args = new Bundle();
- mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.REMOVE_QUERY_TASK, args,
- this /* callback */);
- }
-
- public void loadSavedQueries() {
- if (SettingsSearchIndexablesProvider.DEBUG) {
- Log.d(TAG, "loading saved queries");
- }
- mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.SAVED_QUERIES, null /* args */,
- this /* callback */);
- }
-}
diff --git a/src/com/android/settings/search/SavedQueryLoader.java b/src/com/android/settings/search/SavedQueryLoader.java
deleted file mode 100644
index 5df3610..0000000
--- a/src/com/android/settings/search/SavedQueryLoader.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.search;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.VisibleForTesting;
-
-import com.android.settings.search.IndexDatabaseHelper.SavedQueriesColumns;
-import com.android.settingslib.utils.AsyncLoader;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Loader for recently searched queries.
- */
-public class SavedQueryLoader extends AsyncLoader<List<? extends SearchResult>> {
-
- // Max number of proposed suggestions
- @VisibleForTesting
- static final int MAX_PROPOSED_SUGGESTIONS = 5;
-
- private final SQLiteDatabase mDatabase;
-
- public SavedQueryLoader(Context context) {
- super(context);
- mDatabase = IndexDatabaseHelper.getInstance(context).getReadableDatabase();
- }
-
- @Override
- protected void onDiscardResult(List<? extends SearchResult> result) {
-
- }
-
- @Override
- public List<? extends SearchResult> loadInBackground() {
- try (final Cursor cursor = mDatabase.query(
- IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES /* table */,
- new String[]{SavedQueriesColumns.QUERY} /* columns */,
- null /* selection */,
- null /* selectionArgs */,
- null /* groupBy */,
- null /* having */,
- "rowId DESC" /* orderBy */,
- String.valueOf(MAX_PROPOSED_SUGGESTIONS) /* limit */)) {
- return convertCursorToResult(cursor);
- }
- }
-
- private List<SearchResult> convertCursorToResult(Cursor cursor) {
- final List<SearchResult> results = new ArrayList<>();
- while (cursor.moveToNext()) {
- final SavedQueryPayload payload = new SavedQueryPayload(
- cursor.getString(cursor.getColumnIndex(SavedQueriesColumns.QUERY)));
- results.add(new SearchResult.Builder()
- .setStableId(payload.hashCode())
- .setTitle(payload.query)
- .setPayload(payload)
- .build());
- }
- return results;
- }
-}
diff --git a/src/com/android/settings/search/SavedQueryPayload.java b/src/com/android/settings/search/SavedQueryPayload.java
deleted file mode 100644
index 0a151fc..0000000
--- a/src/com/android/settings/search/SavedQueryPayload.java
+++ /dev/null
@@ -1,67 +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.search;
-
-import android.os.Parcel;
-import android.support.annotation.VisibleForTesting;
-
-/**
- * {@link ResultPayload} for saved query.
- */
-public class SavedQueryPayload extends ResultPayload {
-
- public final String query;
-
- public SavedQueryPayload(String query) {
- super(null /* Intent */);
- this.query = query;
- }
-
- @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
- SavedQueryPayload(Parcel in) {
- super(null /* Intent */);
- query = in.readString();
- }
-
- @Override
- public int getType() {
- return PayloadType.SAVED_QUERY;
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(query);
- }
-
- public static final Creator<SavedQueryPayload> CREATOR = new Creator<SavedQueryPayload>() {
- @Override
- public SavedQueryPayload createFromParcel(Parcel in) {
- return new SavedQueryPayload(in);
- }
-
- @Override
- public SavedQueryPayload[] newArray(int size) {
- return new SavedQueryPayload[size];
- }
- };
-}
diff --git a/src/com/android/settings/search/SavedQueryRecorder.java b/src/com/android/settings/search/SavedQueryRecorder.java
deleted file mode 100644
index b3b0bb8..0000000
--- a/src/com/android/settings/search/SavedQueryRecorder.java
+++ /dev/null
@@ -1,98 +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.search;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.util.Log;
-
-import com.android.settings.search.IndexDatabaseHelper;
-import com.android.settingslib.utils.AsyncLoader;
-
-import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES;
-
-/**
- * A background task to update saved queries.
- */
-public class SavedQueryRecorder extends AsyncLoader<Void> {
-
- private static final String LOG_TAG = "SavedQueryRecorder";
-
- // Max number of saved search queries (who will be used for proposing suggestions)
- private static long MAX_SAVED_SEARCH_QUERY = 64;
-
- private final String mQuery;
-
- public SavedQueryRecorder(Context context, String query) {
- super(context);
- mQuery = query;
- }
-
- @Override
- protected void onDiscardResult(Void result) {
-
- }
-
- @Override
- public Void loadInBackground() {
- final long now = System.currentTimeMillis();
-
- final ContentValues values = new ContentValues();
- values.put(IndexDatabaseHelper.SavedQueriesColumns.QUERY, mQuery);
- values.put(IndexDatabaseHelper.SavedQueriesColumns.TIME_STAMP, now);
-
- final SQLiteDatabase database = getWritableDatabase();
- if (database == null) {
- return null;
- }
-
- long lastInsertedRowId;
- try {
- // First, delete all saved queries that are the same
- database.delete(TABLE_SAVED_QUERIES,
- IndexDatabaseHelper.SavedQueriesColumns.QUERY + " = ?",
- new String[]{mQuery});
-
- // Second, insert the saved query
- lastInsertedRowId = database.insertOrThrow(TABLE_SAVED_QUERIES, null, values);
-
- // Last, remove "old" saved queries
- final long delta = lastInsertedRowId - MAX_SAVED_SEARCH_QUERY;
- if (delta > 0) {
- int count = database.delete(TABLE_SAVED_QUERIES,
- "rowId <= ?",
- new String[]{Long.toString(delta)});
- Log.d(LOG_TAG, "Deleted '" + count + "' saved Search query(ies)");
- }
- } catch (Exception e) {
- Log.d(LOG_TAG, "Cannot update saved Search queries", e);
- }
- return null;
- }
-
- private SQLiteDatabase getWritableDatabase() {
- try {
- return IndexDatabaseHelper.getInstance(getContext()).getWritableDatabase();
- } catch (SQLiteException e) {
- Log.e(LOG_TAG, "Cannot open writable database", e);
- return null;
- }
- }
-}
diff --git a/src/com/android/settings/search/SavedQueryRemover.java b/src/com/android/settings/search/SavedQueryRemover.java
deleted file mode 100644
index c6abe97..0000000
--- a/src/com/android/settings/search/SavedQueryRemover.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.search;
-
-import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.util.Log;
-
-import com.android.settingslib.utils.AsyncLoader;
-
-public class SavedQueryRemover extends AsyncLoader<Void> {
-
- private static final String LOG_TAG = "SavedQueryRemover";
-
- public SavedQueryRemover(Context context) {
- super(context);
- }
-
- @Override
- public Void loadInBackground() {
- final SQLiteDatabase database = getWritableDatabase();
- try {
- // First, delete all saved queries that are the same
- database.delete(TABLE_SAVED_QUERIES,
- null /* where */,
- null /* whereArgs */);
- } catch (Exception e) {
- Log.d(LOG_TAG, "Cannot update saved Search queries", e);
- }
- return null;
- }
-
- @Override
- protected void onDiscardResult(Void result) {
-
- }
-
- private SQLiteDatabase getWritableDatabase() {
- try {
- return IndexDatabaseHelper.getInstance(getContext()).getWritableDatabase();
- } catch (SQLiteException e) {
- Log.e(LOG_TAG, "Cannot open writable database", e);
- return null;
- }
- }
-}
diff --git a/src/com/android/settings/search/SavedQueryViewHolder.java b/src/com/android/settings/search/SavedQueryViewHolder.java
deleted file mode 100644
index a8d449d..0000000
--- a/src/com/android/settings/search/SavedQueryViewHolder.java
+++ /dev/null
@@ -1,44 +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.search;
-
-import android.view.View;
-import android.widget.TextView;
-
-import com.android.internal.logging.nano.MetricsProto;
-
-public class SavedQueryViewHolder extends SearchViewHolder {
-
- public final TextView titleView;
-
- public SavedQueryViewHolder(View view) {
- super(view);
- titleView = view.findViewById(android.R.id.title);
- }
-
- @Override
- public int getClickActionMetricName() {
- return MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY;
- }
-
- @Override
- public void onBind(SearchFragment fragment, SearchResult result) {
- itemView.setOnClickListener(v -> fragment.onSavedQueryClicked(result.title));
- titleView.setText(result.title);
- }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/search/SearchActivity.java b/src/com/android/settings/search/SearchActivity.java
deleted file mode 100644
index 61a580b..0000000
--- a/src/com/android/settings/search/SearchActivity.java
+++ /dev/null
@@ -1,45 +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.search;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.os.Bundle;
-
-import android.view.WindowManager;
-import com.android.settings.R;
-
-public class SearchActivity extends Activity {
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.search_main);
- // Keeps layouts in-place when keyboard opens.
- getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
-
- FragmentManager fragmentManager = getFragmentManager();
- Fragment fragment = fragmentManager.findFragmentById(R.id.main_content);
- if (fragment == null) {
- fragmentManager.beginTransaction()
- .add(R.id.main_content, new SearchFragment())
- .commit();
- }
- }
-}
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index 437fc86..cbe49f8 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -21,17 +21,9 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-import android.util.FeatureFlagUtils;
-import android.util.Pair;
-import android.view.View;
import android.widget.Toolbar;
-import com.android.settings.core.FeatureFlags;
-import com.android.settings.dashboard.SiteMapManager;
-
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.FutureTask;
+import com.android.settings.overlay.FeatureFactory;
/**
* FeatureProvider for Settings Search
@@ -50,125 +42,19 @@
throws SecurityException, IllegalArgumentException;
/**
- * Returns a new loader to get settings search results.
- */
- SearchResultLoader getSearchResultLoader(Context context, String query);
-
- /**
- * Returns a new loader to search in index database.
- */
- DatabaseResultLoader getStaticSearchResultTask(Context context, String query);
-
- /**
- * Returns a new loader to search installed apps.
- */
- InstalledAppResultLoader getInstalledAppSearchTask(Context context, String query);
-
- /**
- * Returns a new loader to search accessibility services.
- */
- AccessibilityServiceResultLoader getAccessibilityServiceResultTask(Context context,
- String query);
-
- /**
- * Returns a new loader to search input devices.
- */
- InputDeviceResultLoader getInputDeviceResultTask(Context context, String query);
-
- /**
- * Returns a new loader to get all recently saved queries search terms.
- */
- SavedQueryLoader getSavedQueryLoader(Context context);
-
- /**
- * Returns the manager for indexing Settings data.
- */
- DatabaseIndexingManager getIndexingManager(Context context);
-
- /**
- * Returns the manager for looking up breadcrumbs.
- */
- SiteMapManager getSiteMapManager();
-
- /**
- * Updates the Settings indexes and calls {@link IndexingCallback#onIndexingFinished()} on
- * {@param callback} when indexing is complete.
- */
- void updateIndexAsync(Context context, IndexingCallback callback);
-
- /**
* Synchronously updates the Settings database.
*/
void updateIndex(Context context);
- /**
- * @returns true when indexing is complete.
- */
- boolean isIndexingComplete(Context context);
+ DatabaseIndexingManager getIndexingManager(Context context);
/**
- * @return a {@link ExecutorService} to be shared between search tasks.
+ * @return a {@link SearchIndexableResources} to be used for indexing search results.
*/
- ExecutorService getExecutorService();
+ SearchIndexableResources getSearchIndexableResources();
- /**
- * Initializes the feedback button in case it was dismissed.
- */
- default void initFeedbackButton() {
- }
-
- /**
- * Show a button users can click to submit feedback on the quality of the search results.
- */
- default void showFeedbackButton(SearchFragment fragment, View view) {
- }
-
- /**
- * Hide the feedback button shown by
- * {@link #showFeedbackButton(SearchFragment fragment, View view) showFeedbackButton}
- */
- default void hideFeedbackButton() {
- }
-
- /**
- * Notify that a search result is clicked.
- *
- * @param context application context
- * @param query input user query
- * @param searchResult clicked result
- */
- default void searchResultClicked(Context context, String query, SearchResult searchResult) {
- }
-
- /**
- * @return true to enable search ranking.
- */
- default boolean isSmartSearchRankingEnabled(Context context) {
- return false;
- }
-
- /**
- * @return smart ranking timeout in milliseconds.
- */
- default long smartSearchRankingTimeoutMs(Context context) {
- return 300L;
- }
-
- /**
- * Prepare for search ranking predictions to avoid latency on the first prediction call.
- */
- default void searchRankingWarmup(Context context) {
- }
-
- /**
- * Return a FutureTask to get a list of scores for search results.
- */
- default FutureTask<List<Pair<String, Float>>> getRankerTask(Context context, String query) {
- return null;
- }
-
- default boolean isSearchV2Enabled(Context context) {
- return FeatureFlagUtils.isEnabled(context, FeatureFlags.SEARCH_V2);
+ default String getSettingsIntelligencePkgName() {
+ return "com.android.settings.intelligence";
}
/**
@@ -179,12 +65,12 @@
return;
}
toolbar.setOnClickListener(tb -> {
- final Intent intent;
- if (isSearchV2Enabled(activity)) {
- intent = SEARCH_UI_INTENT;
- } else {
- intent = new Intent(activity, SearchActivity.class);
- }
+ final Intent intent = SEARCH_UI_INTENT;
+ intent.setPackage(getSettingsIntelligencePkgName());
+
+ FeatureFactory.getFactory(
+ activity.getApplicationContext()).getSlicesFeatureProvider()
+ .indexSliceDataAsync(activity.getApplicationContext());
activity.startActivityForResult(intent, 0 /* requestCode */);
});
}
diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
index 1c96714..78c47ed 100644
--- a/src/com/android/settings/search/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java
@@ -20,17 +20,12 @@
import android.content.ComponentName;
import android.content.Context;
import android.text.TextUtils;
-import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.dashboard.SiteMapManager;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.indexing.IndexData;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.Locale;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
/**
* FeatureProvider for the refactored search code.
@@ -41,8 +36,7 @@
private static final String METRICS_ACTION_SETTINGS_INDEX = "search_synchronous_indexing";
private DatabaseIndexingManager mDatabaseIndexingManager;
- private SiteMapManager mSiteMapManager;
- private ExecutorService mExecutorService;
+ private SearchIndexableResources mSearchIndexableResources;
@Override
public void verifyLaunchSearchResultPageCaller(Context context, ComponentName caller) {
@@ -63,40 +57,6 @@
}
@Override
- public SearchResultLoader getSearchResultLoader(Context context, String query) {
- return new SearchResultLoader(context, cleanQuery(query));
- }
-
- @Override
- public DatabaseResultLoader getStaticSearchResultTask(Context context, String query) {
- return new DatabaseResultLoader(context, cleanQuery(query), getSiteMapManager());
- }
-
- @Override
- public InstalledAppResultLoader getInstalledAppSearchTask(Context context, String query) {
- return new InstalledAppResultLoader(
- context, new PackageManagerWrapper(context.getPackageManager()),
- cleanQuery(query), getSiteMapManager());
- }
-
- @Override
- public AccessibilityServiceResultLoader getAccessibilityServiceResultTask(Context context,
- String query) {
- return new AccessibilityServiceResultLoader(context, cleanQuery(query),
- getSiteMapManager());
- }
-
- @Override
- public InputDeviceResultLoader getInputDeviceResultTask(Context context, String query) {
- return new InputDeviceResultLoader(context, cleanQuery(query), getSiteMapManager());
- }
-
- @Override
- public SavedQueryLoader getSavedQueryLoader(Context context) {
- return new SavedQueryLoader(context);
- }
-
- @Override
public DatabaseIndexingManager getIndexingManager(Context context) {
if (mDatabaseIndexingManager == null) {
mDatabaseIndexingManager = new DatabaseIndexingManager(context.getApplicationContext());
@@ -105,26 +65,6 @@
}
@Override
- public boolean isIndexingComplete(Context context) {
- return getIndexingManager(context).isIndexingComplete();
- }
-
- public SiteMapManager getSiteMapManager() {
- if (mSiteMapManager == null) {
- mSiteMapManager = new SiteMapManager();
- }
- return mSiteMapManager;
- }
-
- @Override
- public void updateIndexAsync(Context context, IndexingCallback callback) {
- if (SettingsSearchIndexablesProvider.DEBUG) {
- Log.d(TAG, "updating index async");
- }
- getIndexingManager(context).indexDatabase(callback);
- }
-
- @Override
public void updateIndex(Context context) {
long indexStartTime = System.currentTimeMillis();
getIndexingManager(context).performIndexing();
@@ -134,21 +74,17 @@
}
@Override
- public ExecutorService getExecutorService() {
- if (mExecutorService == null) {
- mExecutorService = Executors.newCachedThreadPool();
+ public SearchIndexableResources getSearchIndexableResources() {
+ if (mSearchIndexableResources == null) {
+ mSearchIndexableResources = new SearchIndexableResourcesImpl();
}
- return mExecutorService;
+ return mSearchIndexableResources;
}
protected boolean isSignatureWhitelisted(Context context, String callerPackage) {
return false;
}
- protected String getSettingsIntelligencePkgName() {
- return "com.android.settings.intelligence";
- }
-
/**
* A generic method to make the query suitable for searching the database.
*
diff --git a/src/com/android/settings/search/SearchFragment.java b/src/com/android/settings/search/SearchFragment.java
deleted file mode 100644
index ed7a2ee..0000000
--- a/src/com/android/settings/search/SearchFragment.java
+++ /dev/null
@@ -1,433 +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.search;
-
-import android.app.Activity;
-import android.app.LoaderManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.Loader;
-import android.os.Bundle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.util.EventLog;
-import android.util.Log;
-import android.util.Pair;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.LinearLayout;
-import android.widget.SearchView;
-import android.widget.TextView;
-import android.widget.Toolbar;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.EventLogTags;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.ActionBarShadowController;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * This fragment manages the lifecycle of indexing and searching.
- *
- * In onCreate, the indexing process is initiated in DatabaseIndexingManager.
- * While the indexing is happening, loaders are blocked from accessing the database, but the user
- * is free to start typing their query.
- *
- * When the indexing is complete, the fragment gets a callback to initialize the loaders and search
- * the query if the user has entered text.
- */
-public class SearchFragment extends InstrumentedFragment implements SearchView.OnQueryTextListener,
- LoaderManager.LoaderCallbacks<List<? extends SearchResult>>, IndexingCallback {
- private static final String TAG = "SearchFragment";
-
- // State values
- private static final String STATE_QUERY = "state_query";
- private static final String STATE_SHOWING_SAVED_QUERY = "state_showing_saved_query";
- private static final String STATE_NEVER_ENTERED_QUERY = "state_never_entered_query";
-
- static final class SearchLoaderId {
- // Search Query IDs
- public static final int SEARCH_RESULT = 1;
-
- // Saved Query IDs
- public static final int SAVE_QUERY_TASK = 2;
- public static final int REMOVE_QUERY_TASK = 3;
- public static final int SAVED_QUERIES = 4;
- }
-
- @VisibleForTesting
- String mQuery;
-
- private boolean mNeverEnteredQuery = true;
- @VisibleForTesting
- boolean mShowingSavedQuery;
- private MetricsFeatureProvider mMetricsFeatureProvider;
- @VisibleForTesting
- SavedQueryController mSavedQueryController;
-
- @VisibleForTesting
- SearchFeatureProvider mSearchFeatureProvider;
-
- @VisibleForTesting
- SearchResultsAdapter mSearchAdapter;
-
- @VisibleForTesting
- RecyclerView mResultsRecyclerView;
- @VisibleForTesting
- SearchView mSearchView;
- @VisibleForTesting
- LinearLayout mNoResultsView;
-
- @VisibleForTesting
- final RecyclerView.OnScrollListener mScrollListener = new RecyclerView.OnScrollListener() {
- @Override
- public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
- if (dy != 0) {
- hideKeyboard();
- }
- }
- };
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.DASHBOARD_SEARCH_RESULTS;
- }
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
- mSearchFeatureProvider = FeatureFactory.getFactory(context).getSearchFeatureProvider();
- mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- long startTime = System.currentTimeMillis();
- setHasOptionsMenu(true);
-
- final LoaderManager loaderManager = getLoaderManager();
- mSearchAdapter = new SearchResultsAdapter(this /* fragment */);
- mSavedQueryController = new SavedQueryController(
- getContext(), loaderManager, mSearchAdapter);
- mSearchFeatureProvider.initFeedbackButton();
-
- if (savedInstanceState != null) {
- mQuery = savedInstanceState.getString(STATE_QUERY);
- mNeverEnteredQuery = savedInstanceState.getBoolean(STATE_NEVER_ENTERED_QUERY);
- mShowingSavedQuery = savedInstanceState.getBoolean(STATE_SHOWING_SAVED_QUERY);
- } else {
- mShowingSavedQuery = true;
- }
-
- final Activity activity = getActivity();
- // Run the Index update only if we have some space
- if (!Utils.isLowStorage(activity)) {
- mSearchFeatureProvider.updateIndexAsync(activity, this /* indexingCallback */);
- } else {
- Log.w(TAG, "Cannot update the Indexer as we are running low on storage space!");
- }
- if (SettingsSearchIndexablesProvider.DEBUG) {
- Log.d(TAG, "onCreate spent " + (System.currentTimeMillis() - startTime) + " ms");
- }
- }
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- super.onCreateOptionsMenu(menu, inflater);
- mSavedQueryController.buildMenuItem(menu);
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- final View view = inflater.inflate(R.layout.search_panel, container, false);
- mResultsRecyclerView = view.findViewById(R.id.list_results);
- mResultsRecyclerView.setAdapter(mSearchAdapter);
- mResultsRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
- mResultsRecyclerView.addOnScrollListener(mScrollListener);
-
- mNoResultsView = view.findViewById(R.id.no_results_layout);
-
- Toolbar toolbar = view.findViewById(R.id.search_toolbar);
- getActivity().setActionBar(toolbar);
- getActivity().getActionBar().setDisplayHomeAsUpEnabled(true);
-
- mSearchView = toolbar.findViewById(R.id.search_view);
- mSearchView.setQuery(mQuery, false /* submitQuery */);
- mSearchView.setOnQueryTextListener(this);
- mSearchView.requestFocus();
-
- // Updating internal views inside SearchView was the easiest way to get this too look right.
- // Instead of grabbing the TextView directly, we grab it as a view and do an instanceof
- // check. This ensures if we return, say, a LinearLayout in the tests, they won't fail.
- View searchText = mSearchView.findViewById(com.android.internal.R.id.search_src_text);
- if (searchText instanceof TextView) {
- TextView searchTextView = (TextView) searchText;
- searchTextView.setTextColor(getContext().getColorStateList(
- com.android.internal.R.color.text_color_primary));
- searchTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
- getResources().getDimension(R.dimen.search_bar_text_size));
-
- }
- View editFrame = mSearchView.findViewById(com.android.internal.R.id.search_edit_frame);
- if (editFrame != null) {
- ViewGroup.MarginLayoutParams params =
- (ViewGroup.MarginLayoutParams) editFrame.getLayoutParams();
- params.setMarginStart(0);
- editFrame.setLayoutParams(params);
- }
- ActionBarShadowController.attachToRecyclerView(
- view.findViewById(R.id.search_bar_container), getLifecycle(), mResultsRecyclerView);
- return view;
- }
-
- @Override
- public void onResume() {
- super.onResume();
- Context appContext = getContext().getApplicationContext();
- if (mSearchFeatureProvider.isSmartSearchRankingEnabled(appContext)) {
- mSearchFeatureProvider.searchRankingWarmup(appContext);
- }
- requery();
- }
-
- @Override
- public void onStop() {
- super.onStop();
- final Activity activity = getActivity();
- if (activity != null && activity.isFinishing()) {
- if (mNeverEnteredQuery) {
- mMetricsFeatureProvider.action(activity,
- MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY);
- }
- }
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- outState.putString(STATE_QUERY, mQuery);
- outState.putBoolean(STATE_NEVER_ENTERED_QUERY, mNeverEnteredQuery);
- outState.putBoolean(STATE_SHOWING_SAVED_QUERY, mShowingSavedQuery);
- }
-
- @Override
- public boolean onQueryTextChange(String query) {
- if (TextUtils.equals(query, mQuery)) {
- return true;
- }
-
- final boolean isEmptyQuery = TextUtils.isEmpty(query);
-
- // Hide no-results-view when the new query is not a super-string of the previous
- if (mQuery != null
- && mNoResultsView.getVisibility() == View.VISIBLE
- && query.length() < mQuery.length()) {
- mNoResultsView.setVisibility(View.GONE);
- }
-
- mNeverEnteredQuery = false;
- mQuery = query;
-
- // If indexing is not finished, register the query text, but don't search.
- if (!mSearchFeatureProvider.isIndexingComplete(getActivity())) {
- return true;
- }
-
- if (isEmptyQuery) {
- final LoaderManager loaderManager = getLoaderManager();
- loaderManager.destroyLoader(SearchLoaderId.SEARCH_RESULT);
- mShowingSavedQuery = true;
- mSavedQueryController.loadSavedQueries();
- mSearchFeatureProvider.hideFeedbackButton();
- } else {
- restartLoaders();
- }
-
- return true;
- }
-
- @Override
- public boolean onQueryTextSubmit(String query) {
- // Save submitted query.
- mSavedQueryController.saveQuery(mQuery);
- hideKeyboard();
- return true;
- }
-
- @Override
- public Loader<List<? extends SearchResult>> onCreateLoader(int id, Bundle args) {
- final Activity activity = getActivity();
-
- switch(id) {
- case SearchLoaderId.SEARCH_RESULT:
- return mSearchFeatureProvider.getSearchResultLoader(activity, mQuery);
- default:
- return null;
- }
- }
-
- @Override
- public void onLoadFinished(Loader<List<? extends SearchResult>> loader,
- List<? extends SearchResult> data) {
- mSearchAdapter.postSearchResults(data);
- }
-
- @Override
- public void onLoaderReset(Loader<List<? extends SearchResult>> loader) {
- }
-
- /**
- * Gets called when Indexing is completed.
- */
- @Override
- public void onIndexingFinished() {
- if (getActivity() == null) {
- return;
- }
- if (mShowingSavedQuery) {
- mSavedQueryController.loadSavedQueries();
- } else {
- final LoaderManager loaderManager = getLoaderManager();
- loaderManager.initLoader(SearchLoaderId.SEARCH_RESULT, null /* args */,
- this /* callback */);
- }
-
- requery();
- }
-
- public void onSearchResultClicked(SearchViewHolder resultViewHolder, SearchResult result,
- Pair<Integer, Object>... logTaggedData) {
- logSearchResultClicked(resultViewHolder, result, logTaggedData);
- mSearchFeatureProvider.searchResultClicked(getContext(), mQuery, result);
- mSavedQueryController.saveQuery(mQuery);
- }
-
- public void onSearchResultsDisplayed(int resultCount) {
- if (resultCount == 0) {
- mNoResultsView.setVisibility(View.VISIBLE);
- mMetricsFeatureProvider.visible(getContext(), getMetricsCategory(),
- MetricsEvent.SETTINGS_SEARCH_NO_RESULT);
- // Log settings_latency for search end-to-end.
- EventLog.writeEvent(EventLogTags.SETTINGS_LATENCY, 1, 10);
- } else {
- mNoResultsView.setVisibility(View.GONE);
- mResultsRecyclerView.scrollToPosition(0);
- }
- mMetricsFeatureProvider.action(
- getVisibilityLogger(), MetricsEvent.ACTION_SEARCH_RESULTS, 1);
- mSearchFeatureProvider.showFeedbackButton(this, getView());
- }
-
- public void onSavedQueryClicked(CharSequence query) {
- final String queryString = query.toString();
- mMetricsFeatureProvider.action(getContext(),
- MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY);
- mSearchView.setQuery(queryString, false /* submit */);
- onQueryTextChange(queryString);
- }
-
- private void restartLoaders() {
- mShowingSavedQuery = false;
- final LoaderManager loaderManager = getLoaderManager();
- loaderManager.restartLoader(
- SearchLoaderId.SEARCH_RESULT, null /* args */, this /* callback */);
- }
-
- public String getQuery() {
- return mQuery;
- }
-
- public List<SearchResult> getSearchResults() {
- return mSearchAdapter.getSearchResults();
- }
-
- private void requery() {
- if (TextUtils.isEmpty(mQuery)) {
- return;
- }
- final String query = mQuery;
- mQuery = "";
- onQueryTextChange(query);
- }
-
- private void hideKeyboard() {
- final Activity activity = getActivity();
- if (activity != null) {
- View view = activity.getCurrentFocus();
- InputMethodManager imm = (InputMethodManager)
- activity.getSystemService(Context.INPUT_METHOD_SERVICE);
- imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
- }
-
- if (mResultsRecyclerView != null) {
- mResultsRecyclerView.requestFocus();
- }
- }
-
- private void logSearchResultClicked(SearchViewHolder resultViewHolder, SearchResult result,
- Pair<Integer, Object>... logTaggedData) {
- final Intent intent = result.payload.getIntent();
- if (intent == null) {
- Log.w(TAG, "Skipped logging click on search result because of null intent, which can " +
- "happen on saved query results.");
- return;
- }
- final ComponentName cn = intent.getComponent();
- String resultName = intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT);
- if (TextUtils.isEmpty(resultName) && cn != null) {
- resultName = cn.flattenToString();
- }
- final List<Pair<Integer, Object>> taggedData = new ArrayList<>();
- if (logTaggedData != null) {
- taggedData.addAll(Arrays.asList(logTaggedData));
- }
- taggedData.add(Pair.create(
- MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_COUNT,
- mSearchAdapter.getItemCount()));
- taggedData.add(Pair.create(
- MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_RANK,
- resultViewHolder.getAdapterPosition()));
- // TODO (b/67744820) Move metrics to SettingsIntelligence (including ranking state).
- taggedData.add(Pair.create(
- MetricsEvent.FIELD_SETTINGS_SEARCH_QUERY_LENGTH,
- TextUtils.isEmpty(mQuery) ? 0 : mQuery.length()));
-
- mMetricsFeatureProvider.action(getContext(),
- resultViewHolder.getClickActionMetricName(),
- resultName,
- taggedData.toArray(new Pair[0]));
- }
-}
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 0207c94..5a0a131 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 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,170 +16,14 @@
package com.android.settings.search;
-import android.support.annotation.VisibleForTesting;
-
-import com.android.settings.DateTimeSettings;
-import com.android.settings.DeviceInfoSettings;
-import com.android.settings.DisplaySettings;
-import com.android.settings.LegalSettings;
-import com.android.settings.accessibility.AccessibilitySettings;
-import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
-import com.android.settings.accessibility.MagnificationPreferenceFragment;
-import com.android.settings.accounts.UserAndAccountDashboardFragment;
-import com.android.settings.applications.AppAndNotificationDashboardFragment;
-import com.android.settings.applications.DefaultAppSettings;
-import com.android.settings.applications.SpecialAccessSettings;
-import com.android.settings.applications.assist.ManageAssist;
-import com.android.settings.backup.BackupSettingsActivity;
-import com.android.settings.backup.BackupSettingsFragment;
-import com.android.settings.bluetooth.BluetoothSettings;
-import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
-import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
-import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld;
-import com.android.settings.datausage.DataUsageMeteredSettings;
-import com.android.settings.datausage.DataUsageSummary;
-import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
-import com.android.settings.development.DevelopmentSettingsDashboardFragment;
-import com.android.settings.deviceinfo.StorageDashboardFragment;
-import com.android.settings.deviceinfo.StorageSettings;
-import com.android.settings.display.AmbientDisplaySettings;
-import com.android.settings.display.NightDisplaySettings;
-import com.android.settings.display.ScreenZoomSettings;
-import com.android.settings.dream.DreamSettings;
-import com.android.settings.enterprise.EnterprisePrivacySettings;
-import com.android.settings.fuelgauge.BatterySaverSettings;
-import com.android.settings.fuelgauge.PowerUsageAdvanced;
-import com.android.settings.fuelgauge.PowerUsageSummary;
-import com.android.settings.gestures.AssistGestureSettings;
-import com.android.settings.gestures.DoubleTapPowerSettings;
-import com.android.settings.gestures.DoubleTapScreenSettings;
-import com.android.settings.gestures.DoubleTwistGestureSettings;
-import com.android.settings.gestures.GestureSettings;
-import com.android.settings.gestures.PickupGestureSettings;
-import com.android.settings.gestures.SwipeToNotificationSettings;
-import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
-import com.android.settings.inputmethod.PhysicalKeyboardFragment;
-import com.android.settings.inputmethod.VirtualKeyboardFragment;
-import com.android.settings.language.LanguageAndInputSettings;
-import com.android.settings.location.LocationMode;
-import com.android.settings.location.LocationSettings;
-import com.android.settings.location.ScanningSettings;
-import com.android.settings.network.NetworkDashboardFragment;
-import com.android.settings.nfc.PaymentSettings;
-import com.android.settings.notification.ConfigureNotificationSettings;
-import com.android.settings.notification.SoundSettings;
-import com.android.settings.notification.ZenModeAutomationSettings;
-import com.android.settings.notification.ZenModeBehaviorSettings;
-import com.android.settings.notification.ZenModeSettings;
-import com.android.settings.print.PrintSettingsFragment;
-import com.android.settings.security.EncryptionAndCredential;
-import com.android.settings.security.LockscreenDashboardFragment;
-import com.android.settings.security.ScreenPinningSettings;
-import com.android.settings.security.SecuritySettingsV2;
-import com.android.settings.security.screenlock.ScreenLockSettings;
-import com.android.settings.sim.SimSettings;
-import com.android.settings.support.SupportDashboardActivity;
-import com.android.settings.system.ResetDashboardFragment;
-import com.android.settings.system.SystemDashboardFragment;
-import com.android.settings.tts.TextToSpeechSettings;
-import com.android.settings.tts.TtsEnginePreferenceFragment;
-import com.android.settings.users.UserSettings;
-import com.android.settings.wallpaper.WallpaperTypeSettings;
-import com.android.settings.wfd.WifiDisplaySettings;
-import com.android.settings.wifi.ConfigureWifiSettings;
-import com.android.settings.wifi.WifiSettings;
-
import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-public final class SearchIndexableResources {
+public interface SearchIndexableResources {
- @VisibleForTesting
- static final Set<Class> sProviders = new HashSet<>();
-
- @VisibleForTesting
- static void addIndex(Class indexClass) {
- sProviders.add(indexClass);
- }
-
- static {
- addIndex(WifiSettings.class);
- addIndex(NetworkDashboardFragment.class);
- addIndex(ConfigureWifiSettings.class);
- addIndex(BluetoothSettings.class);
- addIndex(SimSettings.class);
- addIndex(DataUsageSummary.class);
- addIndex(DataUsageMeteredSettings.class);
- addIndex(ScreenZoomSettings.class);
- addIndex(DisplaySettings.class);
- addIndex(AmbientDisplaySettings.class);
- addIndex(WallpaperTypeSettings.class);
- addIndex(AppAndNotificationDashboardFragment.class);
- addIndex(SoundSettings.class);
- addIndex(ZenModeSettings.class);
- addIndex(StorageSettings.class);
- addIndex(PowerUsageAdvanced.class);
- addIndex(DefaultAppSettings.class);
- addIndex(ManageAssist.class);
- addIndex(SpecialAccessSettings.class);
- addIndex(UserSettings.class);
- addIndex(AssistGestureSettings.class);
- addIndex(PickupGestureSettings.class);
- addIndex(DoubleTapScreenSettings.class);
- addIndex(DoubleTapPowerSettings.class);
- addIndex(DoubleTwistGestureSettings.class);
- addIndex(SwipeToNotificationSettings.class);
- addIndex(GestureSettings.class);
- addIndex(LanguageAndInputSettings.class);
- addIndex(LocationSettings.class);
- addIndex(LocationMode.class);
- addIndex(ScanningSettings.class);
- addIndex(SecuritySettingsV2.class);
- addIndex(ScreenLockSettings.class);
- addIndex(EncryptionAndCredential.class);
- addIndex(ScreenPinningSettings.class);
- addIndex(UserAndAccountDashboardFragment.class);
- addIndex(VirtualKeyboardFragment.class);
- addIndex(AvailableVirtualKeyboardFragment.class);
- addIndex(PhysicalKeyboardFragment.class);
- addIndex(BackupSettingsActivity.class);
- addIndex(BackupSettingsFragment.class);
- addIndex(DateTimeSettings.class);
- addIndex(AccessibilitySettings.class);
- addIndex(PrintSettingsFragment.class);
- addIndex(DevelopmentSettingsDashboardFragment.class);
- addIndex(DeviceInfoSettings.class);
- addIndex(LegalSettings.class);
- addIndex(SystemDashboardFragment.class);
- addIndex(ResetDashboardFragment.class);
- addIndex(StorageDashboardFragment.class);
- addIndex(ConnectedDeviceDashboardFragment.class);
- addIndex(ConnectedDeviceDashboardFragmentOld.class);
- addIndex(AdvancedConnectedDeviceDashboardFragment.class);
- addIndex(EnterprisePrivacySettings.class);
- addIndex(PaymentSettings.class);
- addIndex(TextToSpeechSettings.class);
- addIndex(TtsEnginePreferenceFragment.class);
- addIndex(MagnificationPreferenceFragment.class);
- addIndex(AccessibilityShortcutPreferenceFragment.class);
- addIndex(DreamSettings.class);
- addIndex(SupportDashboardActivity.class);
- addIndex(AutomaticStorageManagerSettings.class);
- addIndex(ConfigureNotificationSettings.class);
- addIndex(PowerUsageSummary.class);
- addIndex(BatterySaverSettings.class);
- addIndex(LockscreenDashboardFragment.class);
- addIndex(WifiDisplaySettings.class);
- addIndex(ZenModeBehaviorSettings.class);
- addIndex(ZenModeAutomationSettings.class);
- addIndex(NightDisplaySettings.class);
- }
-
- private SearchIndexableResources() {
- }
-
- public static Collection<Class> providerValues() {
- return sProviders;
- }
-}
\ No newline at end of file
+ /**
+ * Returns a collection of classes that should be indexed for search.
+ *
+ * Each class should have the SEARCH_INDEX_DATA_PROVIDER public static member.
+ */
+ Collection<Class> getProviderValues();
+}
diff --git a/src/com/android/settings/search/SearchIndexableResourcesImpl.java b/src/com/android/settings/search/SearchIndexableResourcesImpl.java
new file mode 100644
index 0000000..faa4b8c
--- /dev/null
+++ b/src/com/android/settings/search/SearchIndexableResourcesImpl.java
@@ -0,0 +1,182 @@
+/*
+ * 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.search;
+
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.DateTimeSettings;
+import com.android.settings.DisplaySettings;
+import com.android.settings.LegalSettings;
+import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
+import com.android.settings.accessibility.AccessibilitySettings;
+import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
+import com.android.settings.accessibility.MagnificationPreferenceFragment;
+import com.android.settings.accounts.AccountDashboardFragment;
+import com.android.settings.applications.AppAndNotificationDashboardFragment;
+import com.android.settings.applications.DefaultAppSettings;
+import com.android.settings.applications.SpecialAccessSettings;
+import com.android.settings.applications.assist.ManageAssist;
+import com.android.settings.backup.BackupSettingsActivity;
+import com.android.settings.backup.BackupSettingsFragment;
+import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
+import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
+import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld;
+import com.android.settings.datausage.DataUsageSummary;
+import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.deviceinfo.DeviceInfoSettings;
+import com.android.settings.deviceinfo.StorageDashboardFragment;
+import com.android.settings.deviceinfo.StorageSettings;
+import com.android.settings.display.AmbientDisplaySettings;
+import com.android.settings.display.NightDisplaySettings;
+import com.android.settings.display.ScreenZoomSettings;
+import com.android.settings.dream.DreamSettings;
+import com.android.settings.enterprise.EnterprisePrivacySettings;
+import com.android.settings.fuelgauge.BatterySaverSettings;
+import com.android.settings.fuelgauge.PowerUsageAdvanced;
+import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.fuelgauge.SmartBatterySettings;
+import com.android.settings.gestures.AssistGestureSettings;
+import com.android.settings.gestures.DoubleTapPowerSettings;
+import com.android.settings.gestures.DoubleTapScreenSettings;
+import com.android.settings.gestures.DoubleTwistGestureSettings;
+import com.android.settings.gestures.GestureSettings;
+import com.android.settings.gestures.PickupGestureSettings;
+import com.android.settings.gestures.SwipeToNotificationSettings;
+import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
+import com.android.settings.inputmethod.PhysicalKeyboardFragment;
+import com.android.settings.inputmethod.VirtualKeyboardFragment;
+import com.android.settings.language.LanguageAndInputSettings;
+import com.android.settings.location.LocationSettings;
+import com.android.settings.location.ScanningSettings;
+import com.android.settings.network.NetworkDashboardFragment;
+import com.android.settings.nfc.PaymentSettings;
+import com.android.settings.notification.ConfigureNotificationSettings;
+import com.android.settings.notification.SoundSettings;
+import com.android.settings.notification.ZenModeAutomationSettings;
+import com.android.settings.notification.ZenModeBehaviorSettings;
+import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.security.EncryptionAndCredential;
+import com.android.settings.security.LockscreenDashboardFragment;
+import com.android.settings.security.ScreenPinningSettings;
+import com.android.settings.security.SecuritySettingsV2;
+import com.android.settings.security.screenlock.ScreenLockSettings;
+import com.android.settings.sim.SimSettings;
+import com.android.settings.support.SupportDashboardActivity;
+import com.android.settings.system.ResetDashboardFragment;
+import com.android.settings.system.SystemDashboardFragment;
+import com.android.settings.tts.TextToSpeechSettings;
+import com.android.settings.tts.TtsEnginePreferenceFragment;
+import com.android.settings.users.UserSettings;
+import com.android.settings.wallpaper.WallpaperTypeSettings;
+import com.android.settings.wfd.WifiDisplaySettings;
+import com.android.settings.wifi.ConfigureWifiSettings;
+import com.android.settings.wifi.WifiSettings;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+public class SearchIndexableResourcesImpl implements SearchIndexableResources {
+
+ private final Set<Class> sProviders = new HashSet<>();
+
+ @VisibleForTesting
+ void addIndex(Class indexClass) {
+ sProviders.add(indexClass);
+ }
+
+ public SearchIndexableResourcesImpl() {
+ addIndex(WifiSettings.class);
+ addIndex(NetworkDashboardFragment.class);
+ addIndex(ConfigureWifiSettings.class);
+ addIndex(BluetoothSettings.class);
+ addIndex(SimSettings.class);
+ addIndex(DataUsageSummary.class);
+ addIndex(ScreenZoomSettings.class);
+ addIndex(DisplaySettings.class);
+ addIndex(AmbientDisplaySettings.class);
+ addIndex(WallpaperTypeSettings.class);
+ addIndex(AppAndNotificationDashboardFragment.class);
+ addIndex(SoundSettings.class);
+ addIndex(ZenModeSettings.class);
+ addIndex(StorageSettings.class);
+ addIndex(PowerUsageAdvanced.class);
+ addIndex(DefaultAppSettings.class);
+ addIndex(ManageAssist.class);
+ addIndex(SpecialAccessSettings.class);
+ addIndex(UserSettings.class);
+ addIndex(AssistGestureSettings.class);
+ addIndex(PickupGestureSettings.class);
+ addIndex(DoubleTapScreenSettings.class);
+ addIndex(DoubleTapPowerSettings.class);
+ addIndex(DoubleTwistGestureSettings.class);
+ addIndex(SwipeToNotificationSettings.class);
+ addIndex(GestureSettings.class);
+ addIndex(LanguageAndInputSettings.class);
+ addIndex(LocationSettings.class);
+ addIndex(ScanningSettings.class);
+ addIndex(SecuritySettingsV2.class);
+ addIndex(ScreenLockSettings.class);
+ addIndex(EncryptionAndCredential.class);
+ addIndex(ScreenPinningSettings.class);
+ addIndex(AccountDashboardFragment.class);
+ addIndex(VirtualKeyboardFragment.class);
+ addIndex(AvailableVirtualKeyboardFragment.class);
+ addIndex(PhysicalKeyboardFragment.class);
+ addIndex(BackupSettingsActivity.class);
+ addIndex(BackupSettingsFragment.class);
+ addIndex(DateTimeSettings.class);
+ addIndex(AccessibilitySettings.class);
+ addIndex(PrintSettingsFragment.class);
+ addIndex(DevelopmentSettingsDashboardFragment.class);
+ addIndex(DeviceInfoSettings.class);
+ addIndex(LegalSettings.class);
+ addIndex(SystemDashboardFragment.class);
+ addIndex(ResetDashboardFragment.class);
+ addIndex(StorageDashboardFragment.class);
+ addIndex(ConnectedDeviceDashboardFragment.class);
+ addIndex(ConnectedDeviceDashboardFragmentOld.class);
+ addIndex(AdvancedConnectedDeviceDashboardFragment.class);
+ addIndex(EnterprisePrivacySettings.class);
+ addIndex(PaymentSettings.class);
+ addIndex(TextToSpeechSettings.class);
+ addIndex(TtsEnginePreferenceFragment.class);
+ addIndex(MagnificationPreferenceFragment.class);
+ addIndex(AccessibilityShortcutPreferenceFragment.class);
+ addIndex(DreamSettings.class);
+ addIndex(SupportDashboardActivity.class);
+ addIndex(AutomaticStorageManagerSettings.class);
+ addIndex(ConfigureNotificationSettings.class);
+ addIndex(PowerUsageSummary.class);
+ addIndex(BatterySaverSettings.class);
+ addIndex(LockscreenDashboardFragment.class);
+ addIndex(WifiDisplaySettings.class);
+ addIndex(ZenModeBehaviorSettings.class);
+ addIndex(ZenModeAutomationSettings.class);
+ addIndex(NightDisplaySettings.class);
+ addIndex(SmartBatterySettings.class);
+ addIndex(MyDeviceInfoFragment.class);
+ }
+
+ @Override
+ public Collection<Class> getProviderValues() {
+ return sProviders;
+ }
+}
diff --git a/src/com/android/settings/search/SearchResultAggregator.java b/src/com/android/settings/search/SearchResultAggregator.java
deleted file mode 100644
index 890e3f0..0000000
--- a/src/com/android/settings/search/SearchResultAggregator.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.android.settings.search;
-
-import android.annotation.NonNull;
-import android.content.Context;
-import android.util.Log;
-import android.util.SparseArray;
-
-import com.android.settings.overlay.FeatureFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * Collects the sorted list of all setting search results.
- *
- * TODO (b/64939692) Convert the timing logs to metrics
- */
-public class SearchResultAggregator {
-
- private static final String TAG = "SearchResultAggregator";
-
- /**
- * Timeout for first task. Allows for longer delay.
- */
- private static final long LONG_CHECK_TASK_TIMEOUT_MS = 500;
-
- /**
- * Timeout for subsequent tasks to allow for fast returning tasks.
- */
- private static final long SHORT_CHECK_TASK_TIMEOUT_MS = 150;
-
- private static SearchResultAggregator sResultAggregator;
-
- // TODO (b/33577327) Merge the other loaders into a single dynamic loader
- static final class ResultLoaderId {
- static final int STATIC_RESULTS = 1;
- static final int INSTALLED_RESULTS = 2;
- static final int INPUT_RESULTS = 3;
- static final int ACCESSIBILITY_RESULTS = 4;
- }
-
- private SearchResultAggregator() {
- }
-
- public static SearchResultAggregator getInstance() {
- if (sResultAggregator == null) {
- sResultAggregator = new SearchResultAggregator();
- }
-
- return sResultAggregator;
- }
-
- @NonNull
- public synchronized List<? extends SearchResult> fetchResults(Context context, String query) {
- SearchFeatureProvider mFeatureProvider = FeatureFactory.getFactory(
- context).getSearchFeatureProvider();
- ExecutorService executorService = mFeatureProvider.getExecutorService();
-
- final DatabaseResultLoader staticResultsTask =
- mFeatureProvider.getStaticSearchResultTask(context, query);
- final InstalledAppResultLoader installedAppTask =
- mFeatureProvider.getInstalledAppSearchTask(context, query);
- final InputDeviceResultLoader inputDevicesTask =
- mFeatureProvider.getInputDeviceResultTask(context, query);
- final AccessibilityServiceResultLoader accessibilityServicesTask =
- mFeatureProvider.getAccessibilityServiceResultTask(context,
- query);
-
- executorService.execute(staticResultsTask);
- executorService.execute(installedAppTask);
- executorService.execute(inputDevicesTask);
- executorService.execute(accessibilityServicesTask);
-
- SparseArray<List<? extends SearchResult>> resultsArray = new SparseArray<>();
- List<? extends SearchResult> EMPTY_LIST = new ArrayList<>();
-
- long allTasksStart = System.currentTimeMillis();
- try {
- resultsArray.put(ResultLoaderId.INPUT_RESULTS,
- inputDevicesTask.get(SHORT_CHECK_TASK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
- } catch (TimeoutException | InterruptedException | ExecutionException e) {
- Log.d(TAG, "Could not retrieve input devices results in time: " + e);
- resultsArray.put(ResultLoaderId.INPUT_RESULTS, EMPTY_LIST);
- }
-
- try {
- resultsArray.put(ResultLoaderId.ACCESSIBILITY_RESULTS,
- accessibilityServicesTask.get(SHORT_CHECK_TASK_TIMEOUT_MS,
- TimeUnit.MILLISECONDS));
- } catch (TimeoutException | InterruptedException | ExecutionException e) {
- Log.d(TAG, "Could not retrieve accessibility results in time: " + e);
- resultsArray.put(ResultLoaderId.ACCESSIBILITY_RESULTS, EMPTY_LIST);
- }
-
- try {
- resultsArray.put(ResultLoaderId.STATIC_RESULTS,
- staticResultsTask.get(LONG_CHECK_TASK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
- } catch (TimeoutException | InterruptedException | ExecutionException e) {
- Log.d(TAG, "Could not retrieve static results: " + e);
- resultsArray.put(ResultLoaderId.STATIC_RESULTS, EMPTY_LIST);
- }
-
- try {
- resultsArray.put(ResultLoaderId.INSTALLED_RESULTS,
- installedAppTask.get(SHORT_CHECK_TASK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
- } catch (TimeoutException | InterruptedException | ExecutionException e) {
- Log.d(TAG, "Could not retrieve installed app results in time: " + e);
-
- resultsArray.put(ResultLoaderId.INSTALLED_RESULTS, EMPTY_LIST);
- }
-
- long mergeStartTime = System.currentTimeMillis();
- Log.i(TAG, "Total result loader time: " + (mergeStartTime - allTasksStart));
- List<? extends SearchResult> mergedResults = mergeSearchResults(resultsArray);
- Log.i(TAG, "Total merge time: " + (System.currentTimeMillis() - mergeStartTime));
- Log.i(TAG, "Total aggregator time: " + (System.currentTimeMillis() - allTasksStart));
-
- return mergedResults;
- }
-
- // TODO (b/68255021) scale the dynamic search results ranks and do a k-way merge
- private List<? extends SearchResult> mergeSearchResults(
- SparseArray<List<? extends SearchResult>> resultsArray) {
- List<? extends SearchResult> staticResults = resultsArray.get(
- ResultLoaderId.STATIC_RESULTS);
- List<? extends SearchResult> installedAppResults = resultsArray.get(
- ResultLoaderId.INSTALLED_RESULTS);
- List<? extends SearchResult> accessibilityResults = resultsArray.get(
- ResultLoaderId.ACCESSIBILITY_RESULTS);
- List<? extends SearchResult> inputDeviceResults = resultsArray.get(
- ResultLoaderId.INPUT_RESULTS);
- List<SearchResult> searchResults;
-
- int staticSize = staticResults.size();
- int appSize = installedAppResults.size();
- int a11ySize = accessibilityResults.size();
- int inputDeviceSize = inputDeviceResults.size();
- int appIndex = 0;
- int a11yIndex = 0;
- int inputDeviceIndex = 0;
- int rank = SearchResult.TOP_RANK;
-
- // TODO: We need a helper method to do k-way merge.
- searchResults = new ArrayList<>(staticSize + appSize + a11ySize + inputDeviceSize);
- searchResults.addAll(resultsArray.get(ResultLoaderId.STATIC_RESULTS));
-
- while (rank <= SearchResult.BOTTOM_RANK) {
- while ((appIndex < appSize) && (installedAppResults.get(appIndex).rank == rank)) {
- searchResults.add(installedAppResults.get(appIndex++));
- }
- while ((a11yIndex < a11ySize) && (accessibilityResults.get(a11yIndex).rank == rank)) {
- searchResults.add(accessibilityResults.get(a11yIndex++));
- }
- while (inputDeviceIndex < inputDeviceSize
- && inputDeviceResults.get(inputDeviceIndex).rank == rank) {
- searchResults.add(inputDeviceResults.get(inputDeviceIndex++));
- }
- rank++;
- }
-
- while (appIndex < appSize) {
- searchResults.add(installedAppResults.get(appIndex++));
- }
- while (a11yIndex < a11ySize) {
- searchResults.add(accessibilityResults.get(a11yIndex++));
- }
- while (inputDeviceIndex < inputDeviceSize) {
- searchResults.add(inputDeviceResults.get(inputDeviceIndex++));
- }
-
- return searchResults;
- }
-}
diff --git a/src/com/android/settings/search/SearchResultDiffCallback.java b/src/com/android/settings/search/SearchResultDiffCallback.java
deleted file mode 100644
index 0f0b977..0000000
--- a/src/com/android/settings/search/SearchResultDiffCallback.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.support.v7.util.DiffUtil;
-
-import java.util.List;
-
-/**
- * Callback for DiffUtil to elegantly update search data when the query changes.
- */
-public class SearchResultDiffCallback extends DiffUtil.Callback {
-
- private List<? extends SearchResult> mOldList;
- private List<? extends SearchResult> mNewList;
-
- public SearchResultDiffCallback(List<? extends SearchResult> oldList,
- List<? extends SearchResult> newList) {
- mOldList = oldList;
- mNewList = newList;
- }
-
- @Override
- public int getOldListSize() {
- return mOldList.size();
- }
-
- @Override
- public int getNewListSize() {
- return mNewList.size();
- }
-
- @Override
- public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
- return mOldList.get(oldItemPosition).equals(mNewList.get(newItemPosition));
- }
-
- @Override
- public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
- return mOldList.get(oldItemPosition).equals(mNewList.get(newItemPosition));
- }
-}
diff --git a/src/com/android/settings/search/SearchResultLoader.java b/src/com/android/settings/search/SearchResultLoader.java
deleted file mode 100644
index f4abd8e..0000000
--- a/src/com/android/settings/search/SearchResultLoader.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.android.settings.search;
-
-import com.android.settingslib.utils.AsyncLoader;
-
-import android.content.Context;
-
-import java.util.List;
-
-/**
- * Loads a sorted list of Search results for a given query.
- */
-public class SearchResultLoader extends AsyncLoader<List<? extends SearchResult>> {
-
- private final String mQuery;
-
- public SearchResultLoader(Context context, String query) {
- super(context);
- mQuery = query;
- }
-
- @Override
- public List<? extends SearchResult> loadInBackground() {
- SearchResultAggregator aggregator = SearchResultAggregator.getInstance();
- return aggregator.fetchResults(getContext(), mQuery);
- }
-
- @Override
- protected void onDiscardResult(List<? extends SearchResult> result) {
- }
-}
diff --git a/src/com/android/settings/search/SearchResultsAdapter.java b/src/com/android/settings/search/SearchResultsAdapter.java
deleted file mode 100644
index c05ce18..0000000
--- a/src/com/android/settings/search/SearchResultsAdapter.java
+++ /dev/null
@@ -1,116 +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.search;
-
-import android.content.Context;
-import android.support.v7.util.DiffUtil;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.settings.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder> {
-
- private final SearchFragment mFragment;
- private final List<SearchResult> mSearchResults;
-
- public SearchResultsAdapter(SearchFragment fragment) {
- mFragment = fragment;
- mSearchResults = new ArrayList<>();
-
- setHasStableIds(true);
- }
-
- @Override
- public SearchViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- final Context context = parent.getContext();
- final LayoutInflater inflater = LayoutInflater.from(context);
- final View view;
- switch (viewType) {
- case ResultPayload.PayloadType.INTENT:
- view = inflater.inflate(R.layout.search_intent_item, parent, false);
- return new IntentSearchViewHolder(view);
- case ResultPayload.PayloadType.INLINE_SWITCH:
- // TODO (b/62807132) replace layout InlineSwitchViewHolder and return an
- // InlineSwitchViewHolder.
- view = inflater.inflate(R.layout.search_intent_item, parent, false);
- return new IntentSearchViewHolder(view);
- case ResultPayload.PayloadType.INLINE_LIST:
- // TODO (b/62807132) build a inline-list view holder & layout.
- view = inflater.inflate(R.layout.search_intent_item, parent, false);
- return new IntentSearchViewHolder(view);
- case ResultPayload.PayloadType.SAVED_QUERY:
- view = inflater.inflate(R.layout.search_saved_query_item, parent, false);
- return new SavedQueryViewHolder(view);
- default:
- return null;
- }
- }
-
- @Override
- public void onBindViewHolder(SearchViewHolder holder, int position) {
- holder.onBind(mFragment, mSearchResults.get(position));
- }
-
- @Override
- public long getItemId(int position) {
- return mSearchResults.get(position).stableId;
- }
-
- @Override
- public int getItemViewType(int position) {
- return mSearchResults.get(position).viewType;
- }
-
- @Override
- public int getItemCount() {
- return mSearchResults.size();
- }
-
- /**
- * Displays recent searched queries.
- */
- public void displaySavedQuery(List<? extends SearchResult> data) {
- clearResults();
- mSearchResults.addAll(data);
- notifyDataSetChanged();
- }
-
- public void clearResults() {
- mSearchResults.clear();
- notifyDataSetChanged();
- }
-
- public List<SearchResult> getSearchResults() {
- return mSearchResults;
- }
-
- public void postSearchResults(List<? extends SearchResult> newSearchResults) {
- final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(
- new SearchResultDiffCallback(mSearchResults, newSearchResults));
- mSearchResults.clear();
- mSearchResults.addAll(newSearchResults);
- diffResult.dispatchUpdatesTo(this);
- mFragment.onSearchResultsDisplayed(mSearchResults.size());
- }
-}
diff --git a/src/com/android/settings/search/SearchViewHolder.java b/src/com/android/settings/search/SearchViewHolder.java
deleted file mode 100644
index 7667a06..0000000
--- a/src/com/android/settings/search/SearchViewHolder.java
+++ /dev/null
@@ -1,121 +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.search;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.util.IconDrawableFactory;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.support.annotation.VisibleForTesting;
-
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
-
-/**
- * The ViewHolder for the Search RecyclerView.
- * There are multiple search result types in the same Recycler view with different UI requirements.
- * Some examples include Intent results, Inline results, and Help articles.
- */
-public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
-
- private final String DYNAMIC_PLACEHOLDER = "%s";
-
- private final String mPlaceholderSummary;
-
- public final TextView titleView;
- public final TextView summaryView;
- public final TextView breadcrumbView;
- public final ImageView iconView;
-
- protected final MetricsFeatureProvider mMetricsFeatureProvider;
- protected final SearchFeatureProvider mSearchFeatureProvider;
- private final IconDrawableFactory mIconDrawableFactory;
-
- public SearchViewHolder(View view) {
- super(view);
- final FeatureFactory featureFactory = FeatureFactory
- .getFactory(view.getContext().getApplicationContext());
- mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();
- mSearchFeatureProvider = featureFactory.getSearchFeatureProvider();
- titleView = view.findViewById(android.R.id.title);
- summaryView = view.findViewById(android.R.id.summary);
- iconView = view.findViewById(android.R.id.icon);
- breadcrumbView = view.findViewById(R.id.breadcrumb);
-
- mPlaceholderSummary = view.getContext().getString(R.string.summary_placeholder);
- mIconDrawableFactory = IconDrawableFactory.newInstance(view.getContext());
- }
-
- public abstract int getClickActionMetricName();
-
- public void onBind(SearchFragment fragment, SearchResult result) {
- titleView.setText(result.title);
- // TODO (b/36101902) remove check for DYNAMIC_PLACEHOLDER
- if (TextUtils.isEmpty(result.summary)
- || TextUtils.equals(result.summary, mPlaceholderSummary)
- || TextUtils.equals(result.summary, DYNAMIC_PLACEHOLDER)) {
- summaryView.setVisibility(View.GONE);
- } else {
- summaryView.setText(result.summary);
- summaryView.setVisibility(View.VISIBLE);
- }
-
- if (result instanceof AppSearchResult) {
- AppSearchResult appResult = (AppSearchResult) result;
- PackageManager pm = fragment.getActivity().getPackageManager();
- UserHandle userHandle = appResult.getAppUserHandle();
- Drawable badgedIcon = getBadgedIcon(appResult.info, userHandle.getIdentifier());
- iconView.setImageDrawable(badgedIcon);
- titleView.setContentDescription(
- pm.getUserBadgedLabel(appResult.info.loadLabel(pm), userHandle));
- } else {
- // Valid even when result.icon is null.
- iconView.setImageDrawable(result.icon);
- }
-
- bindBreadcrumbView(result);
- }
-
- private void bindBreadcrumbView(SearchResult result) {
- if (result.breadcrumbs == null || result.breadcrumbs.isEmpty()) {
- breadcrumbView.setVisibility(View.GONE);
- return;
- }
- final Context context = breadcrumbView.getContext();
- String breadcrumb = result.breadcrumbs.get(0);
- final int count = result.breadcrumbs.size();
- for (int i = 1; i < count; i++) {
- breadcrumb = context.getString(R.string.search_breadcrumb_connector,
- breadcrumb, result.breadcrumbs.get(i));
- }
- breadcrumbView.setText(breadcrumb);
- breadcrumbView.setVisibility(View.VISIBLE);
- }
-
- @VisibleForTesting
- Drawable getBadgedIcon(ApplicationInfo info, int userId) {
- return mIconDrawableFactory.getBadgedIcon(info, userId);
- }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
index 0c98b9c..3ef1b85 100644
--- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
+++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
@@ -175,7 +175,8 @@
}
private List<String> getNonIndexableKeysFromProvider(Context context) {
- final Collection<Class> values = SearchIndexableResources.providerValues();
+ final Collection<Class> values = FeatureFactory.getFactory(context)
+ .getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
final List<String> nonIndexableKeys = new ArrayList<>();
for (Class<?> clazz : values) {
@@ -209,7 +210,8 @@
}
private List<SearchIndexableResource> getSearchIndexableResourcesFromProvider(Context context) {
- Collection<Class> values = SearchIndexableResources.providerValues();
+ Collection<Class> values = FeatureFactory.getFactory(context)
+ .getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
List<SearchIndexableResource> resourceList = new ArrayList<>();
for (Class<?> clazz : values) {
@@ -236,7 +238,8 @@
}
private List<SearchIndexableRaw> getSearchIndexableRawFromProvider(Context context) {
- final Collection<Class> values = SearchIndexableResources.providerValues();
+ final Collection<Class> values = FeatureFactory.getFactory(context)
+ .getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
final List<SearchIndexableRaw> rawList = new ArrayList<>();
for (Class<?> clazz : values) {
diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java
index 28bde33..f3a9285 100644
--- a/src/com/android/settings/search/actionbar/SearchMenuController.java
+++ b/src/com/android/settings/search/actionbar/SearchMenuController.java
@@ -18,7 +18,7 @@
import android.annotation.NonNull;
import android.app.Fragment;
-import android.content.Context;
+import android.content.Intent;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
@@ -38,14 +38,7 @@
private final Fragment mHost;
public static void init(@NonNull ObservablePreferenceFragment host) {
- final Context context = host.getContext();
- final boolean isSearchV2Enabled = FeatureFactory.getFactory(context)
- .getSearchFeatureProvider()
- .isSearchV2Enabled(context);
-
- if (isSearchV2Enabled) {
- host.getLifecycle().addObserver(new SearchMenuController(host));
- }
+ host.getLifecycle().addObserver(new SearchMenuController(host));
}
private SearchMenuController(@NonNull Fragment host) {
@@ -67,8 +60,11 @@
searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
searchItem.setOnMenuItemClickListener(target -> {
- mHost.startActivityForResult(
- SearchFeatureProvider.SEARCH_UI_INTENT, 0 /* requestCode */);
+ final Intent intent = SearchFeatureProvider.SEARCH_UI_INTENT;
+ intent.setPackage(FeatureFactory.getFactory(mHost.getContext())
+ .getSearchFeatureProvider().getSettingsIntelligencePkgName());
+
+ mHost.startActivityForResult(intent, 0 /* requestCode */);
return true;
});
}
diff --git a/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java b/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java
deleted file mode 100644
index c254a40..0000000
--- a/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java
+++ /dev/null
@@ -1,38 +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.search.ranking;
-
-import android.util.Pair;
-
-import java.util.List;
-
-public interface SearchResultsRankerCallback {
-
- /**
- * Called when ranker provides the ranking scores.
- * @param searchRankingScores Ordered List of Pairs of String and Float corresponding to
- * stableIds and ranking scores. The list must be descendingly
- * ordered based on scores.
- */
- public void onRankingScoresAvailable(List<Pair<String, Float>> searchRankingScores);
-
- /**
- * Called when for any reason ranker fails, which notifies the client to proceed
- * without ranking results.
- */
- public void onRankingFailed();
-}
diff --git a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java
index 67b78fc..fdb9349 100644
--- a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java
+++ b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java
@@ -67,7 +67,7 @@
@Override
public boolean isAvailable() {
- return true;
+ return mContext.getResources().getBoolean(R.bool.config_show_unlock_set_or_change);
}
@Override
diff --git a/src/com/android/settings/security/LockdownButtonPreferenceController.java b/src/com/android/settings/security/LockdownButtonPreferenceController.java
new file mode 100644
index 0000000..8960502
--- /dev/null
+++ b/src/com/android/settings/security/LockdownButtonPreferenceController.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.security;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.TwoStatePreference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.TogglePreferenceController;
+
+public class LockdownButtonPreferenceController extends TogglePreferenceController {
+
+ private static final String KEY_LOCKDOWN_ENALBED = "security_setting_lockdown_enabled";
+
+ private final LockPatternUtils mLockPatternUtils;
+
+ public LockdownButtonPreferenceController(Context context) {
+ super(context, KEY_LOCKDOWN_ENALBED);
+ mLockPatternUtils = new LockPatternUtils(context);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ if (mLockPatternUtils.isSecure(UserHandle.myUserId())) {
+ return BasePreferenceController.AVAILABLE;
+ } else {
+ return BasePreferenceController.DISABLED_FOR_USER;
+ }
+ }
+
+ @Override
+ public boolean isChecked() {
+ return Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.LOCKDOWN_IN_POWER_MENU, isChecked ? 1 : 0);
+ return true;
+ }
+}
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index df4ca30..c400645 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -22,7 +22,7 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.accounts.AddUserWhenLockedPreferenceController;
+import com.android.settings.users.AddUserWhenLockedPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.LockScreenNotificationPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -86,13 +86,13 @@
KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE);
lifecycle.addObserver(notificationController);
controllers.add(notificationController);
- final AddUserWhenLockedPreferenceController addUserWhenLockedController =
- new AddUserWhenLockedPreferenceController(context, KEY_ADD_USER_FROM_LOCK_SCREEN);
- lifecycle.addObserver(addUserWhenLockedController);
- controllers.add(addUserWhenLockedController);
+ controllers.add(new AddUserWhenLockedPreferenceController(
+ context, KEY_ADD_USER_FROM_LOCK_SCREEN, lifecycle));
mOwnerInfoPreferenceController =
new OwnerInfoPreferenceController(context, this, lifecycle);
controllers.add(mOwnerInfoPreferenceController);
+ controllers.add(new LockdownButtonPreferenceController(context));
+
return controllers;
}
@@ -119,9 +119,10 @@
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new LockScreenNotificationPreferenceController(context));
controllers.add(new AddUserWhenLockedPreferenceController(context,
- KEY_ADD_USER_FROM_LOCK_SCREEN));
+ KEY_ADD_USER_FROM_LOCK_SCREEN, null /* lifecycle */));
controllers.add(new OwnerInfoPreferenceController(
context, null /* fragment */, null /* lifecycle */));
+ controllers.add(new LockdownButtonPreferenceController(context));
return controllers;
}
diff --git a/src/com/android/settings/security/ScreenPinningPreferenceController.java b/src/com/android/settings/security/ScreenPinningPreferenceController.java
index 60279c7..305d076 100644
--- a/src/com/android/settings/security/ScreenPinningPreferenceController.java
+++ b/src/com/android/settings/security/ScreenPinningPreferenceController.java
@@ -19,7 +19,6 @@
import android.content.Context;
import android.provider.Settings;
import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -34,23 +33,21 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return mContext.getResources().getBoolean(R.bool.config_show_screen_pinning_settings)
+ ? AVAILABLE : DISABLED_UNSUPPORTED;
}
@Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- final Preference preference = screen.findPreference(getPreferenceKey());
- if (preference == null) {
- return;
- }
- if (Settings.System.getInt(mContext.getContentResolver(),
- Settings.System.LOCK_TO_APP_ENABLED, 0) != 0) {
- preference.setSummary(
- mContext.getString(R.string.switch_on_text));
- } else {
- preference.setSummary(
- mContext.getString(R.string.switch_off_text));
- }
+ public String getSummary() {
+ return Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.LOCK_TO_APP_ENABLED, 0) != 0
+ ? mContext.getString(R.string.switch_on_text)
+ : mContext.getString(R.string.switch_off_text);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ preference.setSummary(getSummary());
}
}
diff --git a/src/com/android/settings/security/ShowPasswordPreferenceController.java b/src/com/android/settings/security/ShowPasswordPreferenceController.java
index d0216e8..82f1935 100644
--- a/src/com/android/settings/security/ShowPasswordPreferenceController.java
+++ b/src/com/android/settings/security/ShowPasswordPreferenceController.java
@@ -23,6 +23,7 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.R;
public class ShowPasswordPreferenceController extends TogglePreferenceController {
@@ -53,7 +54,9 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return mContext.getResources().getBoolean(R.bool.config_show_show_password)
+ ? AVAILABLE : DISABLED_UNSUPPORTED;
}
+
}
diff --git a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
index c615eff..5bb8f75 100644
--- a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
@@ -47,7 +47,8 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return mContext.getResources().getBoolean(R.bool.config_show_manage_trust_agents)
+ ? AVAILABLE : DISABLED_UNSUPPORTED;
}
@Override
diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
index 99aa6a4..0c591ed 100644
--- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
@@ -31,6 +31,7 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.security.SecurityFeatureProvider;
@@ -46,7 +47,8 @@
import java.util.List;
public class TrustAgentListPreferenceController extends AbstractPreferenceController
- implements LifecycleObserver, OnSaveInstanceState, OnCreate, OnResume {
+ implements PreferenceControllerMixin, LifecycleObserver, OnSaveInstanceState,
+ OnCreate, OnResume {
private static final String TRUST_AGENT_CLICK_INTENT = "trust_agent_click_intent";
@VisibleForTesting
@@ -77,7 +79,7 @@
@Override
public boolean isAvailable() {
- return true;
+ return mContext.getResources().getBoolean(R.bool.config_show_trust_agent_click_intent);
}
@Override
@@ -144,6 +146,10 @@
mSecurityCategory.removePreference(oldAgent);
}
}
+ // If for some reason the preference is no longer available, don't proceed to add.
+ if (!isAvailable()) {
+ return;
+ }
// Then add new ones.
final boolean hasSecurity = mLockPatternUtils.isSecure(MY_USER_ID);
final List<TrustAgentManager.TrustAgentComponentInfo> agents =
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/shortcut/CreateShortcut.java
similarity index 92%
rename from src/com/android/settings/CreateShortcut.java
rename to src/com/android/settings/shortcut/CreateShortcut.java
index 8bc801b..2bd9b761 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/shortcut/CreateShortcut.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.shortcut;
import android.app.LauncherActivity;
import android.content.ComponentName;
@@ -28,7 +28,9 @@
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
+import android.graphics.drawable.LayerDrawable;
import android.net.ConnectivityManager;
import android.os.AsyncTask;
import android.support.annotation.VisibleForTesting;
@@ -40,6 +42,7 @@
import android.widget.ListView;
import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
import com.android.settings.Settings.TetherSettingsActivity;
import com.android.settings.overlay.FeatureFactory;
@@ -65,7 +68,8 @@
finish();
}
- protected Intent createResultIntent(Intent shortcutIntent, ResolveInfo resolveInfo,
+ @VisibleForTesting
+ Intent createResultIntent(Intent shortcutIntent, ResolveInfo resolveInfo,
CharSequence label) {
shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
ShortcutManager sm = getSystemService(ShortcutManager.class);
@@ -94,8 +98,8 @@
if (activityInfo.icon != 0) {
intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, createIcon(activityInfo.icon,
- R.layout.shortcut_badge,
- getResources().getDimensionPixelSize(R.dimen.shortcut_size)));
+ R.layout.shortcut_badge,
+ getResources().getDimensionPixelSize(R.dimen.shortcut_size)));
}
return intent;
}
@@ -112,7 +116,11 @@
private Bitmap createIcon(int resource, int layoutRes, int size) {
Context context = new ContextThemeWrapper(this, android.R.style.Theme_Material);
View view = LayoutInflater.from(context).inflate(layoutRes, null);
- ((ImageView) view.findViewById(android.R.id.icon)).setImageResource(resource);
+ Drawable iconDrawable = getDrawable(resource);
+ if (iconDrawable instanceof LayerDrawable) {
+ iconDrawable = ((LayerDrawable) iconDrawable).getDrawable(1);
+ }
+ ((ImageView) view.findViewById(android.R.id.icon)).setImageDrawable(iconDrawable);
int spec = MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY);
view.measure(spec, spec);
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 08ea7c6..433bdf3 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -24,21 +24,63 @@
import android.graphics.drawable.Icon;
import android.net.Uri;
import android.net.wifi.WifiManager;
+import android.support.annotation.VisibleForTesting;
+import android.util.Log;
import com.android.settings.R;
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.util.Map;
+import java.util.WeakHashMap;
import androidx.app.slice.Slice;
import androidx.app.slice.SliceProvider;
import androidx.app.slice.builders.ListBuilder;
+/**
+ * A {@link SliceProvider} for Settings to enabled inline results in system apps.
+ *
+ * <p>{@link SettingsSliceProvider} accepts a {@link Uri} with {@link #SLICE_AUTHORITY} and a
+ * {@code String} key based on the setting intended to be changed. This provider builds a
+ * {@link Slice} and responds to Slice actions through the database defined by
+ * {@link SlicesDatabaseHelper}, whose data is written by {@link SlicesIndexer}.
+ *
+ * <p>When a {@link Slice} is requested, we start loading {@link SliceData} in the background and
+ * return an stub {@link Slice} with the correct {@link Uri} immediately. In the background, the
+ * data corresponding to the key in the {@link Uri} is read by {@link SlicesDatabaseAccessor}, and
+ * the entire row is converted into a {@link SliceData}. Once complete, it is stored in
+ * {@link #mSliceDataCache}, and then an update sent via the Slice framework to the Slice.
+ * The {@link Slice} displayed by the Slice-presenter will re-query this Slice-provider and find
+ * the {@link SliceData} cached to build the full {@link Slice}.
+ *
+ * <p>When an action is taken on that {@link Slice}, we receive the action in
+ * {@link SliceBroadcastReceiver}, and use the
+ * {@link com.android.settings.core.BasePreferenceController} indexed as
+ * {@link SlicesDatabaseHelper.IndexColumns#CONTROLLER} to manipulate the setting.
+ */
public class SettingsSliceProvider extends SliceProvider {
+
+ private static final String TAG = "SettingsSliceProvider";
+
public static final String SLICE_AUTHORITY = "com.android.settings.slices";
public static final String PATH_WIFI = "wifi";
public static final String ACTION_WIFI_CHANGED =
"com.android.settings.slice.action.WIFI_CHANGED";
+ public static final String ACTION_TOGGLE_CHANGED =
+ "com.android.settings.slice.action.TOGGLE_CHANGED";
+
+ public static final String EXTRA_SLICE_KEY = "com.android.settings.slice.extra.key";
+
// TODO -- Associate slice URI with search result instead of separate hardcoded thing
+
+ @VisibleForTesting
+ SlicesDatabaseAccessor mSlicesDatabaseAccessor;
+
+ @VisibleForTesting
+ Map<Uri, SliceData> mSliceDataCache;
+
public static Uri getUri(String path) {
return new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
@@ -48,19 +90,58 @@
@Override
public boolean onCreateSliceProvider() {
+ mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(getContext());
+ mSliceDataCache = new WeakHashMap<>();
return true;
}
@Override
public Slice onBindSlice(Uri sliceUri) {
String path = sliceUri.getPath();
+ // If adding a new Slice, do not directly match Slice URIs.
+ // Use {@link SlicesDatabaseAccessor}.
switch (path) {
case "/" + PATH_WIFI:
return createWifiSlice(sliceUri);
}
- throw new IllegalArgumentException("Unrecognized slice uri: " + sliceUri);
+
+ SliceData cachedSliceData = mSliceDataCache.get(sliceUri);
+ if (cachedSliceData == null) {
+ loadSliceInBackground(sliceUri);
+ return getSliceStub(sliceUri);
+ }
+
+ // Remove the SliceData from the cache after it has been used to prevent a memory-leak.
+ mSliceDataCache.remove(sliceUri);
+ return SliceBuilderUtils.buildSlice(getContext(), cachedSliceData);
}
+ @VisibleForTesting
+ void loadSlice(Uri uri) {
+ long startBuildTime = System.currentTimeMillis();
+
+ SliceData sliceData = mSlicesDatabaseAccessor.getSliceDataFromUri(uri);
+ mSliceDataCache.put(uri, sliceData);
+ getContext().getContentResolver().notifyChange(uri, null /* content observer */);
+
+ Log.d(TAG, "Built slice (" + uri + ") in: " +
+ (System.currentTimeMillis() - startBuildTime));
+ }
+
+ @VisibleForTesting
+ void loadSliceInBackground(Uri uri) {
+ ThreadUtils.postOnBackgroundThread(() -> {
+ loadSlice(uri);
+ });
+ }
+
+ /**
+ * @return an empty {@link Slice} with {@param uri} to be used as a stub while the real
+ * {@link SliceData} is loaded from {@link SlicesDatabaseHelper.Tables#TABLE_SLICES_INDEX}.
+ */
+ private Slice getSliceStub(Uri uri) {
+ return new ListBuilder(getContext(), uri).build();
+ }
// TODO (b/70622039) remove this when the proper wifi slice is enabled.
private Slice createWifiSlice(Uri sliceUri) {
@@ -86,7 +167,7 @@
}
boolean finalWifiEnabled = wifiEnabled;
- return new ListBuilder(sliceUri)
+ return new ListBuilder(getContext(), sliceUri)
.setColor(R.color.material_blue_500)
.addRow(b -> b
.setTitle(getContext().getString(R.string.wifi_settings))
diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java
index b6f2ab9..a68ed19 100644
--- a/src/com/android/settings/slices/SliceBroadcastReceiver.java
+++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java
@@ -16,7 +16,9 @@
package com.android.settings.slices;
+import static com.android.settings.slices.SettingsSliceProvider.ACTION_TOGGLE_CHANGED;
import static com.android.settings.slices.SettingsSliceProvider.ACTION_WIFI_CHANGED;
+import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
import android.app.slice.Slice;
import android.content.BroadcastReceiver;
@@ -25,19 +27,34 @@
import android.net.Uri;
import android.net.wifi.WifiManager;
import android.os.Handler;
+import android.text.TextUtils;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.TogglePreferenceController;
/**
* Responds to actions performed on slices and notifies slices of updates in state changes.
*/
public class SliceBroadcastReceiver extends BroadcastReceiver {
+ private static String TAG = "SettSliceBroadcastRec";
+
+ /**
+ * TODO (b/) move wifi action into generalized case.
+ */
@Override
- public void onReceive(Context context, Intent i) {
- String action = i.getAction();
+ public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+ String key = intent.getStringExtra(EXTRA_SLICE_KEY);
+
switch (action) {
+ case ACTION_TOGGLE_CHANGED:
+ handleToggleAction(context, key);
+ break;
case ACTION_WIFI_CHANGED:
WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- boolean newState = i.getBooleanExtra(Slice.EXTRA_TOGGLE_STATE, wm.isWifiEnabled());
+ boolean newState = intent.getBooleanExtra(Slice.EXTRA_TOGGLE_STATE,
+ wm.isWifiEnabled());
wm.setWifiEnabled(newState);
// Wait a bit for wifi to update (TODO: is there a better way to do this?)
Handler h = new Handler();
@@ -48,4 +65,28 @@
break;
}
}
+
+ private void handleToggleAction(Context context, String key) {
+ if (TextUtils.isEmpty(key)) {
+ throw new IllegalStateException("No key passed to Intent for toggle controller");
+ }
+
+ final BasePreferenceController controller = getPreferenceController(context, key);
+
+ if (!(controller instanceof TogglePreferenceController)) {
+ throw new IllegalStateException("Toggle action passed for a non-toggle key: " + key);
+ }
+
+ // TODO post context.getContentResolver().notifyChanged(uri, null) in the Toggle controller
+ // so that it's automatically broadcast to any slice.
+ final TogglePreferenceController toggleController = (TogglePreferenceController) controller;
+ final boolean currentValue = toggleController.isChecked();
+ toggleController.setChecked(!currentValue);
+ }
+
+ private BasePreferenceController getPreferenceController(Context context, String key) {
+ final SlicesDatabaseAccessor accessor = new SlicesDatabaseAccessor(context);
+ final SliceData sliceData = accessor.getSliceDataFromKey(key);
+ return SliceBuilderUtils.getPreferenceController(context, sliceData);
+ }
}
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
new file mode 100644
index 0000000..11ff1c1
--- /dev/null
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -0,0 +1,185 @@
+/*
+ * 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.slices;
+
+import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Icon;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+import androidx.app.slice.Slice;
+import androidx.app.slice.builders.ListBuilder;
+import androidx.app.slice.builders.ListBuilder.RowBuilder;
+
+/**
+ * Utility class to build Slices objects and Preference Controllers based on the Database managed
+ * by {@link SlicesDatabaseHelper}
+ */
+public class SliceBuilderUtils {
+
+ private static final String TAG = "SliceBuilder";
+
+ /**
+ * Build a Slice from {@link SliceData}.
+ *
+ * @return a {@link Slice} based on the data provided by {@param sliceData}.
+ * Will build an {@link Intent} based Slice unless the Preference Controller name in
+ * {@param sliceData} is an inline controller.
+ */
+ public static Slice buildSlice(Context context, SliceData sliceData) {
+ final PendingIntent contentIntent = getContentIntent(context, sliceData);
+ final Icon icon = Icon.createWithResource(context, sliceData.getIconResource());
+ final BasePreferenceController controller = getPreferenceController(context, sliceData);
+
+ final String subtitleText = getSubtitleText(context, controller, sliceData);
+
+ final RowBuilder builder = new RowBuilder(context, sliceData.getUri())
+ .setTitle(sliceData.getTitle())
+ .setTitleItem(icon)
+ .setSubtitle(subtitleText)
+ .setContentIntent(contentIntent);
+
+ // TODO (b/71640747) Respect setting availability.
+
+ if (controller instanceof TogglePreferenceController) {
+ addToggleAction(context, builder, ((TogglePreferenceController) controller).isChecked(),
+ sliceData.getKey());
+ }
+
+ return new ListBuilder(context, sliceData.getUri())
+ .addRow(builder)
+ .build();
+ }
+
+ /**
+ * Looks at the {@link SliceData#preferenceController} from {@param sliceData} and attempts to
+ * build an {@link AbstractPreferenceController}.
+ */
+ public static BasePreferenceController getPreferenceController(Context context,
+ SliceData sliceData) {
+ try {
+ return getController(context, sliceData, true /* isContextOnly */);
+ } catch (IllegalStateException e) {
+ // Do nothing
+ Log.d(TAG, "Could not find Context-only controller for preference controller: "
+ + sliceData.getKey());
+ }
+
+ return getController(context, sliceData, false /* isContextOnly */);
+ }
+
+ /**
+ * Attempts to build a {@link BasePreferenceController} from {@param SliceData}.
+ *
+ * @param sliceData Backing data for the Slice.
+ * @param contextOnlyCtor {@code true} when the constructor for the
+ * {@link BasePreferenceController}
+ * only takes a {@link Context}. Else the constructor will be ({@link
+ * Context}, {@code String}.
+ */
+ private static BasePreferenceController getController(Context context, SliceData sliceData,
+ boolean contextOnlyCtor) {
+ try {
+ Class<?> clazz = Class.forName(sliceData.getPreferenceController());
+ Constructor<?> preferenceConstructor;
+ Object[] params;
+
+ if (contextOnlyCtor) {
+ preferenceConstructor = clazz.getConstructor(Context.class);
+ params = new Object[]{context};
+ } else {
+ preferenceConstructor = clazz.getConstructor(Context.class, String.class);
+ params = new Object[]{context, sliceData.getKey()};
+ }
+
+ return (BasePreferenceController) preferenceConstructor.newInstance(params);
+ } catch (ClassNotFoundException | NoSuchMethodException | InstantiationException |
+ IllegalArgumentException | InvocationTargetException | IllegalAccessException e) {
+ throw new IllegalStateException(
+ "Invalid preference controller: " + sliceData.getPreferenceController(), e);
+ }
+ }
+
+ private static void addToggleAction(Context context, RowBuilder builder, boolean isChecked,
+ String key) {
+ PendingIntent actionIntent = getActionIntent(context,
+ SettingsSliceProvider.ACTION_TOGGLE_CHANGED, key);
+ builder.addToggle(actionIntent, isChecked);
+ }
+
+ private static PendingIntent getActionIntent(Context context, String action, String key) {
+ Intent intent = new Intent(action);
+ intent.setClass(context, SliceBroadcastReceiver.class);
+ intent.putExtra(EXTRA_SLICE_KEY, key);
+ return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
+ PendingIntent.FLAG_CANCEL_CURRENT);
+ }
+
+ private static PendingIntent getContentIntent(Context context, SliceData sliceData) {
+ Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(context,
+ sliceData.getFragmentClassName(), sliceData.getKey(), sliceData.getScreenTitle(),
+ 0 /* TODO */);
+ intent.setClassName("com.android.settings", SubSettings.class.getName());
+ return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
+ }
+
+ @VisibleForTesting
+ static String getSubtitleText(Context context, AbstractPreferenceController controller,
+ SliceData sliceData) {
+ String summaryText = sliceData.getSummary();
+ if (isValidSummary(context, summaryText)) {
+ return summaryText;
+ }
+
+ if (controller != null) {
+ summaryText = controller.getSummary();
+
+ if (isValidSummary(context, summaryText)) {
+ return summaryText;
+ }
+ }
+
+ return sliceData.getScreenTitle();
+ }
+
+ private static boolean isValidSummary(Context context, String summary) {
+ if (summary == null || TextUtils.isEmpty(summary.trim())) {
+ return false;
+ }
+
+ final String placeHolder = context.getString(R.string.summary_placeholder);
+ final String doublePlaceHolder = context.getString(R.string.summary_two_lines_placeholder);
+
+ return !(TextUtils.equals(summary, placeHolder)
+ || TextUtils.equals(summary, doublePlaceHolder));
+ }
+}
diff --git a/src/com/android/settings/slices/SliceData.java b/src/com/android/settings/slices/SliceData.java
index f83676a..f72add7 100644
--- a/src/com/android/settings/slices/SliceData.java
+++ b/src/com/android/settings/slices/SliceData.java
@@ -18,7 +18,6 @@
import android.net.Uri;
import android.text.TextUtils;
-
/**
* Data class representing a slice stored by {@link SlicesIndexer}.
* Note that {@link #key} is treated as a primary key for this class and determines equality.
@@ -179,5 +178,4 @@
return mKey;
}
}
-
}
\ No newline at end of file
diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java
index 4d9b7a5..e5a21e4 100644
--- a/src/com/android/settings/slices/SliceDataConverter.java
+++ b/src/com/android/settings/slices/SliceDataConverter.java
@@ -27,9 +27,9 @@
import android.util.Xml;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.Indexable.SearchIndexProvider;
-import com.android.settings.search.SearchIndexableResources;
import com.android.settings.search.XmlParserUtils;
import org.xmlpull.v1.XmlPullParser;
@@ -62,7 +62,8 @@
* @return a list of {@link SliceData} to be indexed and later referenced as a Slice.
*
* The collection works as follows:
- * - Collects a list of Fragments from {@link SearchIndexableResources}.
+ * - Collects a list of Fragments from
+ * {@link FeatureFactory#getSearchFeatureProvider()}.
* - From each fragment, grab a {@link SearchIndexProvider}.
* - For each provider, collect XML resource layout and a list of
* {@link com.android.settings.core.BasePreferenceController}.
@@ -72,7 +73,8 @@
return mSliceData;
}
- final Collection<Class> indexableClasses = SearchIndexableResources.providerValues();
+ final Collection<Class> indexableClasses = FeatureFactory.getFactory(mContext)
+ .getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
for (Class clazz : indexableClasses) {
final String fragmentName = clazz.getName();
@@ -163,7 +165,7 @@
// TODO (b/67996923) Non-controller Slices should become intent-only slices.
// Note that without a controller, dynamic summaries are impossible.
- // TODO (b/67996923) This will not work if preferences have nested intens:
+ // TODO (b/67996923) This will not work if preferences have nested intents:
// <pref ....>
// <intent action="blab"/> </pref>
controllerClassName = XmlParserUtils.getController(mContext, attrs);
diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
new file mode 100644
index 0000000..4fca63a
--- /dev/null
+++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
@@ -0,0 +1,141 @@
+/*
+ * 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.slices;
+
+import static com.android.settings.slices.SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX;
+
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+
+import android.content.Context;
+import android.os.Binder;
+
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns;
+
+import androidx.app.slice.Slice;
+
+/**
+ * Class used to map a {@link Uri} from {@link SettingsSliceProvider} to a Slice.
+ */
+public class SlicesDatabaseAccessor {
+
+ public static final String[] SELECT_COLUMNS = {
+ IndexColumns.KEY,
+ IndexColumns.TITLE,
+ IndexColumns.SUMMARY,
+ IndexColumns.SCREENTITLE,
+ IndexColumns.ICON_RESOURCE,
+ IndexColumns.FRAGMENT,
+ IndexColumns.CONTROLLER,
+ };
+
+ Context mContext;
+
+ public SlicesDatabaseAccessor(Context context) {
+ mContext = context;
+ }
+
+ /**
+ * Query the slices database and return a {@link SliceData} object corresponding to the row
+ * matching the key provided by the {@param uri}. Additionally adds the {@param uri} to the
+ * {@link SliceData} object so the {@link Slice} can bind to the {@link Uri}.
+ * Used when building a {@link Slice}.
+ */
+ public SliceData getSliceDataFromUri(Uri uri) {
+ String key = uri.getLastPathSegment();
+ Cursor cursor = getIndexedSliceData(key);
+ return buildSliceData(cursor, uri);
+ }
+
+ /**
+ * Query the slices database and return a {@link SliceData} object corresponding to the row
+ * matching the {@param key}.
+ * Used when handling the action of the {@link Slice}.
+ */
+ public SliceData getSliceDataFromKey(String key) {
+ Cursor cursor = getIndexedSliceData(key);
+ return buildSliceData(cursor, null /* uri */);
+ }
+
+ private Cursor getIndexedSliceData(String path) {
+ verifyIndexing();
+
+ final String whereClause = buildWhereClause();
+ final SlicesDatabaseHelper helper = SlicesDatabaseHelper.getInstance(mContext);
+ final SQLiteDatabase database = helper.getReadableDatabase();
+ final String[] selection = new String[]{path};
+
+ Cursor resultCursor = database.query(TABLE_SLICES_INDEX, SELECT_COLUMNS, whereClause,
+ selection, null /* groupBy */, null /* having */, null /* orderBy */);
+
+ int numResults = resultCursor.getCount();
+
+ if (numResults == 0) {
+ throw new IllegalStateException("Invalid Slices key from path: " + path);
+ }
+
+ if (numResults > 1) {
+ throw new IllegalStateException(
+ "Should not match more than 1 slice with path: " + path);
+ }
+
+ resultCursor.moveToFirst();
+ return resultCursor;
+ }
+
+ private String buildWhereClause() {
+ return new StringBuilder(IndexColumns.KEY)
+ .append(" = ?")
+ .toString();
+ }
+
+ private SliceData buildSliceData(Cursor cursor, Uri uri) {
+ final String key = cursor.getString(cursor.getColumnIndex(IndexColumns.KEY));
+ final String title = cursor.getString(cursor.getColumnIndex(IndexColumns.TITLE));
+ final String summary = cursor.getString(cursor.getColumnIndex(IndexColumns.SUMMARY));
+ final String screenTitle = cursor.getString(
+ cursor.getColumnIndex(IndexColumns.SCREENTITLE));
+ final int iconResource = cursor.getInt(cursor.getColumnIndex(IndexColumns.ICON_RESOURCE));
+ final String fragmentClassName = cursor.getString(
+ cursor.getColumnIndex(IndexColumns.FRAGMENT));
+ final String controllerClassName = cursor.getString(
+ cursor.getColumnIndex(IndexColumns.CONTROLLER));
+
+ return new SliceData.Builder()
+ .setKey(key)
+ .setTitle(title)
+ .setSummary(summary)
+ .setScreenTitle(screenTitle)
+ .setIcon(iconResource)
+ .setFragmentName(fragmentClassName)
+ .setPreferenceControllerClassName(controllerClassName)
+ .setUri(uri)
+ .build();
+ }
+
+ private void verifyIndexing() {
+ final long uidToken = Binder.clearCallingIdentity();
+ try {
+ FeatureFactory.getFactory(
+ mContext).getSlicesFeatureProvider().indexSliceData(mContext);
+ } finally {
+ Binder.restoreCallingIdentity(uidToken);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/slices/SlicesDatabaseHelper.java b/src/com/android/settings/slices/SlicesDatabaseHelper.java
index 18f8cc9..627c62e 100644
--- a/src/com/android/settings/slices/SlicesDatabaseHelper.java
+++ b/src/com/android/settings/slices/SlicesDatabaseHelper.java
@@ -104,7 +104,7 @@
public static synchronized SlicesDatabaseHelper getInstance(Context context) {
if (sSingleton == null) {
- sSingleton = new SlicesDatabaseHelper(context);
+ sSingleton = new SlicesDatabaseHelper(context.getApplicationContext());
}
return sSingleton;
}
@@ -136,7 +136,7 @@
mContext.getSharedPreferences(SHARED_PREFS_TAG, Context.MODE_PRIVATE)
.edit()
.clear()
- .commit();
+ .apply();
dropTables(db);
createDatabases(db);
}
diff --git a/src/com/android/settings/slices/SlicesFeatureProvider.java b/src/com/android/settings/slices/SlicesFeatureProvider.java
index cbf1b75..e5bba61 100644
--- a/src/com/android/settings/slices/SlicesFeatureProvider.java
+++ b/src/com/android/settings/slices/SlicesFeatureProvider.java
@@ -13,5 +13,15 @@
SliceDataConverter getSliceDataConverter(Context context);
+ /**
+ * Asynchronous call to index the data used to build Slices.
+ * If the data is already indexed, the data will not change.
+ */
+ void indexSliceDataAsync(Context context);
+
+ /**
+ * Indexes the data used to build Slices.
+ * If the data is already indexed, the data will not change.
+ */
void indexSliceData(Context context);
}
\ No newline at end of file
diff --git a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
index 34ef884..8e5bc06 100644
--- a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
+++ b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
@@ -15,7 +15,7 @@
@Override
public SlicesIndexer getSliceIndexer(Context context) {
if (mSlicesIndexer == null) {
- mSlicesIndexer = new SlicesIndexer(context.getApplicationContext());
+ mSlicesIndexer = new SlicesIndexer(context);
}
return mSlicesIndexer;
}
@@ -29,9 +29,14 @@
}
@Override
- public void indexSliceData(Context context) {
- // TODO (b/67996923) add indexing time log
+ public void indexSliceDataAsync(Context context) {
SlicesIndexer indexer = getSliceIndexer(context);
ThreadUtils.postOnBackgroundThread(indexer);
}
-}
+
+ @Override
+ public void indexSliceData(Context context) {
+ SlicesIndexer indexer = getSliceIndexer(context);
+ indexer.indexSliceData();
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java
index 0297f3f..a92388a 100644
--- a/src/com/android/settings/slices/SlicesIndexer.java
+++ b/src/com/android/settings/slices/SlicesIndexer.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.VisibleForTesting;
+import android.util.Log;
import com.android.settings.dashboard.DashboardFragment;
@@ -36,7 +37,7 @@
*/
class SlicesIndexer implements Runnable {
- private static final String TAG = "SlicesIndexingManager";
+ private static final String TAG = "SlicesIndexer";
private Context mContext;
@@ -48,18 +49,27 @@
}
/**
- * Synchronously takes data obtained from {@link SliceDataConverter} and indexes it into a
- * SQLite database.
+ * Asynchronously index slice data from {@link #indexSliceData()}.
*/
@Override
public void run() {
+ indexSliceData();
+ }
+
+ /**
+ * Synchronously takes data obtained from {@link SliceDataConverter} and indexes it into a
+ * SQLite database
+ */
+ protected void indexSliceData() {
if (mHelper.isSliceDataIndexed()) {
+ Log.d(TAG, "Slices already indexed - returning.");
return;
}
SQLiteDatabase database = mHelper.getWritableDatabase();
try {
+ long startTime = System.currentTimeMillis();
database.beginTransaction();
mHelper.reconstruct(mHelper.getWritableDatabase());
@@ -67,6 +77,10 @@
insertSliceData(database, indexData);
mHelper.setIndexedState();
+
+ // TODO (b/71503044) Log indexing time.
+ Log.d(TAG,
+ "Indexing slices database took: " + (System.currentTimeMillis() - startTime));
database.setTransactionSuccessful();
} finally {
database.endTransaction();
diff --git a/src/com/android/settings/support/SupportDashboardActivity.java b/src/com/android/settings/support/SupportDashboardActivity.java
index 3b5d623..e829577 100644
--- a/src/com/android/settings/support/SupportDashboardActivity.java
+++ b/src/com/android/settings/support/SupportDashboardActivity.java
@@ -66,7 +66,7 @@
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_help;
+ 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/accounts/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
similarity index 92%
rename from src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
rename to src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
index c93ef73..06601fa 100644
--- a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.accounts;
+package com.android.settings.users;
import android.content.Context;
import android.provider.Settings.Global;
import android.support.v7.preference.Preference;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.users.UserCapabilities;
import com.android.settingslib.RestrictedSwitchPreference;
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;
@@ -35,10 +35,13 @@
private final UserCapabilities mUserCaps;
private boolean mShouldUpdateUserList;
- public AddUserWhenLockedPreferenceController(Context context, String key) {
+ public AddUserWhenLockedPreferenceController(Context context, String key, Lifecycle lifecycle) {
super(context);
mPrefKey = key;
mUserCaps = UserCapabilities.create(context);
+ if (lifecycle != null) {
+ lifecycle.addObserver(this);
+ }
}
@Override
diff --git a/src/com/android/settings/accounts/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java
similarity index 99%
rename from src/com/android/settings/accounts/AutoSyncDataPreferenceController.java
rename to src/com/android/settings/users/AutoSyncDataPreferenceController.java
index 128e88d..5d9ec43 100644
--- a/src/com/android/settings/accounts/AutoSyncDataPreferenceController.java
+++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.accounts;
+package com.android.settings.users;
import android.app.ActivityManager;
import android.app.AlertDialog;
diff --git a/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceController.java b/src/com/android/settings/users/AutoSyncPersonalDataPreferenceController.java
similarity index 97%
rename from src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceController.java
rename to src/com/android/settings/users/AutoSyncPersonalDataPreferenceController.java
index 673b453..79099ad 100644
--- a/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceController.java
+++ b/src/com/android/settings/users/AutoSyncPersonalDataPreferenceController.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.accounts;
+package com.android.settings.users;
import android.app.Fragment;
import android.content.Context;
diff --git a/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java
similarity index 96%
rename from src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java
rename to src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java
index acf43aa..1970195 100644
--- a/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java
+++ b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.accounts;
+package com.android.settings.users;
import android.app.Fragment;
import android.content.Context;
diff --git a/src/com/android/settings/users/UserCapabilities.java b/src/com/android/settings/users/UserCapabilities.java
index a92e3e2..084a5db 100644
--- a/src/com/android/settings/users/UserCapabilities.java
+++ b/src/com/android/settings/users/UserCapabilities.java
@@ -41,6 +41,7 @@
public static UserCapabilities create(Context context) {
UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
UserCapabilities caps = new UserCapabilities();
+
if (!UserManager.supportsMultipleUsers() || Utils.isMonkeyRunning()) {
caps.mEnabled = false;
return caps;
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 834166b..a8fab13 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -103,6 +103,7 @@
private static final String KEY_USER_LIST = "user_list";
private static final String KEY_USER_ME = "user_me";
private static final String KEY_ADD_USER = "user_add";
+ private static final String KEY_ADD_USER_WHEN_LOCKED = "user_settings_add_users_when_locked";
private static final int MENU_REMOVE_USER = Menu.FIRST;
@@ -145,8 +146,11 @@
private SparseArray<Bitmap> mUserIcons = new SparseArray<>();
private static SparseArray<Bitmap> sDarkDefaultUserBitmapCache = new SparseArray<>();
- private EditUserInfoController mEditUserInfoController =
- new EditUserInfoController();
+ private EditUserInfoController mEditUserInfoController = new EditUserInfoController();
+ private AddUserWhenLockedPreferenceController mAddUserWhenLockedPreferenceController;
+ private AutoSyncDataPreferenceController mAutoSyncDataPreferenceController;
+ private AutoSyncPersonalDataPreferenceController mAutoSyncPersonalDataPreferenceController;
+ private AutoSyncWorkDataPreferenceController mAutoSyncWorkDataPreferenceController;
// A place to cache the generated default avatar
private Drawable mDefaultIconDrawable;
@@ -191,6 +195,28 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
+ addPreferencesFromResource(R.xml.user_settings);
+ if (Global.getInt(getContext().getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+ getActivity().finish();
+ return;
+ }
+ final Context context = getActivity();
+ mAddUserWhenLockedPreferenceController = new AddUserWhenLockedPreferenceController(
+ context, KEY_ADD_USER_WHEN_LOCKED, getLifecycle());
+
+ mAutoSyncDataPreferenceController = new AutoSyncDataPreferenceController(context, this);
+ mAutoSyncPersonalDataPreferenceController =
+ new AutoSyncPersonalDataPreferenceController(context, this);
+ mAutoSyncWorkDataPreferenceController =
+ new AutoSyncWorkDataPreferenceController(context, this);
+
+ final PreferenceScreen screen = getPreferenceScreen();
+ mAddUserWhenLockedPreferenceController.displayPreference(screen);
+ mAutoSyncDataPreferenceController.displayPreference(screen);
+ mAutoSyncPersonalDataPreferenceController.displayPreference(screen);
+ mAutoSyncWorkDataPreferenceController.displayPreference(screen);
+ screen.findPreference(mAddUserWhenLockedPreferenceController.getPreferenceKey())
+ .setOnPreferenceChangeListener(mAddUserWhenLockedPreferenceController);
if (icicle != null) {
if (icicle.containsKey(SAVE_ADDING_USER)) {
@@ -201,7 +227,7 @@
}
mEditUserInfoController.onRestoreInstanceState(icicle);
}
- final Context context = getActivity();
+
mUserCaps = UserCapabilities.create(context);
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
if (!mUserCaps.mEnabled) {
@@ -210,7 +236,6 @@
final int myUserId = UserHandle.myUserId();
- addPreferencesFromResource(R.xml.user_settings);
mUserListCategory = (PreferenceGroup) findPreference(KEY_USER_LIST);
mMePreference = new UserPreference(getPrefContext(), null /* attrs */, myUserId,
null /* settings icon handler */,
@@ -230,25 +255,40 @@
mAddUser.setTitle(R.string.user_add_user_menu);
}
}
- setHasOptionsMenu(true);
- IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
+ final IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
filter.addAction(Intent.ACTION_USER_INFO_CHANGED);
context.registerReceiverAsUser(mUserChangeReceiver, UserHandle.ALL, filter, null, mHandler);
loadProfile();
updateUserList();
mShouldUpdateUserList = false;
-
- if (Global.getInt(getContext().getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
- getActivity().finish();
- return;
- }
}
@Override
public void onResume() {
super.onResume();
- if (!mUserCaps.mEnabled) return;
+ if (!mUserCaps.mEnabled) {
+ return;
+ }
+ final PreferenceScreen screen = getPreferenceScreen();
+
+ if (mAutoSyncDataPreferenceController.isAvailable()) {
+ mAutoSyncDataPreferenceController.updateState(screen.findPreference(
+ mAutoSyncDataPreferenceController.getPreferenceKey()));
+ }
+ if (mAddUserWhenLockedPreferenceController.isAvailable()) {
+ mAddUserWhenLockedPreferenceController.updateState(screen.findPreference(
+ mAddUserWhenLockedPreferenceController.getPreferenceKey()));
+ }
+ if (mAutoSyncPersonalDataPreferenceController.isAvailable()) {
+ mAutoSyncPersonalDataPreferenceController.updateState(screen.findPreference(
+ mAutoSyncPersonalDataPreferenceController.getPreferenceKey()));
+ }
+ if (mAutoSyncWorkDataPreferenceController.isAvailable()) {
+ mAutoSyncWorkDataPreferenceController.updateState(screen.findPreference(
+ mAutoSyncWorkDataPreferenceController.getPreferenceKey()));
+ }
+
if (mShouldUpdateUserList) {
mUserCaps.updateAddUserCapabilities(getActivity());
loadProfile();
@@ -266,7 +306,9 @@
public void onDestroy() {
super.onDestroy();
- if (!mUserCaps.mEnabled) return;
+ if (!mUserCaps.mEnabled) {
+ return;
+ }
getActivity().unregisterReceiver(mUserChangeReceiver);
}
@@ -286,6 +328,20 @@
}
@Override
+ public boolean onPreferenceTreeClick(Preference preference) {
+ if (mAutoSyncDataPreferenceController.handlePreferenceTreeClick(preference)) {
+ return true;
+ }
+ if (mAutoSyncPersonalDataPreferenceController.handlePreferenceTreeClick(preference)) {
+ return true;
+ }
+ if (mAutoSyncWorkDataPreferenceController.handlePreferenceTreeClick(preference)) {
+ return true;
+ }
+ return super.onPreferenceTreeClick(preference);
+ }
+
+ @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
int pos = 0;
UserManager um = getContext().getSystemService(UserManager.class);
@@ -857,32 +913,24 @@
loadIconsAsync(missingIcons);
}
- PreferenceScreen preferenceScreen = getPreferenceScreen();
- preferenceScreen.removeAll();
-
- // If profiles are supported, userPreferences will be added to the category labeled
- // "User & Profiles", otherwise the category is skipped and elements are added directly
- // to preferenceScreen
- PreferenceGroup groupToAddUsers;
+ // Remove everything from mUserListCategory and add new users.
+ mUserListCategory.removeAll();
+ // If profiles are supported, mUserListCategory will have a special title
if (mUserCaps.mCanAddRestrictedProfile) {
- mUserListCategory.removeAll();
- mUserListCategory.setOrder(Preference.DEFAULT_ORDER);
- preferenceScreen.addPreference(mUserListCategory);
- groupToAddUsers = mUserListCategory;
+ mUserListCategory.setTitle(R.string.user_list_title);
} else {
- groupToAddUsers = preferenceScreen;
+ mUserListCategory.setTitle(null);
}
+
for (UserPreference userPreference : userPreferences) {
userPreference.setOrder(Preference.DEFAULT_ORDER);
- groupToAddUsers.addPreference(userPreference);
+ mUserListCategory.addPreference(userPreference);
}
// Append Add user to the end of the list
if ((mUserCaps.mCanAddUser || mUserCaps.mDisallowAddUserSetByAdmin) &&
Utils.isDeviceProvisioned(getActivity())) {
boolean moreUsers = mUserManager.canAddMoreUsers();
- mAddUser.setOrder(Preference.DEFAULT_ORDER);
- preferenceScreen.addPreference(mAddUser);
mAddUser.setEnabled(moreUsers && !mAddingUser);
if (!moreUsers) {
mAddUser.setSummary(getString(R.string.user_add_max_count, getMaxRealUsers()));
diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java
index d222345..e89757c 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -143,8 +143,10 @@
final boolean enable = (boolean) newValue;
return setEnabled(cn, summary, enable);
});
+ pref.setKey(cn.flattenToString());
screen.addPreference(pref);
}
+ highlightPreferenceIfNeeded();
}
private int getCurrentUser(int managedProfileId) {
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 7a9fc39..8f42389 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -22,6 +22,7 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
+import android.content.pm.PackageManager;
import android.database.ContentObserver;
import android.hardware.display.DisplayManager;
import android.hardware.display.WifiDisplay;
@@ -218,13 +219,9 @@
}
public static boolean isAvailable(Context context) {
- try {
- return context.getSystemService(Context.DISPLAY_SERVICE) != null
- && context.getSystemService(Context.WIFI_P2P_SERVICE) != null;
- } catch (Exception e) {
- // Service is not registered, so this is definitely not available.
- return false;
- }
+ return context.getSystemService(Context.DISPLAY_SERVICE) != null
+ && context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)
+ && context.getSystemService(Context.WIFI_P2P_SERVICE) != null;
}
private void scheduleUpdate(int changes) {
diff --git a/src/com/android/settings/widget/AppCheckBoxPreference.java b/src/com/android/settings/widget/AppCheckBoxPreference.java
new file mode 100644
index 0000000..9cb1d78
--- /dev/null
+++ b/src/com/android/settings/widget/AppCheckBoxPreference.java
@@ -0,0 +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.widget;
+
+import android.content.Context;
+import android.support.v7.preference.CheckBoxPreference;
+import android.util.AttributeSet;
+
+import com.android.settings.R;
+
+/**
+ * {@link CheckBoxPreference} that used only to display app
+ */
+public class AppCheckBoxPreference extends CheckBoxPreference {
+ public AppCheckBoxPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ setLayoutResource(R.layout.preference_app);
+ }
+
+ public AppCheckBoxPreference(Context context) {
+ super(context);
+ setLayoutResource(R.layout.preference_app);
+ }
+}
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 0d07e67..8607211 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -16,6 +16,10 @@
package com.android.settings.widget;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+ .ACTION_OPEN_APP_NOTIFICATION_SETTING;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING;
+
import android.annotation.IdRes;
import android.annotation.UserIdInt;
import android.app.ActionBar;
@@ -27,6 +31,7 @@
import android.content.pm.ResolveInfo;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
+import android.os.Bundle;
import android.os.UserHandle;
import android.support.annotation.IntDef;
import android.support.annotation.VisibleForTesting;
@@ -54,20 +59,18 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
- .ACTION_OPEN_APP_NOTIFICATION_SETTING;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING;
-
public class EntityHeaderController {
@IntDef({ActionType.ACTION_NONE,
ActionType.ACTION_APP_PREFERENCE,
- ActionType.ACTION_NOTIF_PREFERENCE})
+ ActionType.ACTION_NOTIF_PREFERENCE,
+ ActionType.ACTION_DND_RULE_PREFERENCE,})
@Retention(RetentionPolicy.SOURCE)
public @interface ActionType {
int ACTION_NONE = 0;
int ACTION_APP_PREFERENCE = 1;
int ACTION_NOTIF_PREFERENCE = 2;
+ int ACTION_DND_RULE_PREFERENCE = 3;
}
public static final String PREF_KEY_APP_HEADER = "pref_app_header";
@@ -98,6 +101,8 @@
private boolean mIsInstantApp;
+ private View.OnClickListener mEditRuleNameOnClickListener;
+
/**
* Creates a new instance of the controller.
*
@@ -211,6 +216,11 @@
return this;
}
+ public EntityHeaderController setEditZenRuleNameListener(View.OnClickListener listener) {
+ this.mEditRuleNameOnClickListener = listener;
+ return this;
+ }
+
/**
* Done mutating entity header, rebinds everything and return a new {@link LayoutPreference}.
*/
@@ -291,6 +301,11 @@
return;
}
+ /**
+ * Styles the action bar (elevation, scrolling behaviors, color, etc).
+ * <p/>
+ * This method must be called after {@link Fragment#onCreate(Bundle)}.
+ */
public EntityHeaderController styleActionBar(Activity activity) {
if (activity == null) {
Log.w(TAG, "No activity, cannot style actionbar.");
@@ -324,6 +339,16 @@
return;
}
switch (action) {
+ case ActionType.ACTION_DND_RULE_PREFERENCE: {
+ if (mEditRuleNameOnClickListener == null) {
+ button.setVisibility(View.GONE);
+ } else {
+ button.setImageResource(R.drawable.ic_mode_edit);
+ button.setVisibility(View.VISIBLE);
+ button.setOnClickListener(mEditRuleNameOnClickListener);
+ }
+ return;
+ }
case ActionType.ACTION_NOTIF_PREFERENCE: {
if (mAppNotifPrefIntent == null) {
button.setVisibility(View.GONE);
diff --git a/src/com/android/settings/widget/LinearColorBar.java b/src/com/android/settings/widget/LinearColorBar.java
new file mode 100644
index 0000000..b3e685e
--- /dev/null
+++ b/src/com/android/settings/widget/LinearColorBar.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.widget.LinearLayout;
+
+import com.android.settings.Utils;
+
+public class LinearColorBar extends LinearLayout {
+
+ static final int RIGHT_COLOR = 0xffced7db;
+ static final int GRAY_COLOR = 0xff555555;
+ static final int WHITE_COLOR = 0xffffffff;
+
+ private float mRedRatio;
+ private float mYellowRatio;
+ private float mGreenRatio;
+
+ private int mLeftColor;
+ private int mMiddleColor;
+ private int mRightColor = RIGHT_COLOR;
+
+ private int mColoredRegions = REGION_RED | REGION_YELLOW | REGION_GREEN;
+
+ final Rect mRect = new Rect();
+ final Paint mPaint = new Paint();
+
+ int mLineWidth;
+
+ int mLastRegion;
+
+ final Paint mColorGradientPaint = new Paint();
+ final Paint mEdgeGradientPaint = new Paint();
+
+ public static final int REGION_RED = 1 << 0;
+ public static final int REGION_YELLOW = 1 << 1;
+ public static final int REGION_GREEN = 1 << 2;
+
+ public LinearColorBar(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ setWillNotDraw(false);
+ mPaint.setStyle(Paint.Style.FILL);
+ mColorGradientPaint.setStyle(Paint.Style.FILL);
+ mColorGradientPaint.setAntiAlias(true);
+ mEdgeGradientPaint.setStyle(Paint.Style.STROKE);
+ mLineWidth = getResources().getDisplayMetrics().densityDpi >= DisplayMetrics.DENSITY_HIGH
+ ? 2 : 1;
+ mEdgeGradientPaint.setStrokeWidth(mLineWidth);
+ mEdgeGradientPaint.setAntiAlias(true);
+ mLeftColor = mMiddleColor = Utils.getColorAccent(context);
+ }
+
+ public void setRatios(float red, float yellow, float green) {
+ mRedRatio = red;
+ mYellowRatio = yellow;
+ mGreenRatio = green;
+ invalidate();
+ }
+
+ public void setColors(int red, int yellow, int green) {
+ mLeftColor = red;
+ mMiddleColor = yellow;
+ mRightColor = green;
+ updateIndicator();
+ invalidate();
+ }
+
+ private void updateIndicator() {
+ int off = getPaddingTop() - getPaddingBottom();
+ if (off < 0) off = 0;
+ mRect.top = off;
+ mRect.bottom = getHeight();
+ }
+
+ @Override
+ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+ super.onSizeChanged(w, h, oldw, oldh);
+ updateIndicator();
+ }
+
+ @Override
+ protected void dispatchSetPressed(boolean pressed) {
+ invalidate();
+ }
+
+ private int pickColor(int color, int region) {
+ if (isPressed() && (mLastRegion & region) != 0) {
+ return WHITE_COLOR;
+ }
+ if ((mColoredRegions & region) == 0) {
+ return GRAY_COLOR;
+ }
+ return color;
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ super.onDraw(canvas);
+
+ final int width = getWidth();
+
+ if (!isLayoutRtl()) {
+ drawLtr(canvas, width);
+ } else {
+ drawRtl(canvas, width);
+ }
+ }
+
+ private void drawLtr(Canvas canvas, int width) {
+ int start = 0;
+ int end = start + (int) (width * mRedRatio);
+ int end2 = end + (int) (width * mYellowRatio);
+
+ if (start < end) {
+ mRect.left = start;
+ mRect.right = end;
+ mPaint.setColor(pickColor(mLeftColor, REGION_RED));
+ canvas.drawRect(mRect, mPaint);
+ start = end;
+ }
+
+ end = end2;
+
+ if (start < end) {
+ mRect.left = start;
+ mRect.right = end;
+ mPaint.setColor(pickColor(mMiddleColor, REGION_YELLOW));
+ canvas.drawRect(mRect, mPaint);
+ start = end;
+ }
+
+ end = width;
+ if (start < end) {
+ mRect.left = start;
+ mRect.right = end;
+ mPaint.setColor(pickColor(mRightColor, REGION_GREEN));
+ canvas.drawRect(mRect, mPaint);
+ }
+ }
+
+ private void drawRtl(Canvas canvas, int width) {
+ int start = width;
+ int end = start - (int) (width * mRedRatio);
+ int end2 = end - (int) (width * mYellowRatio);
+
+ if (start > end) {
+ mRect.left = end;
+ mRect.right = start;
+ mPaint.setColor(pickColor(mLeftColor, REGION_RED));
+ canvas.drawRect(mRect, mPaint);
+ start = end;
+ }
+
+ end = end2;
+
+ if (start > end) {
+ mRect.left = end;
+ mRect.right = start;
+ mPaint.setColor(pickColor(mMiddleColor, REGION_YELLOW));
+ canvas.drawRect(mRect, mPaint);
+ start = end;
+ }
+
+ end = 0;
+ if (start > end) {
+ mRect.left = end;
+ mRect.right = start;
+ mPaint.setColor(pickColor(mRightColor, REGION_GREEN));
+ canvas.drawRect(mRect, mPaint);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/widget/MasterCheckBoxPreference.java b/src/com/android/settings/widget/MasterCheckBoxPreference.java
index 333c9aa..552f51c 100644
--- a/src/com/android/settings/widget/MasterCheckBoxPreference.java
+++ b/src/com/android/settings/widget/MasterCheckBoxPreference.java
@@ -34,6 +34,7 @@
private CheckBox mCheckBox;
private boolean mChecked;
+ private boolean mEnableCheckBox = true;
public MasterCheckBoxPreference(Context context, AttributeSet attrs,
int defStyleAttr, int defStyleRes) {
@@ -88,9 +89,7 @@
@Override
public void setEnabled(boolean enabled) {
super.setEnabled(enabled);
- if (mCheckBox != null) {
- mCheckBox.setEnabled(enabled);
- }
+ setCheckBoxEnabled(enabled);
}
public boolean isChecked() {
@@ -104,6 +103,13 @@
}
}
+ public void setCheckBoxEnabled(boolean enabled) {
+ mEnableCheckBox = enabled;
+ if (mCheckBox != null) {
+ mCheckBox.setEnabled(enabled);
+ }
+ }
+
public CheckBox getCheckBox() {
return mCheckBox;
}
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 7dacaf5..adc386a 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -16,6 +16,7 @@
package com.android.settings.widget;
+import android.app.ActivityManager;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProvider;
@@ -25,6 +26,7 @@
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;
@@ -33,10 +35,12 @@
import android.os.Handler;
import android.os.IPowerManager;
import android.os.PowerManager;
+import android.os.Process;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserManager;
import android.provider.Settings;
+import android.provider.Settings.Secure;
import android.util.Log;
import android.widget.RemoteViews;
@@ -561,27 +565,14 @@
final UserManager um =
(UserManager) context.getSystemService(Context.USER_SERVICE);
if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
- int currentMode = Settings.Secure.getInt(resolver,
- Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
- int mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
- switch (currentMode) {
- case Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
- mode = Settings.Secure.LOCATION_MODE_BATTERY_SAVING;
- break;
- case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
- mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
- break;
- case Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
- mode = Settings.Secure.LOCATION_MODE_OFF;
- break;
- case Settings.Secure.LOCATION_MODE_OFF:
- mode = Settings.Secure.LOCATION_MODE_PREVIOUS;
- break;
- }
- Settings.Secure.putInt(resolver, Settings.Secure.LOCATION_MODE, mode);
- return mode != Settings.Secure.LOCATION_MODE_OFF;
+ 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;
}
@@ -746,7 +737,7 @@
R.drawable.appwidget_settings_ind_on_r_holo);
} else {
final int brightness = getBrightness(context);
- final PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
+ final PowerManager pm = context.getSystemService(PowerManager.class);
// Set the icon
final int full = (int)(pm.getMaximumScreenBrightnessSetting()
* FULL_BRIGHTNESS_THRESHOLD);
@@ -882,53 +873,48 @@
*/
private void toggleBrightness(Context context) {
try {
- IPowerManager power = IPowerManager.Stub.asInterface(
- ServiceManager.getService("power"));
- if (power != null) {
- PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
+ 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) {
- power.setTemporaryScreenBrightnessSettingOverride(brightness);
- Settings.System.putInt(cr, Settings.System.SCREEN_BRIGHTNESS, brightness);
- }
+ 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);
}
- } catch (RemoteException e) {
- Log.d(TAG, "toggleBrightness: " + e);
+
+ // 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);
}
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index 3c1e7c1..3be5eca 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -22,6 +22,8 @@
import android.content.res.TypedArray;
import android.os.Parcel;
import android.os.Parcelable;
+import android.support.annotation.ColorInt;
+import android.support.annotation.StringRes;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.style.TextAppearanceSpan;
@@ -37,11 +39,12 @@
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.ArrayList;
+import java.util.List;
public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener,
View.OnClickListener {
@@ -56,7 +59,14 @@
void onSwitchChanged(Switch switchView, boolean isChecked);
}
- private MetricsFeatureProvider mMetricsFeatureProvider;
+ private static final int[] XML_ATTRIBUTES = {
+ R.attr.switchBarMarginStart,
+ R.attr.switchBarMarginEnd,
+ R.attr.switchBarBackgroundColor,
+ R.attr.switchBarBackgroundActivatedColor};
+
+ private final List<OnSwitchChangeListener> mSwitchChangeListeners = new ArrayList<>();
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
private final TextAppearanceSpan mSummarySpan;
private ToggleSwitch mSwitch;
@@ -64,20 +74,20 @@
private TextView mTextView;
private String mLabel;
private String mSummary;
+ @ColorInt
+ private int mBackgroundColor;
+ @ColorInt
+ private int mBackgroundActivatedColor;
+ @StringRes
private int mOnTextId;
+ @StringRes
private int mOffTextId;
private boolean mLoggingIntialized;
private boolean mDisabledByAdmin;
private EnforcedAdmin mEnforcedAdmin = null;
-
private String mMetricsTag;
- private final ArrayList<OnSwitchChangeListener> mSwitchChangeListeners = new ArrayList<>();
-
- private static int[] XML_ATTRIBUTES = {
- R.attr.switchBarMarginStart, R.attr.switchBarMarginEnd,
- R.attr.switchBarBackgroundColor};
public SwitchBar(Context context) {
this(context, null);
@@ -99,32 +109,30 @@
final TypedArray a = context.obtainStyledAttributes(attrs, XML_ATTRIBUTES);
int switchBarMarginStart = (int) a.getDimension(0, 0);
int switchBarMarginEnd = (int) a.getDimension(1, 0);
- int switchBarBackgroundColor = (int) a.getColor(2, 0);
+ mBackgroundColor = a.getColor(2, 0);
+ mBackgroundActivatedColor = a.getColor(3, 0);
a.recycle();
- mTextView = (TextView) findViewById(R.id.switch_text);
+ mTextView = findViewById(R.id.switch_text);
mTextView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
mSummarySpan = new TextAppearanceSpan(mContext, R.style.TextAppearance_Small_SwitchBar);
ViewGroup.MarginLayoutParams lp = (MarginLayoutParams) mTextView.getLayoutParams();
lp.setMarginStart(switchBarMarginStart);
- mSwitch = (ToggleSwitch) findViewById(R.id.switch_widget);
+ mSwitch = findViewById(R.id.switch_widget);
// Prevent onSaveInstanceState() to be called as we are managing the state of the Switch
// on our own
mSwitch.setSaveEnabled(false);
mSwitch.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
+
lp = (MarginLayoutParams) mSwitch.getLayoutParams();
lp.setMarginEnd(switchBarMarginEnd);
- setBackgroundColor(switchBarBackgroundColor);
+ setBackgroundColor(mBackgroundColor);
setSwitchBarText(R.string.switch_on_text, R.string.switch_off_text);
- addOnSwitchChangeListener(new OnSwitchChangeListener() {
- @Override
- public void onSwitchChanged(Switch switchView, boolean isChecked) {
- setTextViewLabel(isChecked);
- }
- });
+ addOnSwitchChangeListener(
+ (switchView, isChecked) -> setTextViewLabelAndBackground(isChecked));
mRestrictedIcon = findViewById(R.id.restricted_icon);
@@ -140,15 +148,16 @@
mMetricsTag = tag;
}
- public void setTextViewLabel(boolean isChecked) {
+ public void setTextViewLabelAndBackground(boolean isChecked) {
mLabel = getResources().getString(isChecked ? mOnTextId : mOffTextId);
+ setBackgroundColor(isChecked ? mBackgroundActivatedColor : mBackgroundColor);
updateText();
}
public void setSwitchBarText(int onText, int offText) {
mOnTextId = onText;
mOffTextId = offText;
- setTextViewLabel(isChecked());
+ setTextViewLabelAndBackground(isChecked());
}
public void setSummary(String summary) {
@@ -169,12 +178,12 @@
}
public void setChecked(boolean checked) {
- setTextViewLabel(checked);
+ setTextViewLabelAndBackground(checked);
mSwitch.setChecked(checked);
}
public void setCheckedInternal(boolean checked) {
- setTextViewLabel(checked);
+ setTextViewLabelAndBackground(checked);
mSwitch.setCheckedInternal(checked);
}
@@ -290,8 +299,8 @@
*/
private SavedState(Parcel in) {
super(in);
- checked = (Boolean)in.readValue(null);
- visible = (Boolean)in.readValue(null);
+ checked = (Boolean) in.readValue(null);
+ visible = (Boolean) in.readValue(null);
}
@Override
@@ -338,7 +347,7 @@
super.onRestoreInstanceState(ss.getSuperState());
mSwitch.setCheckedInternal(ss.checked);
- setTextViewLabel(ss.checked);
+ setTextViewLabelAndBackground(ss.checked);
setVisibility(ss.visible ? View.VISIBLE : View.GONE);
mSwitch.setOnCheckedChangeListener(ss.visible ? this : null);
diff --git a/src/com/android/settings/widget/SwitchBarController.java b/src/com/android/settings/widget/SwitchBarController.java
index cc4c8dc..ede02af 100644
--- a/src/com/android/settings/widget/SwitchBarController.java
+++ b/src/com/android/settings/widget/SwitchBarController.java
@@ -43,7 +43,7 @@
@Override
public void updateTitle(boolean isChecked) {
- mSwitchBar.setTextViewLabel(isChecked);
+ mSwitchBar.setTextViewLabelAndBackground(isChecked);
}
@Override
diff --git a/src/com/android/settings/widget/ToggleSwitch.java b/src/com/android/settings/widget/ToggleSwitch.java
index 8232ff1..b392c8e 100644
--- a/src/com/android/settings/widget/ToggleSwitch.java
+++ b/src/com/android/settings/widget/ToggleSwitch.java
@@ -24,8 +24,8 @@
private ToggleSwitch.OnBeforeCheckedChangeListener mOnBeforeListener;
- public static interface OnBeforeCheckedChangeListener {
- public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
+ public interface OnBeforeCheckedChangeListener {
+ boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
}
public ToggleSwitch(Context context) {
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 4da7366..5e5d5ff 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -146,11 +146,11 @@
private TextView mDns2View;
private Spinner mProxySettingsSpinner;
+ private Spinner mMeteredSettingsSpinner;
private TextView mProxyHostView;
private TextView mProxyPortView;
private TextView mProxyExclusionListView;
private TextView mProxyPacView;
-
private CheckBox mSharedCheckBox;
private IpAssignment mIpAssignment = IpAssignment.UNASSIGNED;
@@ -208,6 +208,7 @@
mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
mProxySettingsSpinner.setOnItemSelectedListener(this);
mSharedCheckBox = (CheckBox) mView.findViewById(R.id.shared);
+ mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings);
if (mAccessPoint == null) { // new network
mConfigUi.setTitle(R.string.wifi_add_network);
@@ -237,6 +238,7 @@
boolean showAdvancedFields = false;
if (mAccessPoint.isSaved()) {
WifiConfiguration config = mAccessPoint.getConfig();
+ mMeteredSettingsSpinner.setSelection(config.meteredOverride);
if (config.getIpAssignment() == IpAssignment.STATIC) {
mIpSettingsSpinner.setSelection(STATIC_IP);
showAdvancedFields = true;
@@ -671,6 +673,9 @@
config.setIpConfiguration(
new IpConfiguration(mIpAssignment, mProxySettings,
mStaticIpConfiguration, mHttpProxy));
+ if (mMeteredSettingsSpinner != null) {
+ config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition();
+ }
return config;
}
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 9c43142..c5e79b2 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -33,9 +33,9 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settings.wrapper.ConnectivityManagerWrapper;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.WirelessUtils;
diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
index de1b030..8843d93 100644
--- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
@@ -19,12 +19,12 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.R;
import com.android.settings.widget.SummaryUpdater;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settings.widget.MasterSwitchController;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 74fe881..e32bef4 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -33,6 +33,7 @@
import android.net.wifi.WpsInfo;
import android.nfc.NfcAdapter;
import android.os.Bundle;
+import android.os.Handler;
import android.os.PowerManager;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
@@ -190,6 +191,9 @@
.findViewById(R.id.progress_bar_animation);
setProgressBarVisible(false);
}
+ ((SettingsActivity) activity).getSwitchBar().setSwitchBarText(
+ R.string.wifi_settings_master_switch_title,
+ R.string.wifi_settings_master_switch_title);
}
@Override
@@ -684,8 +688,13 @@
private void updateAccessPointsDelayed() {
// Safeguard from some delayed event handling
if (getActivity() != null && !mIsRestricted && mWifiManager.isWifiEnabled()) {
+ final View view = getView();
+ final Handler handler = view.getHandler();
+ if (handler != null && handler.hasCallbacks(mUpdateAccessPointsRunnable)) {
+ return;
+ }
setProgressBarVisible(true);
- getView().postDelayed(mUpdateAccessPointsRunnable, 300 /* delay milliseconds */);
+ view.postDelayed(mUpdateAccessPointsRunnable, 300 /* delay milliseconds */);
}
}
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index 70ee20d..4d9ad27 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -54,7 +54,6 @@
import com.android.settings.Utils;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.widget.ActionButtonPreference;
import com.android.settings.widget.EntityHeaderController;
import com.android.settings.wifi.WifiDetailPreference;
@@ -63,6 +62,7 @@
import com.android.settings.wifi.WifiUtils;
import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settingslib.core.AbstractPreferenceController;
+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.OnPause;
@@ -280,7 +280,7 @@
.setButton1Text(R.string.forget)
.setButton1Positive(false)
.setButton1OnClickListener(view -> forgetNetwork())
- .setButton2Text(R.string.support_sign_in_button_text)
+ .setButton2Text(R.string.wifi_sign_in_button_text)
.setButton2Positive(true)
.setButton2OnClickListener(view -> signIntoNetwork());
diff --git a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java
new file mode 100644
index 0000000..1a3d195
--- /dev/null
+++ b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.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.wifi.details;
+
+import android.app.backup.BackupManager;
+import android.content.Context;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.DropDownPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+/**
+ * {@link AbstractPreferenceController} that controls whether the wifi network is metered or not
+ */
+public class WifiMeteredPreferenceController extends BasePreferenceController implements
+ Preference.OnPreferenceChangeListener {
+
+ private static final String KEY_WIFI_METERED = "metered";
+ private WifiConfiguration mWifiConfiguration;
+ private WifiManager mWifiManager;
+
+ public WifiMeteredPreferenceController(Context context, WifiConfiguration wifiConfiguration) {
+ super(context, KEY_WIFI_METERED);
+ mWifiConfiguration = wifiConfiguration;
+ mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ final DropDownPreference dropDownPreference = (DropDownPreference) preference;
+ final int meteredOverride = getMeteredOverride();
+ dropDownPreference.setValue(Integer.toString(meteredOverride));
+ updateSummary(dropDownPreference, meteredOverride);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ mWifiConfiguration.meteredOverride = Integer.parseInt((String) newValue);
+ mWifiManager.updateNetwork(mWifiConfiguration);
+ // Stage the backup of the SettingsProvider package which backs this up
+ BackupManager.dataChanged("com.android.providers.settings");
+ updateSummary((DropDownPreference) preference, getMeteredOverride());
+ return true;
+ }
+
+ @VisibleForTesting
+ int getMeteredOverride() {
+ // Wrap the meteredOverride since robolectric cannot recognize it
+ return mWifiConfiguration.meteredOverride;
+ }
+
+ private void updateSummary(DropDownPreference preference, int meteredOverride) {
+ preference.setSummary(preference.getEntries()[meteredOverride]);
+ }
+}
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index ea30b56..9a5430b 100644
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -20,10 +20,13 @@
import android.app.Dialog;
import android.content.Context;
import android.net.ConnectivityManager;
+import android.net.NetworkPolicyManager;
+import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
+import android.support.v7.preference.DropDownPreference;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -122,6 +125,7 @@
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+ final List<AbstractPreferenceController> controllers = new ArrayList<>();
ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
mWifiDetailPreferenceController = WifiDetailPreferenceController.newInstance(
mAccessPoint,
@@ -133,6 +137,9 @@
context.getSystemService(WifiManager.class),
mMetricsFeatureProvider);
- return new ArrayList<>(Collections.singletonList(mWifiDetailPreferenceController));
+ controllers.add(mWifiDetailPreferenceController);
+ controllers.add(new WifiMeteredPreferenceController(context, mAccessPoint.getConfig()));
+
+ return controllers;
}
}
diff --git a/src/com/android/settings/HotspotOffReceiver.java b/src/com/android/settings/wifi/tether/HotspotOffReceiver.java
similarity index 97%
rename from src/com/android/settings/HotspotOffReceiver.java
rename to src/com/android/settings/wifi/tether/HotspotOffReceiver.java
index 4083082..fcbf888 100644
--- a/src/com/android/settings/HotspotOffReceiver.java
+++ b/src/com/android/settings/wifi/tether/HotspotOffReceiver.java
@@ -1,5 +1,5 @@
-package com.android.settings;
+package com.android.settings.wifi.tether;
import android.content.BroadcastReceiver;
import android.content.Context;
diff --git a/src/com/android/settings/TetherService.java b/src/com/android/settings/wifi/tether/TetherService.java
similarity index 98%
rename from src/com/android/settings/TetherService.java
rename to src/com/android/settings/wifi/tether/TetherService.java
index fce3f27..e491de8 100644
--- a/src/com/android/settings/TetherService.java
+++ b/src/com/android/settings/wifi/tether/TetherService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.wifi.tether;
import android.app.Activity;
import android.app.AlarmManager;
@@ -167,11 +167,16 @@
SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
prefs.edit().putString(KEY_TETHERS, tethersToString(mCurrentTethers)).commit();
+ unregisterReceivers();
if (DEBUG) Log.d(TAG, "Destroying TetherService");
- unregisterReceiver(mReceiver);
super.onDestroy();
}
+ private void unregisterReceivers() {
+ unregisterReceiver(mReceiver);
+ mHotspotReceiver.unregister();
+ }
+
private void removeTypeAtIndex(int index) {
mCurrentTethers.remove(index);
// If we are currently in the middle of a check, we may need to adjust the
diff --git a/src/com/android/settings/wifi/tether/WifiDeviceNameTextValidator.java b/src/com/android/settings/wifi/tether/WifiDeviceNameTextValidator.java
new file mode 100644
index 0000000..e766e32
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiDeviceNameTextValidator.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.tether;
+
+import com.android.settings.widget.ValidatedEditTextPreference;
+import com.android.settings.wifi.WifiUtils;
+
+/**
+ * Validates a text field for a valid Wi-Fi SSID name.
+ */
+public class WifiDeviceNameTextValidator implements ValidatedEditTextPreference.Validator {
+ @Override
+ public boolean isTextValid(String value) {
+ return !WifiUtils.isSSIDTooLong(value) && !WifiUtils.isSSIDTooShort(value);
+ }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
index 1e299ab..4c47a0d 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
@@ -18,6 +18,7 @@
import static android.net.wifi.WifiConfiguration.AP_BAND_2GHZ;
import static android.net.wifi.WifiConfiguration.AP_BAND_5GHZ;
+import static android.net.wifi.WifiConfiguration.AP_BAND_ANY;
import android.content.Context;
import android.net.wifi.WifiConfiguration;
@@ -32,7 +33,8 @@
private static final String TAG = "WifiTetherApBandPref";
private static final String PREF_KEY = "wifi_tether_network_ap_band";
private static final String[] BAND_VALUES =
- {String.valueOf(AP_BAND_2GHZ), String.valueOf(AP_BAND_5GHZ)};
+ {String.valueOf(AP_BAND_ANY), String.valueOf(AP_BAND_2GHZ),
+ String.valueOf(AP_BAND_5GHZ)};
private final String[] mBandEntries;
private int mBandIndex;
@@ -65,7 +67,7 @@
} else {
preference.setEntries(mBandEntries);
preference.setEntryValues(BAND_VALUES);
- preference.setSummary(mBandEntries[mBandIndex]);
+ preference.setSummary(mBandEntries[mBandIndex + 1]);
preference.setValue(String.valueOf(mBandIndex));
}
}
@@ -78,7 +80,8 @@
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
mBandIndex = Integer.parseInt((String) newValue);
- preference.setSummary(mBandEntries[mBandIndex]);
+ Log.d(TAG, "Band preference changed, updating band index to " + mBandIndex);
+ preference.setSummary(mBandEntries[mBandIndex + 1]);
mListener.onTetherConfigUpdated();
return true;
}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
index fa10607..11f1f59 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -24,6 +24,7 @@
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.PreferenceScreen;
import android.text.BidiFormatter;
@@ -51,7 +52,11 @@
private final WifiManager mWifiManager;
private final Lifecycle mLifecycle;
private WifiTetherSwitchBarController mSwitchController;
- private MasterSwitchPreference mPreference;
+ private int mSoftApState;
+ @VisibleForTesting
+ MasterSwitchPreference mPreference;
+ @VisibleForTesting
+ WifiTetherSoftApManager mWifiTetherSoftApManager;
static {
WIFI_TETHER_INTENT_FILTER = new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
@@ -60,6 +65,12 @@
}
public WifiTetherPreferenceController(Context context, Lifecycle lifecycle) {
+ this(context, lifecycle, true /* initSoftApManager */);
+ }
+
+ @VisibleForTesting
+ WifiTetherPreferenceController(Context context, Lifecycle lifecycle,
+ boolean initSoftApManager) {
super(context);
mConnectivityManager =
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -69,6 +80,9 @@
if (lifecycle != null) {
lifecycle.addObserver(this);
}
+ if (initSoftApManager) {
+ initWifiTetherSoftApManager();
+ }
}
@Override
@@ -101,6 +115,9 @@
if (mPreference != null) {
mContext.registerReceiver(mReceiver, WIFI_TETHER_INTENT_FILTER);
clearSummaryForAirplaneMode();
+ if (mWifiTetherSoftApManager != null) {
+ mWifiTetherSoftApManager.registerSoftApCallback();
+ }
}
}
@@ -108,9 +125,36 @@
public void onStop() {
if (mPreference != null) {
mContext.unregisterReceiver(mReceiver);
+ if (mWifiTetherSoftApManager != null) {
+ mWifiTetherSoftApManager.unRegisterSoftApCallback();
+ }
}
}
+ @VisibleForTesting
+ void initWifiTetherSoftApManager() {
+ // This manager only handles the number of connected devices, other parts are handled by
+ // normal BroadcastReceiver in this controller
+ mWifiTetherSoftApManager = new WifiTetherSoftApManager(mWifiManager,
+ new WifiTetherSoftApManager.WifiTetherSoftApCallback() {
+ @Override
+ public void onStateChanged(int state, int failureReason) {
+ mSoftApState = state;
+ }
+
+ @Override
+ public void onNumClientsChanged(int numClients) {
+ if (mPreference != null
+ && mSoftApState == WifiManager.WIFI_AP_STATE_ENABLED) {
+ // Only show the number of clients when state is on
+ mPreference.setSummary(mContext.getResources().getQuantityString(
+ R.plurals.wifi_tether_connected_summary, numClients,
+ numClients));
+ }
+ }
+ });
+ }
+
//
// Everything below is copied from WifiApEnabler
//
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
index b563e53..d7cb441 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
@@ -35,10 +35,12 @@
static final String DEFAULT_SSID = "AndroidAP";
private String mSSID;
+ private WifiDeviceNameTextValidator mWifiDeviceNameTextValidator;
public WifiTetherSSIDPreferenceController(Context context,
OnTetherConfigUpdateListener listener) {
super(context, listener);
+ mWifiDeviceNameTextValidator = new WifiDeviceNameTextValidator();
}
@Override
@@ -70,7 +72,7 @@
@Override
public boolean isTextValid(String value) {
- return !WifiUtils.isSSIDTooLong(value) && !WifiUtils.isSSIDTooShort(value);
+ return mWifiDeviceNameTextValidator.isTextValid(value);
}
public String getSSID() {
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSoftApManager.java b/src/com/android/settings/wifi/tether/WifiTetherSoftApManager.java
new file mode 100644
index 0000000..77a44b0
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiTetherSoftApManager.java
@@ -0,0 +1,47 @@
+package com.android.settings.wifi.tether;
+
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+
+/**
+ * Wrapper for {@link android.net.wifi.WifiManager.SoftApCallback} to pass the robo test
+ */
+public class WifiTetherSoftApManager {
+
+ private WifiManager mWifiManager;
+ private WifiTetherSoftApCallback mWifiTetherSoftApCallback;
+
+ private WifiManager.SoftApCallback mSoftApCallback = new WifiManager.SoftApCallback() {
+ @Override
+ public void onStateChanged(int state, int failureReason) {
+ mWifiTetherSoftApCallback.onStateChanged(state, failureReason);
+ }
+
+ @Override
+ public void onNumClientsChanged(int numClients) {
+ mWifiTetherSoftApCallback.onNumClientsChanged(numClients);
+ }
+ };
+ private Handler mHandler;
+
+ WifiTetherSoftApManager(WifiManager wifiManager,
+ WifiTetherSoftApCallback wifiTetherSoftApCallback) {
+ mWifiManager = wifiManager;
+ mWifiTetherSoftApCallback = wifiTetherSoftApCallback;
+ mHandler = new Handler();
+ }
+
+ public void registerSoftApCallback() {
+ mWifiManager.registerSoftApCallback(mSoftApCallback, mHandler);
+ }
+
+ public void unRegisterSoftApCallback() {
+ mWifiManager.unregisterSoftApCallback(mSoftApCallback);
+ }
+
+ public interface WifiTetherSoftApCallback {
+ void onStateChanged(int state, int failureReason);
+
+ void onNumClientsChanged(int numClients);
+ }
+}
diff --git a/src/com/android/settings/wrapper/EuiccManagerWrapper.java b/src/com/android/settings/wrapper/EuiccManagerWrapper.java
new file mode 100644
index 0000000..2a51526
--- /dev/null
+++ b/src/com/android/settings/wrapper/EuiccManagerWrapper.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.wrapper;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.telephony.euicc.EuiccManager;
+
+/**
+ * This class replicates a subset of the {@link android.telephony.euicc.EuiccManager}.
+ * The interface exists so that we can use a thin wrapper around the EuiccManager in
+ * production code and a mock in tests.
+ */
+public class EuiccManagerWrapper {
+
+ private final EuiccManager mEuiccManager;
+
+ public EuiccManagerWrapper(Context context) {
+ mEuiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
+ }
+
+ /**
+ * Returns the EID identifying the eUICC hardware.
+ *
+ * <p>Requires that the calling app has carrier privileges on the active subscription on the
+ * eUICC.
+ *
+ * @return the EID. May be null if {@link EuiccManager#isEnabled()} is false or the eUICC is not
+ * ready.
+ */
+ @Nullable
+ public String getEid() {
+ return mEuiccManager.getEid();
+ }
+}
diff --git a/src/com/android/settings/wrapper/IWindowManagerWrapper.java b/src/com/android/settings/wrapper/IWindowManagerWrapper.java
new file mode 100644
index 0000000..8c2ed35
--- /dev/null
+++ b/src/com/android/settings/wrapper/IWindowManagerWrapper.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wrapper;
+
+import android.os.RemoteException;
+import android.view.IWindowManager;
+
+/**
+ * This class replicates a subset of the android.view.IWindowManager. The class
+ * exists so that we can use a thin wrapper around the IWindowManager in production code
+ * and a mock in tests.
+ */
+public class IWindowManagerWrapper {
+
+ private final IWindowManager mWindowManager;
+
+ public IWindowManagerWrapper(IWindowManager wm) {
+ mWindowManager = wm;
+ }
+
+ /**
+ * Returns true if window trace is enabled.
+ */
+ public boolean isWindowTraceEnabled() throws RemoteException {
+ return mWindowManager.isWindowTraceEnabled();
+ }
+
+ /**
+ * Starts a window trace.
+ */
+ public void startWindowTrace() throws RemoteException {
+ mWindowManager.startWindowTrace();
+ }
+
+ /**
+ * Stops a window trace.
+ */
+ public void stopWindowTrace() throws RemoteException {
+ mWindowManager.stopWindowTrace();
+ }
+}
diff --git a/src/com/android/settings/wrapper/RecoverySystemWrapper.java b/src/com/android/settings/wrapper/RecoverySystemWrapper.java
new file mode 100644
index 0000000..c7ce244
--- /dev/null
+++ b/src/com/android/settings/wrapper/RecoverySystemWrapper.java
@@ -0,0 +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.wrapper;
+
+import android.content.Context;
+import android.os.RecoverySystem;
+
+/**
+ * This class replicates a subset of the {@link RecoverySystem}.
+ * The interface exists so that we can use a thin wrapper around the RecoverySystem in
+ * production code and a mock in tests.
+ */
+public class RecoverySystemWrapper {
+
+ /**
+ * Returns whether wipe Euicc data successfully or not.
+ *
+ * @param packageName the package name of the caller app.
+ */
+ public boolean wipeEuiccData(
+ Context context, final String packageName) {
+ return RecoverySystem.wipeEuiccData(context, packageName);
+ }
+}
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index 7271884..e73c323 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -14,7 +14,7 @@
LOCAL_JAVA_LIBRARIES := \
junit \
- platform-robolectric-3.5.1-prebuilt \
+ platform-robolectric-3.6.1-prebuilt \
telephony-common
LOCAL_INSTRUMENTATION_FOR := Settings
@@ -42,4 +42,4 @@
LOCAL_ROBOTEST_TIMEOUT := 36000
-include prebuilts/misc/common/robolectric/3.5.1/run_robotests.mk
+include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
diff --git a/tests/robotests/OWNERS b/tests/robotests/OWNERS
new file mode 100644
index 0000000..8a7a27e
--- /dev/null
+++ b/tests/robotests/OWNERS
@@ -0,0 +1,2 @@
+# We do not guard tests - everyone is welcomed to contribute to tests.
+per-file *.java=*
\ No newline at end of file
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index ebcea43..be910e1 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -24,3 +24,4 @@
com.android.settings.wifi.SavedAccessPointsWifiSettings
com.android.settings.notification.ZenModeEventRuleSettings
com.android.settings.notification.ZenModeScheduleRuleSettings
+com.android.settings.fuelgauge.RestrictedAppDetails
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index a82c9ef..9d593a0 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -72,4 +72,5 @@
com.android.settings.TetherSettings
com.android.settings.ApnEditor
com.android.settings.UserCredentialsSettings
-com.android.settings.TestingSettings
\ No newline at end of file
+com.android.settings.TestingSettings
+com.android.settings.applications.DirectoryAccessDetails
\ 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 e10fee1..e755f27 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -20,15 +20,41 @@
<bool name="config_show_camera_laser_sensor">false</bool>
<bool name="config_show_connectivity_monitor">false</bool>
<bool name="config_display_recent_apps">false</bool>
+ <bool name="config_additional_system_update_setting_enable">true</bool>
<bool name="config_show_wifi_settings">false</bool>
+ <bool name="config_show_toggle_airplane">false</bool>
<bool name="config_show_high_power_apps">false</bool>
+ <bool name="config_show_alarm_volume">false</bool>
+ <bool name="config_show_charging_sounds">false</bool>
+ <bool name="config_show_media_volume">false</bool>
+ <bool name="config_show_notification_ringtone">false</bool>
+ <bool name="config_show_notification_volume">false</bool>
+ <bool name="config_show_screen_locking_sounds">false</bool>
+ <bool name="config_show_touch_sounds">false</bool>
<bool name="config_show_device_administrators">false</bool>
<bool name="config_show_premium_sms">false</bool>
<bool name="config_show_data_saver">false</bool>
<bool name="config_show_enabled_vr_listeners">false</bool>
<bool name="config_location_mode_available">false</bool>
+ <bool name="config_show_location_scanning">false</bool>
+ <bool name="config_show_manage_device_admin">false</bool>
+ <bool name="config_show_unlock_set_or_change">false</bool>
+ <bool name="config_show_screen_pinning_settings">false</bool>
+ <bool name="config_show_manage_trust_agents">false</bool>
+ <bool name="config_show_show_password">false</bool>
+ <bool name="config_show_trust_agent_click_intent">false</bool>
<bool name="config_show_wallpaper_attribution">false</bool>
<bool name="config_show_default_home">false</bool>
<bool name="config_show_accessibility_shortcut_preference">false</bool>
<bool name="config_show_assist_and_voice_input">false</bool>
+ <bool name="config_show_phone_language">false</bool>
+ <bool name="config_show_virtual_keyboard_pref">false</bool>
+ <bool name="config_show_physical_keyboard_pref">false</bool>
+ <bool name="config_show_tts_settings_summary">false</bool>
+ <bool name="config_show_pointer_speed">false</bool>
+ <bool name="config_show_vibrate_input_devices">false</bool>
+ <bool name="config_show_color_correction_preference">false</bool>
+ <bool name="config_show_color_inversion_preference">false</bool>
+ <bool name="config_show_system_update_settings">false</bool>
+ <bool name="config_wifi_support_connected_mac_randomization">false</bool>
</resources>
diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml
index 4004106..359df6c 100644
--- a/tests/robotests/res/values/config.xml
+++ b/tests/robotests/res/values/config.xml
@@ -21,4 +21,5 @@
<bool name="config_show_camera_laser_sensor">true</bool>
<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>
</resources>
\ No newline at end of file
diff --git a/tests/robotests/src/android/content/om/IOverlayManager.java b/tests/robotests/src/android/content/om/IOverlayManager.java
index d4f6d10..8a895e7 100644
--- a/tests/robotests/src/android/content/om/IOverlayManager.java
+++ b/tests/robotests/src/android/content/om/IOverlayManager.java
@@ -16,7 +16,16 @@
import android.os.IBinder;
-public class IOverlayManager {
+import java.util.ArrayList;
+import java.util.LinkedList;
+
+public interface IOverlayManager {
+
+ public OverlayInfo getOverlayInfo(String packageName, int userId);
+
+ public java.util.List getOverlayInfosForTarget(java.lang.String targetPackageName, int userId);
+
+ public boolean setEnabled(java.lang.String packageName, boolean enable, int userId);
public static class Stub {
public static IOverlayManager asInterface(IBinder b) {
diff --git a/tests/robotests/src/android/content/om/OverlayInfo.java b/tests/robotests/src/android/content/om/OverlayInfo.java
index cfd3adc..fb7fef1 100644
--- a/tests/robotests/src/android/content/om/OverlayInfo.java
+++ b/tests/robotests/src/android/content/om/OverlayInfo.java
@@ -14,5 +14,19 @@
package android.content.om;
+import android.annotation.NonNull;
+
public class OverlayInfo {
-}
+
+ public final String packageName;
+
+ public OverlayInfo(@NonNull String packageName, @NonNull String targetPackageName,
+ @NonNull String baseCodePath, int state, int userId) {
+ this.packageName = packageName;
+ }
+
+ public boolean isEnabled() {
+ return false;
+ }
+
+}
\ No newline at end of file
diff --git a/tests/robotests/src/android/service/notification/NotifyingApp.java b/tests/robotests/src/android/service/notification/NotifyingApp.java
new file mode 100644
index 0000000..f36069b
--- /dev/null
+++ b/tests/robotests/src/android/service/notification/NotifyingApp.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.service.notification;
+
+import android.annotation.NonNull;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.Objects;
+
+/**
+ * Stub implementation of framework's NotifyingApp for Robolectric tests. Otherwise Robolectric
+ * throws ClassNotFoundError.
+ *
+ * TODO: Remove this class when Robolectric supports P
+ */
+public final class NotifyingApp implements Comparable<NotifyingApp> {
+
+ private int mUid;
+ private String mPkg;
+ private long mLastNotified;
+
+ public NotifyingApp() {}
+
+ public int getUid() {
+ return mUid;
+ }
+
+ /**
+ * Sets the uid of the package that sent the notification. Returns self.
+ */
+ public NotifyingApp setUid(int mUid) {
+ this.mUid = mUid;
+ return this;
+ }
+
+ public String getPackage() {
+ return mPkg;
+ }
+
+ /**
+ * Sets the package that sent the notification. Returns self.
+ */
+ public NotifyingApp setPackage(@NonNull String mPkg) {
+ this.mPkg = mPkg;
+ return this;
+ }
+
+ public long getLastNotified() {
+ return mLastNotified;
+ }
+
+ /**
+ * Sets the time the notification was originally sent. Returns self.
+ */
+ public NotifyingApp setLastNotified(long mLastNotified) {
+ this.mLastNotified = mLastNotified;
+ return this;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ NotifyingApp that = (NotifyingApp) o;
+ return getUid() == that.getUid()
+ && getLastNotified() == that.getLastNotified()
+ && Objects.equals(mPkg, that.mPkg);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(getUid(), mPkg, getLastNotified());
+ }
+
+ /**
+ * Sorts notifying apps from newest last notified date to oldest.
+ */
+ @Override
+ public int compareTo(NotifyingApp o) {
+ if (getLastNotified() == o.getLastNotified()) {
+ if (getUid() == o.getUid()) {
+ return getPackage().compareTo(o.getPackage());
+ }
+ return Integer.compare(getUid(), o.getUid());
+ }
+
+ return -Long.compare(getLastNotified(), o.getLastNotified());
+ }
+
+ @Override
+ public String toString() {
+ return "NotifyingApp{"
+ + "mUid=" + mUid
+ + ", mPkg='" + mPkg + '\''
+ + ", mLastNotified=" + mLastNotified
+ + '}';
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java
index 838b1e8..776025f 100644
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ b/tests/robotests/src/com/android/settings/MasterClearTest.java
@@ -19,20 +19,29 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
+import android.accounts.Account;
+import android.accounts.AccountManager;
import android.app.Activity;
import android.app.Fragment;
import android.content.ComponentName;
import android.content.ContentResolver;
+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.os.Bundle;
import android.provider.Settings;
import android.view.LayoutInflater;
import android.view.View;
+import android.widget.CheckBox;
import android.widget.LinearLayout;
import android.widget.ScrollView;
@@ -46,6 +55,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAccountManager;
import org.robolectric.shadows.ShadowActivity;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -55,6 +65,10 @@
shadows = {ShadowUtils.class}
)
public class MasterClearTest {
+ private static final String TEST_ACCOUNT_TYPE = "android.test.account.type";
+ private static final String TEST_CONFIRMATION_PACKAGE = "android.test.conf.pkg";
+ private static final String TEST_CONFIRMATION_CLASS = "android.test.conf.pkg.ConfActivity";
+ private static final String TEST_ACCOUNT_NAME = "test@example.com";
@Mock
private MasterClear mMasterClear;
@@ -62,7 +76,18 @@
private ScrollView mScrollView;
@Mock
private LinearLayout mLinearLayout;
+
+ @Mock
+ private PackageManager mPackageManager;
+
+ @Mock
+ private AccountManager mAccountManager;
+
+ @Mock
+ private Activity mMockActivity;
+
private ShadowActivity mShadowActivity;
+ private ShadowAccountManager mShadowAccountManager;
private Activity mActivity;
private View mContentView;
@@ -86,6 +111,7 @@
mMasterClear = spy(new MasterClear());
mActivity = Robolectric.setupActivity(Activity.class);
mShadowActivity = shadowOf(mActivity);
+ // mShadowAccountManager = shadowOf(AccountManager.get(mActivity));
mContentView = LayoutInflater.from(mActivity).inflate(R.layout.master_clear, null);
// Make scrollView only have one child
@@ -94,6 +120,32 @@
}
@Test
+ public void testShowFinalConfirmation_eraseEsimChecked() {
+ ActivityForTest testActivity = new ActivityForTest();
+ when(mMasterClear.getActivity()).thenReturn(testActivity);
+
+ mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+ mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+ mMasterClear.mEsimStorage.setChecked(true);
+ mMasterClear.showFinalConfirmation();
+ assertThat(testActivity.getArgs().getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
+ .isTrue();
+ }
+
+ @Test
+ public void testShowFinalConfirmation_eraseEsimUnchecked() {
+ ActivityForTest testActivity = new ActivityForTest();
+ when(mMasterClear.getActivity()).thenReturn(testActivity);
+
+ mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+ mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+ mMasterClear.mEsimStorage.setChecked(false);
+ mMasterClear.showFinalConfirmation();
+ assertThat(testActivity.getArgs().getBoolean(MasterClear.ERASE_ESIMS_EXTRA, true))
+ .isFalse();
+ }
+
+ @Test
public void testShowWipeEuicc_euiccDisabled() {
prepareEuiccState(
false /* isEuiccEnabled */, true /* isEuiccProvisioned */);
@@ -160,6 +212,75 @@
assertThat(componentName.getPackageName()).isEqualTo(intent.getPackage());
}
+ @Test
+ public void testTryShowAccountConfirmation_unsupported() {
+ when(mMasterClear.getActivity()).thenReturn(mActivity);
+ /* Using the default resources, account confirmation shouldn't trigger */
+ assertThat(mMasterClear.tryShowAccountConfirmation()).isFalse();
+ }
+
+ @Test
+ public void testTryShowAccountConfirmation_no_relevant_accounts() {
+ 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);
+ when(mMockActivity.getString(R.string.account_confirmation_class)).thenReturn(TEST_CONFIRMATION_CLASS);
+
+ Account[] accounts = new Account[0];
+ when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
+ when(mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE)).thenReturn(accounts);
+ assertThat(mMasterClear.tryShowAccountConfirmation()).isFalse();
+ }
+
+ @Test
+ public void testTryShowAccountConfirmation_unresolved() {
+ 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);
+ when(mMockActivity.getString(R.string.account_confirmation_class)).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
+ // confirmation package.
+ when(mMockActivity.getPackageManager()).thenReturn(mPackageManager);
+ assertThat(mMasterClear.tryShowAccountConfirmation()).isFalse();
+ }
+
+ @Test
+ public void testTryShowAccountConfirmation_ok() {
+ when(mMasterClear.getActivity()).thenReturn(mMockActivity);
+ // 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);
+ when(mMockActivity.getString(R.string.account_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) };
+ 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
+ // confirmation package.
+ when(mMockActivity.getPackageManager()).thenReturn(mPackageManager);
+
+ ActivityInfo activityInfo = new ActivityInfo();
+ activityInfo.packageName = TEST_CONFIRMATION_PACKAGE;
+ ResolveInfo resolveInfo = new ResolveInfo();
+ resolveInfo.activityInfo = activityInfo;
+ when(mPackageManager.resolveActivity(any(), eq(0))).thenReturn(resolveInfo);
+
+ // Finally mock out the startActivityForResultCall
+ doNothing().when(mMasterClear).startActivityForResult(any(), eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
+
+ assertThat(mMasterClear.tryShowAccountConfirmation()).isTrue();
+ }
+
+ @Test
+ public void testIsValidRequestCode() {
+ assertThat(mMasterClear.isValidRequestCode(MasterClear.KEYGUARD_REQUEST)).isTrue();
+ assertThat(mMasterClear.isValidRequestCode(MasterClear.CREDENTIAL_CONFIRM_REQUEST)).isTrue();
+ assertThat(mMasterClear.isValidRequestCode(0)).isFalse();
+ }
+
private void initScrollView(int height, int scrollY, int childBottom) {
when(mScrollView.getHeight()).thenReturn(height);
when(mScrollView.getScrollY()).thenReturn(scrollY);
diff --git a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java
new file mode 100644
index 0000000..f4b5f4c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.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;
+
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyString;
+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.app.Activity;
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.RecoverySystemWrapper;
+
+import org.junit.Assert;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+ manifest = TestConfig.MANIFEST_PATH,
+ sdk = TestConfig.SDK_VERSION
+)
+public class ResetNetworkConfirmTest {
+
+ private Activity mActivity;
+ @Mock
+ private ResetNetworkConfirm mResetNetworkConfirm;
+ @Mock
+ private RecoverySystemWrapper mRecoverySystem;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mResetNetworkConfirm = spy(new ResetNetworkConfirm());
+ mRecoverySystem = spy(new RecoverySystemWrapper());
+ ResetNetworkConfirm.mRecoverySystem = mRecoverySystem;
+ mActivity = Robolectric.setupActivity(Activity.class);
+ }
+
+ @Test
+ public void testResetNetworkData_resetEsim() {
+ mResetNetworkConfirm.mEraseEsim = true;
+ doReturn(true)
+ .when(mRecoverySystem).wipeEuiccData(any(Context.class), anyString());
+
+ mResetNetworkConfirm.esimFactoryReset(mActivity, "" /* packageName */);
+ try {
+ // Waiting the Async task finished
+ Thread.sleep(10000); // 10 sec
+ } catch (InterruptedException ignore) {
+
+ }
+
+ Assert.assertNotNull(mResetNetworkConfirm.mEraseEsimTask);
+ verify(mRecoverySystem).wipeEuiccData(any(Context.class), anyString());
+ }
+
+ @Test
+ public void testResetNetworkData_notResetEsim() {
+ mResetNetworkConfirm.mEraseEsim = false;
+
+ mResetNetworkConfirm.esimFactoryReset(mActivity, "" /* packageName */);
+
+ Assert.assertNull(mResetNetworkConfirm.mEraseEsimTask);
+ verify(mRecoverySystem, never())
+ .wipeEuiccData(any(Context.class), anyString());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
index 942634a..3a7d094 100644
--- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
@@ -17,6 +17,7 @@
import android.app.Dialog;
import android.app.Fragment;
+import android.content.Context;
import org.junit.Before;
import org.junit.Test;
@@ -39,6 +40,8 @@
private static final int DIALOG_ID = 15;
@Mock
+ private Context mContext;
+ @Mock
private DialogCreatableFragment mDialogCreatable;
private SettingsPreferenceFragment.SettingsDialogFragment mDialogFragment;
@@ -53,9 +56,10 @@
mDialogFragment =
new SettingsPreferenceFragment.SettingsDialogFragment(mDialogCreatable, DIALOG_ID);
+ mDialogFragment.onAttach(mContext);
mDialogFragment.getMetricsCategory();
- // getDialogMetricsCategory called in constructor, and explicitly in test.
+ // getDialogMetricsCategory called in onAttach, and explicitly in test.
verify(mDialogCreatable, times(2)).getDialogMetricsCategory(DIALOG_ID);
}
@@ -66,6 +70,7 @@
try {
mDialogFragment = new SettingsPreferenceFragment.SettingsDialogFragment(
mDialogCreatable, DIALOG_ID);
+ mDialogFragment.onAttach(mContext);
} catch (IllegalStateException e) {
// getDialogMetricsCategory called in constructor
verify(mDialogCreatable).getDialogMetricsCategory(DIALOG_ID);
diff --git a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
index 1f701c2..81a6bb31 100644
--- a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
@@ -102,6 +102,33 @@
assertThat(count).named("List items shown").isEqualTo(3);
}
+ @Test
+ public void skipButton_shouldBeVisible_duringNonFingerprintFlow() {
+ Button button = mActivity.findViewById(R.id.footerLeftButton);
+ assertThat(button).isNotNull();
+ assertThat(button.getVisibility()).isEqualTo(View.VISIBLE);
+
+ button.performClick();
+ AlertDialog chooserDialog = ShadowAlertDialog.getLatestAlertDialog();
+ assertThat(chooserDialog).isNotNull();
+ }
+
+ @Test
+ public void skipButton_shouldNotBeVisible_duringFingerprintFlow() {
+ mActivity = Robolectric.buildActivity(
+ SetupChooseLockPattern.class,
+ SetupChooseLockPattern.modifyIntentForSetup(
+ application,
+ new IntentBuilder(application)
+ .setUserId(UserHandle.myUserId())
+ .setForFingerprint(true)
+ .build()))
+ .setup().get();
+ Button button = mActivity.findViewById(R.id.footerLeftButton);
+ assertThat(button).isNotNull();
+ assertThat(button.getVisibility()).isEqualTo(View.GONE);
+ }
+
private ChooseLockPatternFragment findFragment(Activity activity) {
return (ChooseLockPatternFragment)
activity.getFragmentManager().findFragmentById(R.id.main_content);
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index f813457..fb571bb 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -4,13 +4,16 @@
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+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.ComponentName;
import android.content.Context;
import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.net.ConnectivityManager;
import android.net.LinkAddress;
@@ -25,6 +28,7 @@
import android.text.SpannableStringBuilder;
import android.text.format.DateUtils;
import android.text.style.TtsSpan;
+import android.util.IconDrawableFactory;
import android.widget.EditText;
import android.widget.TextView;
@@ -46,8 +50,8 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UtilsTest {
-
private static final String PACKAGE_NAME = "com.android.app";
+ private static final int USER_ID = 1;
@Mock
private WifiManager wifiManager;
@@ -59,6 +63,12 @@
private DevicePolicyManagerWrapper mDevicePolicyManager;
@Mock
private UserManager mUserManager;
+ @Mock
+ private PackageManager mPackageManager;
+ @Mock
+ private IconDrawableFactory mIconDrawableFactory;
+ @Mock
+ private ApplicationInfo mApplicationInfo;
private Context mContext;
@Before
@@ -332,4 +342,17 @@
assertThat(editText.getSelectionEnd()).isEqualTo(length);
}
+
+ @Test
+ public void testGetBadgedIcon_usePackageNameAndUserId() throws
+ PackageManager.NameNotFoundException {
+ doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME,
+ PackageManager.GET_META_DATA);
+
+ Utils.getBadgedIcon(mIconDrawableFactory, mPackageManager, PACKAGE_NAME, USER_ID);
+
+ // Verify that it uses the correct user id
+ verify(mIconDrawableFactory).getBadgedIcon(mApplicationInfo, USER_ID);
+ }
+
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index c721fc9..96ce183 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -45,6 +45,8 @@
private Context mContext;
private AccessibilitySettings mFragment;
private boolean mAccessibilityShortcutPreferenceRemoved;
+ private boolean mColorInversionPreferenceRemoved;
+ private boolean mColorCorrectionPreferenceRemoved;
@Before
public void setUp() {
@@ -60,7 +62,16 @@
protected boolean removePreference(String key) {
if (AccessibilitySettings.ACCESSIBILITY_SHORTCUT_PREFERENCE.equals(key)) {
mAccessibilityShortcutPreferenceRemoved = true;
+ return true;
+ }
+ if (AccessibilitySettings.TOGGLE_INVERSION_PREFERENCE.equals(key)) {
+ mColorInversionPreferenceRemoved = true;
+ return true;
+ }
+
+ if (AccessibilitySettings.DISPLAY_DALTONIZER_PREFERENCE_SCREEN.equals(key)) {
+ mColorCorrectionPreferenceRemoved = true;
return true;
}
return false;
@@ -104,4 +115,38 @@
assertThat(niks).contains(AccessibilitySettings.ACCESSIBILITY_SHORTCUT_PREFERENCE);
}
+
+ @Test
+ public void testColorInversionPreference_byDefault_shouldBeShown() {
+ final Preference preference = new Preference(mContext);
+ mFragment.checkColorInversionVisibility(preference);
+
+ assertThat(mColorInversionPreferenceRemoved).isEqualTo(false);
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void testColorInversionPreference_ifDisabled_shouldNotBeShown() {
+ final Preference preference = new Preference(mContext);
+ mFragment.checkColorInversionVisibility(preference);
+
+ assertThat(mColorInversionPreferenceRemoved).isEqualTo(true);
+ }
+
+ @Test
+ public void testColorCorrectionPreference_byDefault_shouldBeShown() {
+ final Preference preference = new Preference(mContext);
+ mFragment.checkColorCorrectionVisibility(preference);
+
+ assertThat(mColorCorrectionPreferenceRemoved).isEqualTo(false);
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void testColorCorrectionPreference_ifDisabled_shouldNotBeShown() {
+ final Preference preference = new Preference(mContext);
+ mFragment.checkColorCorrectionVisibility(preference);
+
+ assertThat(mColorCorrectionPreferenceRemoved).isEqualTo(true);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
new file mode 100644
index 0000000..aeffd20
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
@@ -0,0 +1,122 @@
+/*
+ * 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.accounts;
+
+import static com.android.settings.accounts.AccountDashboardFragmentTest
+ .ShadowAuthenticationHelper.LABELS;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.SearchIndexableResource;
+import android.text.TextUtils;
+
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.drawer.CategoryKey;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AccountDashboardFragmentTest {
+
+ private AccountDashboardFragment mFragment;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mFragment = new AccountDashboardFragment();
+ }
+
+ @Test
+ public void testCategory_isAccount() {
+ assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_ACCOUNT);
+ }
+
+ @Test
+ @Config(shadows = {
+ ShadowAuthenticationHelper.class
+ })
+ public void updateSummary_shouldDisplayUpTo3AccountTypes() {
+ final SummaryLoader loader = mock(SummaryLoader.class);
+ final Activity activity = Robolectric.buildActivity(Activity.class).setup().get();
+
+ final SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
+ .createSummaryProvider(activity, loader);
+ provider.setListening(true);
+
+ verify(loader).setSummary(provider, LABELS[0] + ", " + LABELS[1] + ", " + LABELS[2]);
+ }
+
+ @Test
+ public void testSearchIndexProvider_shouldIndexResource() {
+ final List<SearchIndexableResource> indexRes =
+ AccountDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+ ShadowApplication.getInstance().getApplicationContext(),
+ true /* enabled */);
+
+ assertThat(indexRes).isNotNull();
+ assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
+ }
+
+ @Implements(AuthenticatorHelper.class)
+ public static class ShadowAuthenticationHelper {
+
+ static final String[] TYPES = new String[] {"type1", "type2", "type3", "type4"};
+ static final String[] LABELS = new String[] {"LABEL1", "LABEL2",
+ "LABEL3", "LABEL4"};
+
+ public void __constructor__(Context context, UserHandle userHandle,
+ AuthenticatorHelper.OnAccountsUpdateListener listener) {
+
+ }
+
+ @Implementation
+ public String[] getEnabledAccountTypes() {
+ return TYPES;
+ }
+
+ @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 "no_label";
+ }
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
index f409095..73a58bf 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
@@ -17,15 +17,14 @@
package com.android.settings.accounts;
import static android.arch.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;
import android.accounts.Account;
import android.app.Activity;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
@@ -55,9 +54,9 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class
+ manifest = TestConfig.MANIFEST_PATH,
+ sdk = TestConfig.SDK_VERSION,
+ shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class
)
public class AccountHeaderPreferenceControllerTest {
@@ -74,8 +73,8 @@
private AccountHeaderPreferenceController mController;
- private Lifecycle mLifecycle =
- new Lifecycle(() -> AccountHeaderPreferenceControllerTest.this.mLifecycle);
+ private LifecycleOwner mLifecycleOwner;
+ private Lifecycle mLifecycle;
@Before
public void setUp() {
@@ -84,7 +83,8 @@
mHeaderPreference = new LayoutPreference(
RuntimeEnvironment.application, R.layout.settings_entity_header);
doReturn(mContext).when(mActivity).getApplicationContext();
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
deleted file mode 100644
index 8dba2f2..0000000
--- a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
+++ /dev/null
@@ -1,95 +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.accounts;
-
-import android.app.Activity;
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settingslib.drawer.CategoryKey;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-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;
-import static org.mockito.Mockito.when;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UserAndAccountDashboardFragmentTest {
-
- private static final String METADATA_CATEGORY = "com.android.settings.category";
- private static final String METADATA_ACCOUNT_TYPE = "com.android.settings.ia.account";
-
- @Mock
- private UserManager mUserManager;
- private UserAndAccountDashboardFragment mFragment;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mFragment = new UserAndAccountDashboardFragment();
- }
-
- @Test
- public void testCategory_isAccount() {
- assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_ACCOUNT);
- }
-
- @Test
- public void updateSummary_shouldDisplaySignedInUser() {
- final Activity activity = mock(Activity.class);
- final SummaryLoader loader = mock(SummaryLoader.class);
- final UserInfo userInfo = new UserInfo();
- userInfo.name = "test_name";
-
- when(activity.getSystemService(UserManager.class)).thenReturn(mUserManager);
- when(mUserManager.getUserInfo(anyInt())).thenReturn(userInfo);
-
- final SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
- .createSummaryProvider(activity, loader);
- provider.setListening(true);
-
- verify(activity).getString(R.string.users_and_accounts_summary,
- userInfo.name);
- }
-
- @Test
- public void testSearchIndexProvider_shouldIndexResource() {
- final List<SearchIndexableResource> indexRes =
- UserAndAccountDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- ShadowApplication.getInstance().getApplicationContext(),
- true /* enabled */);
-
- assertThat(indexRes).isNotNull();
- assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
- }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
index 84a121f..ed97fe7 100644
--- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
@@ -50,16 +50,21 @@
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatcher;
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;
@@ -194,6 +199,82 @@
}
@Test
+ public void display_showRecentsWithInstantApp() {
+ // Regular app.
+ final List<UsageStats> stats = new ArrayList<>();
+ final UsageStats stat1 = new UsageStats();
+ stat1.mLastTimeUsed = System.currentTimeMillis();
+ stat1.mPackageName = "com.foo.bar";
+ stats.add(stat1);
+
+ // Instant app.
+ final UsageStats stat2 = new UsageStats();
+ stat2.mLastTimeUsed = System.currentTimeMillis() + 200;
+ stat2.mPackageName = "com.foo.barinstant";
+ stats.add(stat2);
+
+ ApplicationsState.AppEntry stat1Entry = mock(ApplicationsState.AppEntry.class);
+ ApplicationsState.AppEntry stat2Entry = mock(ApplicationsState.AppEntry.class);
+ stat1Entry.info = mApplicationInfo;
+ stat2Entry.info = mApplicationInfo;
+
+ when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId())).thenReturn(stat1Entry);
+ when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId())).thenReturn(stat2Entry);
+
+ // Only the regular app stat1 should have its intent resolve.
+ when(mPackageManager.resolveActivity(argThat(intentMatcher(stat1.mPackageName)),
+ anyInt())).thenReturn(new ResolveInfo());
+
+ when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
+ .thenReturn(stats);
+
+ // Make sure stat2 is considered an instant app.
+ ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+ (InstantAppDataProvider) (ApplicationInfo info) -> {
+ if (info == stat2Entry.info) {
+ return true;
+ } else {
+ return false;
+ }
+ });
+
+ mController.displayPreference(mScreen);
+
+ ArgumentCaptor<Preference> prefCaptor = ArgumentCaptor.forClass(Preference.class);
+ verify(mCategory, times(2)).addPreference(prefCaptor.capture());
+ List<Preference> prefs = prefCaptor.getAllValues();
+ assertThat(prefs.get(1).getKey()).isEqualTo(stat1.mPackageName);
+ assertThat(prefs.get(0).getKey()).isEqualTo(stat2.mPackageName);
+ }
+
+ @Test
+ public void display_showRecentsWithNullAppEntryOrInfo() {
+ final List<UsageStats> stats = new ArrayList<>();
+ final UsageStats stat1 = new UsageStats();
+ final UsageStats stat2 = new UsageStats();
+ stat1.mLastTimeUsed = System.currentTimeMillis();
+ stat1.mPackageName = "pkg.class";
+ stats.add(stat1);
+
+ stat2.mLastTimeUsed = System.currentTimeMillis();
+ stat2.mPackageName = "pkg.class2";
+ stats.add(stat2);
+
+ // app1 has AppEntry with null info, app2 has null AppEntry.
+ mAppEntry.info = null;
+ when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId()))
+ .thenReturn(mAppEntry);
+ when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId()))
+ .thenReturn(null);
+
+ when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
+ .thenReturn(stats);
+
+ // We should not crash here.
+ mController.displayPreference(mScreen);
+ }
+
+ @Test
public void display_hasRecentButNoneDisplayable_showAppInfo() {
final List<UsageStats> stats = new ArrayList<>();
final UsageStats stat1 = new UsageStats();
@@ -249,4 +330,8 @@
return preference -> TextUtils.equals(expected, preference.getSummary());
}
+ // Used for matching an intent with a specific package name.
+ private static ArgumentMatcher<Intent> intentMatcher(String packageName) {
+ return intent -> packageName.equals(intent.getPackage());
+ }
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java
index 17b7a22..7d5eb31 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java
@@ -79,6 +79,8 @@
private DevicePolicyManagerWrapper mDevicePolicyManager;
@Mock
private AppInfoDashboardFragment mFragment;
+ @Mock
+ private ApplicationInfo mAppInfo;
private Context mContext;
private AppActionButtonPreferenceController mController;
@@ -96,6 +98,25 @@
ReflectionHelpers.setField(mController, "mApplicationFeatureProvider",
mFeatureFactory.applicationFeatureProvider);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+ final PackageInfo packageInfo = mock(PackageInfo.class);
+ packageInfo.applicationInfo = mAppInfo;
+ when(mFragment.getPackageInfo()).thenReturn(packageInfo);
+ }
+
+ @Test
+ public void getAvailabilityStatus_notInstantApp_shouldReturnAvailable() {
+ ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+ (InstantAppDataProvider) (i -> false));
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_isInstantApp_shouldReturnDisabled() {
+ ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+ (InstantAppDataProvider) (i -> true));
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
}
@Test
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 286469c..ee870b7 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
@@ -16,15 +16,25 @@
package com.android.settings.applications.appinfo;
+import static android.arch.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;
+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.app.ActionBar;
import android.app.Activity;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
+import android.graphics.drawable.Drawable;
import android.support.v7.preference.PreferenceScreen;
+import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
@@ -33,12 +43,14 @@
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState;
+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.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@@ -48,19 +60,34 @@
@Mock
private AppInfoDashboardFragment mFragment;
+
@Mock
- private Activity mActivity;
+ private PreferenceScreen mScreen;
+ @Mock
+ private LayoutPreference mPreference;
private Context mContext;
+ private Activity mActivity;
+ private LifecycleOwner mLifecycleOwner;
+ private Lifecycle mLifecycle;
+ private View mHeader;
private AppHeaderViewPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
+ mActivity = spy(Robolectric.buildActivity(Activity.class).get());
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
+ mHeader = LayoutInflater.from(mContext).inflate(R.layout.settings_entity_header, null);
+
when(mFragment.getActivity()).thenReturn(mActivity);
- when(mActivity.getApplicationContext()).thenReturn(mContext);
- mController = new AppHeaderViewPreferenceController(mContext, mFragment, "Package1", null);
+ when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+ when(mPreference.findViewById(R.id.entity_header)).thenReturn(mHeader);
+
+ mController = new AppHeaderViewPreferenceController(mContext, mFragment, "Package1",
+ mLifecycle);
}
@Test
@@ -77,21 +104,29 @@
when(mFragment.getAppEntry()).thenReturn(appEntry);
when(mFragment.getPackageInfo()).thenReturn(packageInfo);
- final PreferenceScreen screen = mock(PreferenceScreen.class);
- final LayoutPreference preference = mock(LayoutPreference.class);
- when(screen.findPreference(mController.getPreferenceKey())).thenReturn(preference);
- final View header = mock(View.class);
- when(preference.findViewById(R.id.entity_header)).thenReturn(header);
- final TextView title = mock(TextView.class);
- when(header.findViewById(R.id.entity_header_title)).thenReturn(title);
- final TextView summary = mock(TextView.class);
- when(header.findViewById(R.id.entity_header_summary)).thenReturn(summary);
- mController.displayPreference(screen);
+ final TextView title = mHeader.findViewById(R.id.entity_header_title);
+ final TextView summary = mHeader.findViewById(R.id.entity_header_summary);
+
+ mController.displayPreference(mScreen);
mController.refreshUi();
- verify(title).setText(appLabel);
- verify(summary).setText(mContext.getString(R.string.installed));
+ assertThat(title.getText()).isEqualTo(appLabel);
+ assertThat(summary.getText()).isEqualTo(mContext.getString(R.string.installed));
+ }
+
+ @Test
+ public void onStart_shouldStyleActionBar() {
+ final ActionBar actionBar = mock(ActionBar.class);
+ when(mActivity.getActionBar()).thenReturn(actionBar);
+
+ mController.displayPreference(mScreen);
+
+ verifyZeroInteractions(actionBar);
+
+ mLifecycle.handleLifecycleEvent(ON_START);
+
+ verify(actionBar).setBackgroundDrawable(any(Drawable.class));
}
}
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 c59ac18..968f049 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
@@ -57,13 +58,15 @@
private AssistContextPreferenceController.SettingObserver mObserver;
private Context mContext;
private AssistContextPreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mContext = RuntimeEnvironment.application;
mController = new AssistContextPreferenceController(mContext, mLifecycle);
ReflectionHelpers.setField(mController, "mSettingObserver", mObserver);
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 1dec8d0..57b809e 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
@@ -28,6 +28,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
@@ -64,13 +65,15 @@
private AssistFlashScreenPreferenceController.SettingObserver mObserver;
private Context mContext;
private AssistFlashScreenPreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mContext = RuntimeEnvironment.application;
mController = spy(new AssistFlashScreenPreferenceController(mContext, mLifecycle));
mLifecycle.addObserver(mController);
diff --git a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
index 5c0badc..f85d43a 100644
--- a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
@@ -42,9 +42,9 @@
import com.android.settings.R;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
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 dfe8e4c..5341109 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
@@ -197,11 +197,6 @@
}
@Test
- public void shouldUseStableItemHeight_notificationType_no() {
-
- }
-
- @Test
public void onRebuildComplete_shouldHideLoadingView() {
final Context context = RuntimeEnvironment.application;
final ManageApplications fragment = mock(ManageApplications.class);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
index 8f3d3c2..7f58254 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
@@ -19,6 +19,7 @@
import static org.mockito.Mockito.when;
import android.app.Activity;
+import android.arch.lifecycle.LifecycleOwner;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
@@ -44,6 +45,7 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothDetailsControllerTestBase {
protected Context mContext;
+ private LifecycleOwner mLifecycleOwner;
protected Lifecycle mLifecycle;
protected DeviceConfig mDeviceConfig;
protected BluetoothDevice mDevice;
@@ -73,7 +75,8 @@
when(mFragment.getContext()).thenReturn(mContext);
when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
- mLifecycle = spy(new Lifecycle(() -> mLifecycle));
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = spy(new Lifecycle(mLifecycleOwner));
mBluetoothManager = new BluetoothManager(mContext);
mBluetoothAdapter = mBluetoothManager.getAdapter();
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
index e9d37f6..71020be 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
@@ -32,11 +32,11 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
index 823bcbe..4294dfb 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
@@ -95,8 +95,6 @@
final Preference preference = mBluetoothDeviceUpdater.mPreferenceMap.get(mBluetoothDevice);
assertThat(preference).isNotNull();
- assertThat(preference.getSummary()).isEqualTo(
- mContext.getString(R.string.summary_placeholder));
verify(mDevicePreferenceCallback).onDeviceAdded(preference);
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
index b973edb..828b5a1 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
@@ -29,13 +29,13 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.widget.MasterSwitchController;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
index 4459f61..1deba78 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
@@ -90,7 +90,7 @@
Preference pref = mController.createBluetoothPairingPreference(ORDER);
assertThat(pref.getKey()).isEqualTo(BluetoothPairingPreferenceController.KEY_PAIRING);
- assertThat(pref.getIcon()).isEqualTo(mContext.getDrawable(R.drawable.ic_add));
+ assertThat(pref.getIcon()).isEqualTo(mContext.getDrawable(R.drawable.ic_menu_add));
assertThat(pref.getOrder()).isEqualTo(ORDER);
assertThat(pref.getTitle()).isEqualTo(
mContext.getString(R.string.bluetooth_pairing_pref_title));
diff --git a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
index 8666ce3..c3b22b3 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
@@ -26,11 +26,11 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java
new file mode 100644
index 0000000..3e60ca6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.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.connecteddevice;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.TestConfig;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
+ SettingsShadowSystemProperties.class)
+public class BluetoothOnWhileDrivingPreferenceControllerTest {
+ private BluetoothOnWhileDrivingPreferenceController mController;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = new BluetoothOnWhileDrivingPreferenceController(mContext);
+ }
+
+ @After
+ public void teardown() {
+ SettingsShadowSystemProperties.clear();
+ }
+
+ @Test
+ public void getAvailabilityStatus_onWhenEnabled() {
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.BLUETOOTH_WHILE_DRIVING, true);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_offWhenDisabled() {
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+ }
+
+ @Test
+ public void setChecked_togglesSettingSecure() {
+ mController.setChecked(true);
+
+ assertThat(
+ Settings.Secure.getInt(
+ mContext.getContentResolver(),
+ Settings.Secure.BLUETOOTH_ON_WHILE_DRIVING,
+ 0))
+ .isEqualTo(1);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
index aa5eb67..78be742 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
@@ -22,6 +22,7 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
@@ -63,6 +64,7 @@
private Context mContext;
private Preference mPreference;
private ConnectedDeviceGroupController mConnectedDeviceGroupController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
@@ -72,7 +74,8 @@
mContext = RuntimeEnvironment.application;
mPreference = new Preference(mContext);
mPreference.setKey(PREFERENCE_KEY_1);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mPreferenceGroup = spy(new PreferenceScreen(mContext, null));
doReturn(mPreferenceManager).when(mPreferenceGroup).getPreferenceManager();
doReturn(mContext).when(mDashboardFragment).getContext();
diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java
new file mode 100644
index 0000000..ecd756a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.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.core;
+
+import android.content.res.Resources;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class InstrumentedActivityTest {
+
+ /**
+ * Verifies that the {@link InstrumentedActivity} class can be instantiated successfully.
+ * Code added to the activity constructor had resulted in an NPE if resources are accessed
+ * before onCreate().
+ */
+ @Test
+ public void canInstantiate() {
+ Robolectric.buildActivity(InstrumentedActivityTestable.class).setup().get();
+ }
+
+ public static class InstrumentedActivityTestable extends InstrumentedActivity {
+
+ @Override
+ public int getMetricsCategory() {
+ return 0;
+ }
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
index c561d0d..e6ca59b 100644
--- a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
+++ b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
@@ -2,6 +2,8 @@
import static com.google.common.truth.Truth.assertWithMessage;
+import static org.mockito.Mockito.mock;
+
import android.content.Context;
import android.content.res.XmlResourceParser;
import android.provider.SearchIndexableResource;
@@ -13,10 +15,12 @@
import com.android.settings.TestConfig;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableResources;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProviderImpl;
import com.android.settings.search.XmlParserUtils;
import com.android.settings.security.SecuritySettings;
import com.android.settings.security.SecuritySettingsV2;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.After;
@@ -76,25 +80,22 @@
private static final String BAD_CLASSNAME_ERROR =
"The following controllers set in the XML did not have valid class names:\n";
- private static final String BAD_CONSTRUCTOR_ERROR =
- "The constructor provided by the following classes were insufficient to instantiate "
- + "the object. It could be due to being an interface, abstract, or an "
- + "IllegalAccessException. Please fix the following classes:\n";
-
Context mContext;
-
- private Set<Class> mProviderClassesCopy;
+ SearchFeatureProvider mSearchProvider;
+ private FakeFeatureFactory mFakeFeatureFactory;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- mProviderClassesCopy = new HashSet<>(SearchIndexableResources.providerValues());
+ mSearchProvider = new SearchFeatureProviderImpl();
+ mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
+ mFakeFeatureFactory.searchFeatureProvider = mSearchProvider;
}
@After
public void cleanUp() {
- SearchIndexableResources.providerValues().clear();
- SearchIndexableResources.providerValues().addAll(mProviderClassesCopy);
+ mFakeFeatureFactory.searchFeatureProvider = mock(
+ SearchFeatureProvider.class);
}
@Test
@@ -106,7 +107,6 @@
Set<String> invalidConstructors = new HashSet<>();
Set<String> invalidClassHierarchy = new HashSet<>();
Set<String> badClassNameControllers = new HashSet<>();
- Set<String> badConstructorControllers = new HashSet<>();
for (int resId : xmlSet) {
xmlControllers.addAll(getXmlControllers(resId));
@@ -127,13 +127,7 @@
continue;
}
- Object controller = getObjectFromConstructor(constructor);
- if (controller == null) {
- badConstructorControllers.add(controllerClassName);
- continue;
- }
-
- if (!(controller instanceof BasePreferenceController)) {
+ if (!isBasePreferenceController(clazz)) {
invalidClassHierarchy.add(controllerClassName);
}
}
@@ -144,19 +138,17 @@
invalidClassHierarchy);
final String badClassNameError = buildErrorMessage(BAD_CLASSNAME_ERROR,
badClassNameControllers);
- final String badConstructorError = buildErrorMessage(BAD_CONSTRUCTOR_ERROR,
- badConstructorControllers);
assertWithMessage(invalidConstructorError).that(invalidConstructors).isEmpty();
assertWithMessage(invalidClassHierarchyError).that(invalidClassHierarchy).isEmpty();
assertWithMessage(badClassNameError).that(badClassNameControllers).isEmpty();
- assertWithMessage(badConstructorError).that(badConstructorControllers).isEmpty();
}
private Set<Integer> getIndexableXml() {
Set<Integer> xmlResSet = new HashSet();
- Collection<Class> indexableClasses = SearchIndexableResources.providerValues();
+ Collection<Class> indexableClasses =
+ mSearchProvider.getSearchIndexableResources().getProviderValues();
indexableClasses.removeAll(illegalClasses);
for (Class clazz : indexableClasses) {
@@ -253,25 +245,16 @@
return constructor;
}
- private Object getObjectFromConstructor(Constructor<?> constructor) {
- Object controller = null;
-
- try {
- controller = constructor.newInstance(mContext);
- } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
- IllegalArgumentException e) {
+ /**
+ * Make sure that {@link BasePreferenceController} is in the class hierarchy.
+ */
+ private boolean isBasePreferenceController(Class<?> clazz) {
+ while (clazz != null) {
+ clazz = clazz.getSuperclass();
+ if (BasePreferenceController.class.equals(clazz)) {
+ return true;
+ }
}
-
- if (controller != null) {
- return controller;
- }
-
- try {
- controller = constructor.newInstance(mContext, "key");
- } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
- IllegalArgumentException e) {
- }
-
- return controller;
+ return false;
}
-}
+}
\ No newline at end of file
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 4455549..867b5df 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,7 @@
import android.util.ArraySet;
import com.android.settings.core.codeinspection.CodeInspector;
+import com.android.settingslib.core.instrumentation.Instrumentable;
import java.util.ArrayList;
import java.util.List;
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 9e37896..8ad2d69 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
@@ -21,6 +21,7 @@
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
index da48f15..2950c07 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
@@ -31,6 +31,9 @@
import com.android.settings.TestConfig;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.instrumentation.LogWriter;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import org.junit.Before;
import org.junit.Test;
@@ -58,7 +61,6 @@
@Mock private VisibilityLoggerMixin mockVisibilityLogger;
private Context mContext;
- private MetricsFeatureProvider mProvider;
@Captor
private ArgumentCaptor<Pair> mPairCaptor;
@@ -67,12 +69,6 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mProvider = new MetricsFeatureProvider();
- List<LogWriter> writers = new ArrayList<>();
- writers.add(mockLogWriter);
- ReflectionHelpers.setField(mProvider, "mLoggerWriters", writers);
-
- when(mockVisibilityLogger.elapsedTimeSinceVisible()).thenReturn(ELAPSED_TIME);
}
@Test
@@ -84,60 +80,4 @@
assertThat(feature1 == feature2).isTrue();
}
-
- @Test
- public void logDashboardStartIntent_intentEmpty_shouldNotLog() {
- mProvider.logDashboardStartIntent(mContext, null /* intent */,
- MetricsEvent.SETTINGS_GESTURES);
-
- verifyNoMoreInteractions(mockLogWriter);
- }
-
- @Test
- public void logDashboardStartIntent_intentHasNoComponent_shouldLog() {
- final Intent intent = new Intent(Intent.ACTION_ASSIST);
-
- mProvider.logDashboardStartIntent(mContext, intent, MetricsEvent.SETTINGS_GESTURES);
-
- verify(mockLogWriter).action(
- eq(mContext),
- eq(MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
- anyString(),
- eq(Pair.create(MetricsEvent.FIELD_CONTEXT, MetricsEvent.SETTINGS_GESTURES)));
- }
-
- @Test
- public void logDashboardStartIntent_intentIsExternal_shouldLog() {
- final Intent intent = new Intent().setComponent(new ComponentName("pkg", "cls"));
-
- mProvider.logDashboardStartIntent(mContext, intent, MetricsEvent.SETTINGS_GESTURES);
-
- verify(mockLogWriter).action(
- eq(mContext),
- eq(MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
- anyString(),
- eq(Pair.create(MetricsEvent.FIELD_CONTEXT, MetricsEvent.SETTINGS_GESTURES)));
- }
-
- @Test
- public void action_BooleanLogsElapsedTime() {
- mProvider.action(mockVisibilityLogger, CATEGORY, SUBTYPE_BOOLEAN);
- verify(mockLogWriter).action(eq(CATEGORY), eq(SUBTYPE_BOOLEAN), mPairCaptor.capture());
-
- Pair value = mPairCaptor.getValue();
- assertThat(value.first instanceof Integer).isTrue();
- assertThat((int) value.first).isEqualTo(MetricsEvent.NOTIFICATION_SINCE_VISIBLE_MILLIS);
- assertThat(value.second).isEqualTo(ELAPSED_TIME);
- }
-
- @Test
- public void action_IntegerLogsElapsedTime() {
- mProvider.action(mockVisibilityLogger, CATEGORY, SUBTYPE_INTEGER);
- verify(mockLogWriter).action(eq(CATEGORY), eq(SUBTYPE_INTEGER), mPairCaptor.capture());
-
- Pair value = mPairCaptor.getValue();
- assertThat(value.first instanceof Integer).isTrue();
- assertThat((int) value.first).isEqualTo(MetricsEvent.NOTIFICATION_SINCE_VISIBLE_MILLIS);
- assertThat(value.second).isEqualTo(ELAPSED_TIME);
- }
}
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
deleted file mode 100644
index c80e3a8..0000000
--- a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
+++ /dev/null
@@ -1,185 +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.core.instrumentation;
-
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.util.Pair;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import com.google.common.truth.Platform;
-
-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.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SharedPreferenceLoggerTest {
-
- private static final String TEST_TAG = "tag";
- private static final String TEST_KEY = "key";
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
-
- private ArgumentMatcher<Pair<Integer, Object>> mNamePairMatcher;
- private FakeFeatureFactory mFactory;
- private MetricsFeatureProvider mMetricsFeature;
- private SharedPreferencesLogger mSharedPrefLogger;
-
- @Before
- public void init() {
- MockitoAnnotations.initMocks(this);
- mFactory = FakeFeatureFactory.setupForTest();
- mMetricsFeature = mFactory.metricsFeatureProvider;
-
- mSharedPrefLogger = new SharedPreferencesLogger(mContext, TEST_TAG);
- mNamePairMatcher = pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, String.class);
- }
-
- @Test
- public void putInt_shouldNotLogInitialPut() {
- final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
- editor.putInt(TEST_KEY, 1);
- editor.putInt(TEST_KEY, 1);
- editor.putInt(TEST_KEY, 1);
- editor.putInt(TEST_KEY, 2);
- editor.putInt(TEST_KEY, 2);
- editor.putInt(TEST_KEY, 2);
- editor.putInt(TEST_KEY, 2);
-
- verify(mMetricsFeature, times(6)).action(any(Context.class), anyInt(),
- argThat(mNamePairMatcher),
- argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.class)));
- }
-
- @Test
- public void putBoolean_shouldNotLogInitialPut() {
- final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
- editor.putBoolean(TEST_KEY, true);
- editor.putBoolean(TEST_KEY, true);
- editor.putBoolean(TEST_KEY, false);
- editor.putBoolean(TEST_KEY, false);
- editor.putBoolean(TEST_KEY, false);
-
-
- verify(mMetricsFeature).action(any(Context.class), anyInt(),
- argThat(mNamePairMatcher),
- argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, true)));
- verify(mMetricsFeature, times(3)).action(any(Context.class), anyInt(),
- argThat(mNamePairMatcher),
- argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, false)));
- }
-
- @Test
- public void putLong_shouldNotLogInitialPut() {
- final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
- editor.putLong(TEST_KEY, 1);
- editor.putLong(TEST_KEY, 1);
- editor.putLong(TEST_KEY, 1);
- editor.putLong(TEST_KEY, 1);
- editor.putLong(TEST_KEY, 2);
-
- verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
- argThat(mNamePairMatcher),
- argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.class)));
- }
-
- @Test
- public void putLong_biggerThanIntMax_shouldLogIntMax() {
- final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
- final long veryBigNumber = 500L + Integer.MAX_VALUE;
- editor.putLong(TEST_KEY, 1);
- editor.putLong(TEST_KEY, veryBigNumber);
-
- verify(mMetricsFeature).action(any(Context.class), anyInt(),
- argThat(mNamePairMatcher),
- argThat(pairMatches(
- FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.MAX_VALUE)));
- }
-
- @Test
- public void putLong_smallerThanIntMin_shouldLogIntMin() {
- final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
- final long veryNegativeNumber = -500L + Integer.MIN_VALUE;
- editor.putLong(TEST_KEY, 1);
- editor.putLong(TEST_KEY, veryNegativeNumber);
-
- verify(mMetricsFeature).action(any(Context.class), anyInt(),
- argThat(mNamePairMatcher),
- argThat(pairMatches(
- FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.MIN_VALUE)));
- }
-
- @Test
- public void putFloat_shouldNotLogInitialPut() {
- final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
- editor.putFloat(TEST_KEY, 1);
- editor.putFloat(TEST_KEY, 1);
- editor.putFloat(TEST_KEY, 1);
- editor.putFloat(TEST_KEY, 1);
- editor.putFloat(TEST_KEY, 2);
-
- verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
- argThat(mNamePairMatcher),
- argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE, Float.class)));
- }
-
- @Test
- public void logPackage_shouldUseLogPackageApi() {
- mSharedPrefLogger.logPackageName("key", "com.android.settings");
- verify(mMetricsFeature).action(any(Context.class),
- eq(ACTION_SETTINGS_PREFERENCE_CHANGE),
- eq("com.android.settings"),
- any(Pair.class));
- }
-
- private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, Class clazz) {
- return pair -> pair.first == tag && Platform.isInstanceOfType(pair.second, clazz);
- }
-
- private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, boolean bool) {
- return pair -> pair.first == tag
- && Platform.isInstanceOfType(pair.second, Integer.class)
- && pair.second.equals((bool ? 1 : 0));
- }
-
- private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, int val) {
- return pair -> pair.first == tag
- && Platform.isInstanceOfType(pair.second, Integer.class)
- && pair.second.equals(val);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
deleted file mode 100644
index 1a47a66..0000000
--- a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
+++ /dev/null
@@ -1,123 +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.core.instrumentation;
-
-import static com.android.settings.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-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.Context;
-import android.content.Intent;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-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;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class VisibilityLoggerMixinTest {
-
- @Mock
- private MetricsFeatureProvider mMetricsFeature;
-
- private VisibilityLoggerMixin mMixin;
-
- @Before
- public void init() {
- MockitoAnnotations.initMocks(this);
- mMixin = new VisibilityLoggerMixin(TestInstrumentable.TEST_METRIC, mMetricsFeature);
- }
-
- @Test
- public void shouldLogVisibleOnResume() {
- mMixin.onResume();
-
- verify(mMetricsFeature, times(1))
- .visible(nullable(Context.class), eq(MetricsProto.MetricsEvent.VIEW_UNKNOWN),
- eq(TestInstrumentable.TEST_METRIC));
- }
-
- @Test
- public void shouldLogVisibleWithSource() {
- final Intent sourceIntent = new Intent()
- .putExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY,
- MetricsProto.MetricsEvent.SETTINGS_GESTURES);
- final Activity activity = mock(Activity.class);
- when(activity.getIntent()).thenReturn(sourceIntent);
- mMixin.setSourceMetricsCategory(activity);
- mMixin.onResume();
-
- verify(mMetricsFeature, times(1))
- .visible(nullable(Context.class), eq(MetricsProto.MetricsEvent.SETTINGS_GESTURES),
- eq(TestInstrumentable.TEST_METRIC));
- }
-
- @Test
- public void shouldLogHideOnPause() {
- mMixin.onPause();
-
- verify(mMetricsFeature, times(1))
- .hidden(nullable(Context.class), eq(TestInstrumentable.TEST_METRIC));
- }
-
- @Test
- public void shouldNotLogIfMetricsFeatureIsNull() {
- mMixin = new VisibilityLoggerMixin(TestInstrumentable.TEST_METRIC);
- mMixin.onResume();
- mMixin.onPause();
-
- verify(mMetricsFeature, never())
- .hidden(nullable(Context.class), anyInt());
- }
-
- @Test
- public void shouldNotLogIfMetricsCategoryIsUnknown() {
- mMixin = new VisibilityLoggerMixin(METRICS_CATEGORY_UNKNOWN, mMetricsFeature);
-
- mMixin.onResume();
- mMixin.onPause();
-
- verify(mMetricsFeature, never())
- .hidden(nullable(Context.class), anyInt());
- }
-
- private final class TestInstrumentable implements Instrumentable {
-
- public static final int TEST_METRIC = 12345;
-
- @Override
- public int getMetricsCategory() {
- return TEST_METRIC;
- }
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterV2Test.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterV2Test.java
new file mode 100644
index 0000000..40150cb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterV2Test.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.dashboard;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.any;
+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.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+import android.service.settings.suggestions.Suggestion;
+import android.support.v7.widget.RecyclerView;
+import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.conditional.Condition;
+import com.android.settings.dashboard.suggestions.SuggestionAdapterV2;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settingslib.drawer.Tile;
+
+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(manifest = TestConfig.MANIFEST_PATH,
+ sdk = TestConfig.SDK_VERSION,
+ shadows = {
+ SettingsShadowResources.class,
+ SettingsShadowResources.SettingsShadowTheme.class,
+ })
+public class DashboardAdapterV2Test {
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private SettingsActivity mContext;
+ @Mock
+ private View mView;
+ @Mock
+ private Condition mCondition;
+ @Mock
+ private Resources mResources;
+ private FakeFeatureFactory mFactory;
+ private DashboardAdapterV2 mDashboardAdapter;
+ private List<Condition> mConditionList;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mFactory = FakeFeatureFactory.setupForTest();
+ when(mFactory.dashboardFeatureProvider.shouldTintIcon()).thenReturn(true);
+
+ 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 DashboardAdapterV2(mContext, null /* savedInstanceState */,
+ mConditionList, null /* suggestionControllerMixin */, null /* lifecycle */);
+ when(mView.getTag()).thenReturn(mCondition);
+ }
+
+ @Test
+ public void testSuggestionDismissed_notOnlySuggestion_updateSuggestionOnly() {
+ final DashboardAdapterV2 adapter =
+ spy(new DashboardAdapterV2(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));
+ final DashboardAdapterV2.SuggestionContainerHolder holder =
+ new DashboardAdapterV2.SuggestionContainerHolder(itemView);
+
+ adapter.onBindSuggestion(holder, 0);
+
+ final DashboardDataV2 dashboardData = adapter.mDashboardData;
+ reset(adapter); // clear interactions tracking
+
+ final Suggestion suggestionToRemove = suggestions.get(1);
+ adapter.onSuggestionClosed(suggestionToRemove);
+
+ assertThat(adapter.mDashboardData).isEqualTo(dashboardData);
+ assertThat(suggestions.size()).isEqualTo(2);
+ assertThat(suggestions.contains(suggestionToRemove)).isFalse();
+ verify(adapter, never()).notifyDashboardDataChanged(any());
+ }
+
+ @Test
+ public void testSuggestionDismissed_moreThanTwoSuggestions_shouldNotCrash() {
+ final RecyclerView data = new RecyclerView(RuntimeEnvironment.application);
+ 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));
+ final DashboardAdapterV2.SuggestionContainerHolder holder =
+ new DashboardAdapterV2.SuggestionContainerHolder(itemView);
+ final List<Suggestion> suggestions = makeSuggestionsV2("pkg1", "pkg2", "pkg3", "pkg4");
+ final DashboardAdapterV2 adapter = spy(new DashboardAdapterV2(mContext,
+ null /*savedInstance */, null /* conditions */,
+ null /* suggestionControllerMixin */,
+ null /* lifecycle */));
+ adapter.setSuggestions(suggestions);
+ adapter.onBindSuggestion(holder, 0);
+
+ adapter.onSuggestionClosed(suggestions.get(1));
+
+ // verify operations that access the lists will not cause ConcurrentModificationException
+ assertThat(holder.data.getAdapter().getItemCount()).isEqualTo(3);
+ adapter.setSuggestions(suggestions);
+ // should not crash
+ }
+
+ @Test
+ public void testSuggestionDismissed_onlySuggestion_updateDashboardData() {
+ DashboardAdapterV2 adapter =
+ spy(new DashboardAdapterV2(mContext, null /* savedInstanceState */,
+ null /* conditions */, null /* suggestionControllerMixin */, null /*
+ lifecycle */));
+ final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
+ adapter.setSuggestions(suggestions);
+ final DashboardDataV2 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 testBindSuggestion_shouldSetSuggestionAdapterAndNoCrash() {
+ mDashboardAdapter = new DashboardAdapterV2(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));
+ final DashboardAdapterV2.SuggestionContainerHolder holder =
+ new DashboardAdapterV2.SuggestionContainerHolder(itemView);
+
+ mDashboardAdapter.onBindSuggestion(holder, 0);
+
+ verify(data).setAdapter(any(SuggestionAdapterV2.class));
+ // should not crash
+ }
+
+ @Test
+ public void testBindSuggestion_shouldSetSummary() {
+ mDashboardAdapter = new DashboardAdapterV2(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);
+ final TextView summary = mock(TextView.class);
+ when(itemView.findViewById(android.R.id.summary)).thenReturn(summary);
+ final DashboardAdapterV2.SuggestionContainerHolder holder =
+ new DashboardAdapterV2.SuggestionContainerHolder(itemView);
+
+ mDashboardAdapter.onBindSuggestion(holder, 0);
+
+ verify(summary).setText("1");
+
+ suggestions.addAll(makeSuggestionsV2("pkg2", "pkg3", "pkg4"));
+ mDashboardAdapter.setSuggestions(suggestions);
+
+ mDashboardAdapter.onBindSuggestion(holder, 0);
+
+ verify(summary).setText("4");
+ }
+
+ @Test
+ public void onBindTile_internalTile_shouldNotUseGenericBackgroundIcon() {
+ final Context context = RuntimeEnvironment.application;
+ final View view = LayoutInflater.from(context).inflate(R.layout.dashboard_tile, null);
+ final DashboardAdapterV2.DashboardItemHolder holder =
+ new DashboardAdapterV2.DashboardItemHolder(view);
+ final Tile tile = new Tile();
+ tile.icon = Icon.createWithResource(context, R.drawable.ic_settings);
+ final DashboardAdapterV2.IconCache iconCache = mock(DashboardAdapterV2.IconCache.class);
+ when(iconCache.getIcon(tile.icon)).thenReturn(context.getDrawable(R.drawable.ic_settings));
+
+ mDashboardAdapter = new DashboardAdapterV2(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_shouldNotUseGenericBackgroundIcon() {
+ final Context context = RuntimeEnvironment.application;
+ final View view = LayoutInflater.from(context).inflate(R.layout.dashboard_tile, null);
+ final DashboardAdapterV2.DashboardItemHolder holder =
+ new DashboardAdapterV2.DashboardItemHolder(view);
+ final Tile tile = new Tile();
+ tile.icon = mock(Icon.class);
+ when(tile.icon.getResPackage()).thenReturn("another.package");
+
+ final DashboardAdapterV2.IconCache iconCache = mock(DashboardAdapterV2.IconCache.class);
+ when(iconCache.getIcon(tile.icon)).thenReturn(context.getDrawable(R.drawable.ic_settings));
+
+ mDashboardAdapter = new DashboardAdapterV2(context, null /* savedInstanceState */,
+ null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */);
+ ReflectionHelpers.setField(mDashboardAdapter, "mCache", iconCache);
+ mDashboardAdapter.onBindTile(holder, tile);
+
+ verify(iconCache).updateIcon(eq(tile.icon), 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;
+ }
+
+ private void setupSuggestions(List<Suggestion> suggestions) {
+ final Context context = RuntimeEnvironment.application;
+ mDashboardAdapter.setSuggestions(suggestions);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index 741f2bc..afa914c 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -51,6 +51,7 @@
import com.android.settings.testutils.shadow.ShadowThreadUtils;
import com.android.settings.testutils.shadow.ShadowTileUtils;
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.CategoryManager;
import com.android.settingslib.drawer.DashboardCategory;
@@ -372,7 +373,7 @@
final Intent launchIntent = shadowActivity.getNextStartedActivityForResult().intent;
assertThat(launchIntent.getAction())
.isEqualTo("TestAction");
- assertThat(launchIntent.getIntExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY, 0))
+ assertThat(launchIntent.getIntExtra(VisibilityLoggerMixin.EXTRA_SOURCE_METRICS_CATEGORY, 0))
.isEqualTo(MetricsProto.MetricsEvent.SETTINGS_GESTURES);
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index 6c663ab..40e590a 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -33,10 +33,10 @@
import com.android.settings.TestConfig;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.drawer.TileUtils;
diff --git a/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java b/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java
new file mode 100644
index 0000000..4c62a6f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.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.dashboard;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+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));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterV2Test.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterV2Test.java
new file mode 100644
index 0000000..5e0ecec
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterV2Test.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.DashboardAdapterV2;
+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.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ConditionAdapterV2Test {
+ @Mock
+ private Condition mCondition1;
+ @Mock
+ private Condition mCondition2;
+
+ private Context mContext;
+ private ConditionAdapterV2 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 ConditionAdapterV2(mContext, mOneCondition, false);
+ assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
+ }
+
+ @Test
+ public void getItemCount_expanded_shouldReturnListSize() {
+ mConditionAdapter = new ConditionAdapterV2(mContext, mOneCondition, true);
+ assertThat(mConditionAdapter.getItemCount()).isEqualTo(1);
+
+ mConditionAdapter = new ConditionAdapterV2(mContext, mTwoConditions, true);
+ assertThat(mConditionAdapter.getItemCount()).isEqualTo(2);
+ }
+
+ @Test
+ public void getItemViewType_shouldReturnConditionTile() {
+ mConditionAdapter = new ConditionAdapterV2(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 DashboardAdapterV2.DashboardItemHolder viewHolder =
+ new DashboardAdapterV2.DashboardItemHolder(view);
+ mConditionAdapter = new ConditionAdapterV2(mContext, mOneCondition, true);
+
+ mConditionAdapter.onBindViewHolder(viewHolder, 0);
+ final View card = view.findViewById(R.id.content);
+ 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 DashboardAdapterV2.DashboardItemHolder viewHolder =
+ new DashboardAdapterV2.DashboardItemHolder(view);
+ mConditionAdapter = new ConditionAdapterV2(mContext, mOneCondition, true);
+
+ mConditionAdapter.onBindViewHolder(viewHolder, 0);
+ final View card = view.findViewById(R.id.content);
+ 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 DashboardAdapterV2.DashboardItemHolder viewHolder =
+ new DashboardAdapterV2.DashboardItemHolder(view);
+ mConditionAdapter = new ConditionAdapterV2(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
index d077e6f..1a3fa5e 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
@@ -22,7 +22,7 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/ShadowSuggestionController.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/ShadowSuggestionController.java
deleted file mode 100644
index b720f83..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/ShadowSuggestionController.java
+++ /dev/null
@@ -1,61 +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.service.settings.suggestions.Suggestion;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import java.util.List;
-
-@Implements(SuggestionController.class)
-public class ShadowSuggestionController {
-
- public static boolean sStartCalled;
- public static boolean sStopCalled;
- public static boolean sGetSuggestionCalled;
-
- public static List<Suggestion> sSuggestions;
-
- public static void reset() {
- sStartCalled = false;
- sStopCalled = false;
- sGetSuggestionCalled = false;
- sSuggestions = null;
- }
-
- @Implementation
- public void start() {
- sStartCalled = true;
- }
-
- @Implementation
- public void stop() {
- sStopCalled = true;
- }
-
- public static void setSuggestion(List<Suggestion> suggestions) {
- sSuggestions = suggestions;
- }
-
- @Implementation
- public List<Suggestion> getSuggestions() {
- sGetSuggestionCalled = true;
- return sSuggestions;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
index 26940d6..49e82e4 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
@@ -36,7 +36,7 @@
import com.android.settings.dashboard.DashboardAdapter;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionControllerMixin;
import org.junit.Before;
import org.junit.Test;
@@ -62,10 +62,8 @@
private Context mContext;
private SuggestionAdapter mSuggestionAdapter;
private DashboardAdapter.DashboardItemHolder mSuggestionHolder;
- private List<Tile> mOneSuggestion;
- private List<Tile> mTwoSuggestions;
- private List<Suggestion> mOneSuggestionV2;
- private List<Suggestion> mTwoSuggestionsV2;
+ private List<Suggestion> mOneSuggestion;
+ private List<Suggestion> mTwoSuggestions;
@Before
public void setUp() {
@@ -73,45 +71,34 @@
mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
- final Tile suggestion1 = new Tile();
- final Tile suggestion2 = new Tile();
- final Suggestion suggestion1V2 = new Suggestion.Builder("id1")
+ final Suggestion suggestion1 = new Suggestion.Builder("id1")
.setTitle("Test suggestion 1")
.build();
- final Suggestion suggestion2V2 = new Suggestion.Builder("id2")
+ final Suggestion suggestion2 = new Suggestion.Builder("id2")
.setTitle("Test suggestion 2")
.build();
- suggestion1.title = "Test Suggestion 1";
- suggestion1.icon = mock(Icon.class);
- suggestion2.title = "Test Suggestion 2";
- suggestion2.icon = mock(Icon.class);
mOneSuggestion = new ArrayList<>();
mOneSuggestion.add(suggestion1);
mTwoSuggestions = new ArrayList<>();
mTwoSuggestions.add(suggestion1);
mTwoSuggestions.add(suggestion2);
- mOneSuggestionV2 = new ArrayList<>();
- mOneSuggestionV2.add(suggestion1V2);
- mTwoSuggestionsV2 = new ArrayList<>();
- mTwoSuggestionsV2.add(suggestion1V2);
- mTwoSuggestionsV2.add(suggestion2V2);
}
@Test
public void getItemCount_shouldReturnListSize() {
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
- mOneSuggestionV2, new ArrayList<>());
+ mOneSuggestion, new ArrayList<>());
assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
- mTwoSuggestionsV2, new ArrayList<>());
+ mTwoSuggestions, new ArrayList<>());
assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
}
@Test
public void getItemViewType_shouldReturnSuggestionTile() {
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
- mOneSuggestionV2, new ArrayList<>());
+ mOneSuggestion, new ArrayList<>());
assertThat(mSuggestionAdapter.getItemViewType(0))
.isEqualTo(R.layout.suggestion_tile);
}
@@ -137,7 +124,7 @@
R.layout.suggestion_tile, new LinearLayout(mContext), true));
mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
- mOneSuggestionV2, new ArrayList<>());
+ mOneSuggestion, new ArrayList<>());
// Bind twice
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
@@ -146,13 +133,13 @@
// Log once
verify(mFeatureFactory.metricsFeatureProvider).action(
mContext, MetricsProto.MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- mOneSuggestionV2.get(0).getId());
+ mOneSuggestion.get(0).getId());
}
@Test
public void onBindViewHolder_itemViewShouldHandleClick()
throws PendingIntent.CanceledException {
- final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
+ final List<Suggestion> suggestions = makeSuggestions("pkg1");
setupSuggestions(mActivity, suggestions);
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
@@ -164,21 +151,21 @@
@Test
public void getSuggestions_shouldReturnSuggestionWhenMatch() {
- final List<Suggestion> suggestionsV2 = makeSuggestionsV2("pkg1");
- setupSuggestions(mActivity, suggestionsV2);
+ final List<Suggestion> suggestions = makeSuggestions("pkg1");
+ setupSuggestions(mActivity, suggestions);
assertThat(mSuggestionAdapter.getSuggestion(0)).isNotNull();
}
- private void setupSuggestions(Context context, List<Suggestion> suggestionsV2) {
+ private void setupSuggestions(Context context, List<Suggestion> suggestions) {
mSuggestionAdapter = new SuggestionAdapter(context, mSuggestionControllerMixin,
- suggestionsV2, new ArrayList<>());
+ suggestions, new ArrayList<>());
mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
new FrameLayout(RuntimeEnvironment.application),
mSuggestionAdapter.getItemViewType(0));
}
- private List<Suggestion> makeSuggestionsV2(String... pkgNames) {
+ private List<Suggestion> makeSuggestions(String... pkgNames) {
final List<Suggestion> suggestions = new ArrayList<>();
for (String pkgName : pkgNames) {
final Suggestion suggestion = new Suggestion.Builder(pkgName)
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2Test.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2Test.java
new file mode 100644
index 0000000..1e76e2d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2Test.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.service.settings.suggestions.Suggestion;
+import android.view.LayoutInflater;
+import android.view.View;
+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.TestConfig;
+import com.android.settings.dashboard.DashboardAdapterV2;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.suggestions.SuggestionControllerMixin;
+
+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 java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SuggestionAdapterV2Test {
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private SettingsActivity mActivity;
+ @Mock
+ private SuggestionControllerMixin mSuggestionControllerMixin;
+ private FakeFeatureFactory mFeatureFactory;
+ private Context mContext;
+ private SuggestionAdapterV2 mSuggestionAdapter;
+ private DashboardAdapterV2.DashboardItemHolder mSuggestionHolder;
+ private List<Suggestion> mOneSuggestion;
+ private List<Suggestion> mTwoSuggestions;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ 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 SuggestionAdapterV2(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 SuggestionAdapterV2(mContext, mSuggestionControllerMixin,
+ null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
+ mSuggestionAdapter.setSuggestions(mOneSuggestion);
+ assertThat(mSuggestionAdapter.getItemViewType(0))
+ .isEqualTo(R.layout.suggestion_tile_v2);
+ }
+
+ @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 SuggestionAdapterV2(mContext, mSuggestionControllerMixin,
+ null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
+ mSuggestionAdapter.setSuggestions(suggestions);
+
+ assertThat(mSuggestionAdapter.getItemViewType(0))
+ .isEqualTo(R.layout.suggestion_tile_with_button_v2);
+ }
+
+ @Test
+ public void onBindViewHolder_shouldLog() {
+ final View view = spy(LayoutInflater.from(mContext).inflate(
+ R.layout.suggestion_tile, new LinearLayout(mContext), true));
+ mSuggestionHolder = new DashboardAdapterV2.DashboardItemHolder(view);
+ mSuggestionAdapter = new SuggestionAdapterV2(mContext, mSuggestionControllerMixin,
+ null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
+ mSuggestionAdapter.setSuggestions(mOneSuggestion);
+
+ // 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 SuggestionAdapterV2(mContext, mSuggestionControllerMixin,
+ null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
+ mSuggestionAdapter.setSuggestions(suggestions);
+ mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
+ new FrameLayout(RuntimeEnvironment.application),
+ mSuggestionAdapter.getItemViewType(0));
+
+ 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 SuggestionAdapterV2.Callback callback = mock(SuggestionAdapterV2.Callback.class);
+ mSuggestionAdapter = new SuggestionAdapterV2(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();
+
+ verify(callback).onSuggestionClosed(suggestions.get(0));
+ }
+
+ private void setupSuggestions(Context context, List<Suggestion> suggestions) {
+ mSuggestionAdapter = new SuggestionAdapterV2(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/SuggestionControllerMixinTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java
deleted file mode 100644
index bceb865..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java
+++ /dev/null
@@ -1,124 +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 android.arch.lifecycle.Lifecycle.Event.ON_START;
-import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.LoaderManager;
-import android.content.Context;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-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 org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowSuggestionController.class
- })
-public class SuggestionControllerMixinTest {
-
- @Mock
- private SuggestionControllerMixin.SuggestionControllerHost mHost;
- private Context mContext;
- private Lifecycle mLifecycle;
- private SuggestionControllerMixin mMixin;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- FakeFeatureFactory.setupForTest();
- mLifecycle = new Lifecycle(() -> mLifecycle);
- }
-
- @After
- public void tearDown() {
- ShadowSuggestionController.reset();
- }
-
- @Test
- public void goThroughLifecycle_onStartStop_shouldStartStopController() {
- mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);
-
- mLifecycle.handleLifecycleEvent(ON_START);
- assertThat(ShadowSuggestionController.sStartCalled).isTrue();
-
- mLifecycle.handleLifecycleEvent(ON_STOP);
- assertThat(ShadowSuggestionController.sStopCalled).isTrue();
- }
-
- @Test
- public void onServiceConnected_shouldGetSuggestion() {
- final LoaderManager loaderManager = mock(LoaderManager.class);
- when(mHost.getLoaderManager()).thenReturn(loaderManager);
-
- mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);
- mMixin.onServiceConnected();
-
- verify(loaderManager).restartLoader(SuggestionLoader.LOADER_ID_SUGGESTIONS,
- null /* args */, mMixin /* callback */);
- }
-
- @Test
- public void onServiceConnected_hostNotAttached_shouldDoNothing() {
- when(mHost.getLoaderManager()).thenReturn(null);
-
- mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);
- mMixin.onServiceConnected();
-
- verify(mHost).getLoaderManager();
- }
-
- @Test
- public void onServiceDisconnected_hostNotAttached_shouldDoNothing() {
- when(mHost.getLoaderManager()).thenReturn(null);
-
- mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);
- mMixin.onServiceDisconnected();
-
- verify(mHost).getLoaderManager();
- }
-
- @Test
- public void doneLoadingg_shouldSetSuggestionLoaded() {
- mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);
-
- mMixin.onLoadFinished(mock(SuggestionLoader.class), null);
-
- assertThat(mMixin.isSuggestionLoaded()).isTrue();
-
- mMixin.onLoaderReset(mock(SuggestionLoader.class));
-
- assertThat(mMixin.isSuggestionLoaded()).isFalse();
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
index a437cb4..f10f5ec 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
@@ -33,6 +33,7 @@
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.suggestions.SuggestionControllerMixin;
import org.junit.Before;
import org.junit.Test;
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 8ed885f..54af308 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@ -44,6 +44,7 @@
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionControllerMixin;
import org.junit.After;
import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
index 7cd09de..58643b6 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -29,8 +29,8 @@
import static org.mockito.Mockito.when;
import android.content.pm.PackageManager;
+import android.net.NetworkPolicyManager;
import android.os.Bundle;
-import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
import android.util.ArraySet;
@@ -40,8 +40,11 @@
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.widget.EntityHeaderController;
import com.android.settingslib.AppItem;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.After;
@@ -57,7 +60,10 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = ShadowEntityHeaderController.class)
+ shadows = {
+ ShadowEntityHeaderController.class,
+ ShadowRestrictedLockUtils.class
+ })
public class AppDataUsageTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -134,7 +140,7 @@
public void changePreference_backgroundData_shouldUpdateUI() {
mFragment = spy(new AppDataUsage());
final AppItem appItem = new AppItem(123456789);
- final SwitchPreference pref = mock(SwitchPreference.class);
+ final RestrictedSwitchPreference pref = mock(RestrictedSwitchPreference.class);
final DataSaverBackend dataSaverBackend = mock(DataSaverBackend.class);
ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
ReflectionHelpers.setField(mFragment, "mRestrictBackground", pref);
@@ -146,4 +152,31 @@
verify(mFragment).updatePrefs();
}
+
+ @Test
+ public void updatePrefs_restrictedByAdmin_shouldDisablePreference() {
+ mFragment = spy(new AppDataUsage());
+ 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);
+
+ ShadowRestrictedLockUtils.setRestricted(true);
+ doReturn(NetworkPolicyManager.POLICY_NONE).when(networkPolicyManager)
+ .getUidPolicy(testUid);
+
+ mFragment.updatePrefs();
+
+ verify(restrictBackgroundPref).setDisabledByAdmin(any(EnforcedAdmin.class));
+ verify(unrestrictedDataPref).setDisabledByAdmin(any(EnforcedAdmin.class));
+ }
}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
index 9ab88d3..54fbe71 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
@@ -18,6 +18,7 @@
import android.content.Context;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settingslib.NetworkPolicyEditor;
@@ -47,9 +48,12 @@
private Context mContext;
private DataUsageList mDataUsageList;
+ private FakeFeatureFactory mFactory;
+
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mFactory = FakeFeatureFactory.setupForTest();
mNetworkServices.mPolicyEditor = mock(NetworkPolicyEditor.class);
mDataUsageList = spy(DataUsageList.class);
@@ -60,6 +64,7 @@
@Test
public void resumePause_shouldListenUnlistenDataStateChange() {
+ mDataUsageList.onAttach(mContext);
mDataUsageList.onResume();
verify(mListener).setListener(true, 0, mContext);
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index dc53ca1..c122105 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -69,23 +69,6 @@
}
@Test
- public void testUpdateNetworkRestrictionSummary_shouldSetSummary() {
- final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
- final NetworkRestrictionsPreference preference = mock(NetworkRestrictionsPreference.class);
- final NetworkPolicyEditor policyEditor = mock(NetworkPolicyEditor.class);
- final WifiManager wifiManager = mock(WifiManager.class);
- ReflectionHelpers.setField(dataUsageSummary, "mPolicyEditor", policyEditor);
- ReflectionHelpers.setField(dataUsageSummary, "mWifiManager", wifiManager);
- when(wifiManager.getConfiguredNetworks()).thenReturn(new ArrayList<WifiConfiguration>());
- doReturn(mContext.getResources()).when(dataUsageSummary).getResources();
-
- dataUsageSummary.updateNetworkRestrictionSummary(preference);
-
- verify(preference).setSummary(mContext.getResources().getQuantityString(
- R.plurals.network_restrictions_summary, 0, 0));
- }
-
- @Test
@Config(shadows = {
SettingsShadowResources.class,
SettingsShadowResources.SettingsShadowTheme.class
diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
index 53cb7ed..fff879f 100644
--- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
@@ -16,41 +16,68 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doAnswer;
+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 android.content.Context;
import android.content.pm.ApplicationInfo;
import android.os.Process;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
import com.android.settings.TestConfig;
+import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
+import com.android.settings.datausage.UnrestrictedDataAccess.AccessPreference;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.applications.ApplicationsState;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
+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 org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+ shadows = {
+ ShadowRestrictedLockUtils.class
+ })
public class UnrestrictedDataAccessTest {
@Mock
- private ApplicationsState.AppEntry mAppEntry;
+ private AppEntry mAppEntry;
private UnrestrictedDataAccess mFragment;
private FakeFeatureFactory mFeatureFactory;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+ @Mock
+ private PreferenceManager mPreferenceManager;
+ @Mock
+ private DataSaverBackend mDataSaverBackend;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mFeatureFactory = FakeFeatureFactory.setupForTest();
- mFragment = new UnrestrictedDataAccess();
+ mFragment = spy(new UnrestrictedDataAccess());
}
@Test
@@ -80,4 +107,66 @@
eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_UNL_DATA_DENY), eq("app"));
}
+ @Test
+ public void testOnRebuildComplete_restricted_shouldBeDisabled() {
+ final Context context = RuntimeEnvironment.application;
+ doReturn(context).when(mFragment).getContext();
+ doReturn(context).when(mPreferenceManager).getContext();
+ doReturn(true).when(mFragment).shouldAddPreference(any(AppEntry.class));
+ doNothing().when(mFragment).setLoading(anyBoolean(), anyBoolean());
+ doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
+ doReturn(mPreferenceManager).when(mFragment).getPreferenceManager();
+ ReflectionHelpers.setField(mFragment, "mDataSaverBackend", mDataSaverBackend);
+
+ final String testPkg1 = "com.example.one";
+ final String testPkg2 = "com.example.two";
+ ShadowRestrictedLockUtils.setRestrictedPkgs(testPkg2);
+
+ doAnswer((invocation) -> {
+ final AccessPreference preference = invocation.getArgument(0);
+ final AppEntry entry = preference.getEntryForTest();
+ // Verify preference is disabled by admin and the summary is changed accordingly.
+ if (testPkg1.equals(entry.info.packageName)) {
+ assertThat(preference.isDisabledByAdmin()).isFalse();
+ assertThat(preference.getSummary()).isEqualTo("");
+ } else if (testPkg2.equals(entry.info.packageName)) {
+ assertThat(preference.isDisabledByAdmin()).isTrue();
+ assertThat(preference.getSummary()).isEqualTo(
+ context.getString(R.string.disabled_by_admin));
+ }
+ assertThat(preference.isChecked()).isFalse();
+ preference.performClick();
+ // Verify that when the preference is clicked, support details intent is launched
+ // if the preference is disabled by admin, otherwise the switch is toggled.
+ if (testPkg1.equals(entry.info.packageName)) {
+ assertThat(preference.isChecked()).isTrue();
+ assertThat(ShadowRestrictedLockUtils.hasAdminSupportDetailsIntentLaunched())
+ .isFalse();
+ } else if (testPkg2.equals(entry.info.packageName)) {
+ assertThat(preference.isChecked()).isFalse();
+ assertThat(ShadowRestrictedLockUtils.hasAdminSupportDetailsIntentLaunched())
+ .isTrue();
+ }
+ ShadowRestrictedLockUtils.clearAdminSupportDetailsIntentLaunch();
+ return null;
+ }).when(mPreferenceScreen).addPreference(any(AccessPreference.class));
+ mFragment.onRebuildComplete(createAppEntries(testPkg1, testPkg2));
+ }
+
+ private ArrayList<AppEntry> createAppEntries(String... packageNames) {
+ final ArrayList<AppEntry> appEntries = new ArrayList<>();
+ for (int i = 0; i < packageNames.length; ++i) {
+ final ApplicationInfo info = new ApplicationInfo();
+ info.packageName = packageNames[i];
+ info.uid = Process.FIRST_APPLICATION_UID + i;
+ info.sourceDir = info.packageName;
+ final AppEntry appEntry = spy(new AppEntry(RuntimeEnvironment.application,
+ info, i));
+ appEntry.extraInfo = new DataUsageState(false, false);
+ doNothing().when(appEntry).ensureLabel(any(Context.class));
+ ReflectionHelpers.setField(appEntry, "info", info);
+ appEntries.add(appEntry);
+ }
+ return appEntries;
+ }
}
diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
index 92807e9..9f6d0ef 100644
--- a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
@@ -28,8 +28,8 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
import com.android.settings.testutils.shadow.ShadowZoneGetter;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/DataLoaderTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/DataLoaderTest.java
new file mode 100644
index 0000000..23bfabb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/DataLoaderTest.java
@@ -0,0 +1,94 @@
+/*
+ * 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.datetime.timezone;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import java.util.List;
+import java.util.Locale;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DataLoaderTest {
+
+ @Test
+ public void testHasData() {
+ List<RegionInfo> regions = new DataLoader(Locale.US).loadRegionInfos();
+ // Sanity check. Real size is closer to 200.
+ assertNotNull(regions);
+ assertTrue(regions.size() > 100);
+ assertEquals("Afghanistan", regions.get(0).getName());
+ assertEquals("Zimbabwe", regions.get(regions.size() - 1).getName());
+ }
+
+ @Test
+ public void testRegionsWithTimeZone() {
+ List<RegionInfo> regions = new DataLoader(Locale.US).loadRegionInfos();
+ checkRegionHasTimeZone(regions, "AT", "Europe/Vienna");
+ checkRegionHasTimeZone(regions, "US", "America/Los_Angeles");
+ checkRegionHasTimeZone(regions, "CN", "Asia/Shanghai");
+ checkRegionHasTimeZone(regions, "AU", "Australia/Sydney");
+ }
+
+ @Test
+ public void testFixedOffsetTimeZones() {
+ List<TimeZoneInfo> timeZones = new DataLoader(Locale.US).loadFixedOffsets();
+ // Etc/GMT would be equivalent to Etc/UTC, except for how it is labelled. Users have
+ // explicitly asked for UTC to be supported, so make sure we label it as such.
+ checkHasTimeZone(timeZones, "Etc/UTC");
+ checkHasTimeZone(timeZones, "Etc/GMT-1");
+ checkHasTimeZone(timeZones, "Etc/GMT-14");
+ checkHasTimeZone(timeZones, "Etc/GMT+1");
+ checkHasTimeZone(timeZones, "Etc/GMT+12");
+ }
+
+ private void checkRegionHasTimeZone(List<RegionInfo> regions, String regionId, String tzId) {
+ RegionInfo ri = findRegion(regions, regionId);
+ assertTrue("Region " + regionId + " does not have time zone " + tzId,
+ ri.getTimeZoneIds().contains(tzId));
+ }
+
+ private void checkHasTimeZone(List<TimeZoneInfo> timeZoneInfos, String tzId) {
+ for (TimeZoneInfo tz : timeZoneInfos) {
+ if (tz.getId().equals(tzId)) {
+ return;
+ }
+ }
+ fail("Fixed offset time zones do not contain " + tzId);
+ }
+
+ private RegionInfo findRegion(List<RegionInfo> regions, String regionId) {
+ for (RegionInfo region : regions) {
+ if (region.getId().equals(regionId)) {
+ assertNotNull(region.getName());
+ return region;
+ }
+
+ }
+ fail("No region with id " + regionId + " found.");
+ return null; // can't reach.
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneAdapterTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneAdapterTest.java
new file mode 100644
index 0000000..5f29a0b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneAdapterTest.java
@@ -0,0 +1,105 @@
+/*
+ * 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.datetime.timezone;
+
+import android.icu.util.TimeZone;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.FrameLayout;
+import com.android.settings.TestConfig;
+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 java.util.Collections;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+ shadows = {
+ SettingsShadowResources.class,
+ SettingsShadowResources.SettingsShadowTheme.class})
+public class TimeZoneAdapterTest {
+ @Mock
+ private View.OnClickListener mOnClickListener;
+
+ private TimeZoneAdapter mTimeZoneAdapter;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mTimeZoneAdapter = new TimeZoneAdapter(mOnClickListener, RuntimeEnvironment.application);
+ }
+
+ @Test
+ public void getItemViewType_onDefaultTimeZone_returnsTypeSelected() {
+ final TimeZoneInfo tzi = dummyTimeZoneInfo(TimeZone.getDefault());
+ mTimeZoneAdapter.setTimeZoneInfos(Collections.singletonList(tzi));
+ assertThat(mTimeZoneAdapter.getItemViewType(0)).isEqualTo(TimeZoneAdapter.VIEW_TYPE_SELECTED);
+ }
+
+ @Test
+ public void getItemViewType_onNonDefaultTimeZone_returnsTypeNormal() {
+ final TimeZoneInfo tzi = dummyTimeZoneInfo(getNonDefaultTimeZone());
+ mTimeZoneAdapter.setTimeZoneInfos(Collections.singletonList(tzi));
+ assertThat(mTimeZoneAdapter.getItemViewType(0)).isEqualTo(TimeZoneAdapter.VIEW_TYPE_NORMAL);
+ }
+
+ @Test
+ public void bindViewHolder_onDstTimeZone_showsDstLabel() {
+ final TimeZoneInfo tzi = dummyTimeZoneInfo(TimeZone.getTimeZone("America/Los_Angeles"));
+ mTimeZoneAdapter.setTimeZoneInfos(Collections.singletonList(tzi));
+
+ final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
+
+ final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
+ mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
+ assertThat(viewHolder.mDstView.getVisibility()).isEqualTo(View.VISIBLE);
+ }
+
+ @Test
+ public void bindViewHolder_onNonDstTimeZone_hidesDstLabel() {
+ final TimeZoneInfo tzi = dummyTimeZoneInfo(TimeZone.getTimeZone("Etc/UTC"));
+ mTimeZoneAdapter.setTimeZoneInfos(Collections.singletonList(tzi));
+
+ final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
+
+ final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
+ mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
+ assertThat(viewHolder.mDstView.getVisibility()).isEqualTo(View.GONE);
+ }
+
+ // Pick an arbitrary time zone that's not the current default.
+ private static TimeZone getNonDefaultTimeZone() {
+ final String[] availableIDs = TimeZone.getAvailableIDs();
+ int index = 0;
+ if (TextUtils.equals(availableIDs[index], TimeZone.getDefault().getID())) {
+ index++;
+ }
+ return TimeZone.getTimeZone(availableIDs[index]);
+ }
+
+ private TimeZoneInfo dummyTimeZoneInfo(TimeZone timeZone) {
+ return new TimeZoneInfo.Builder(timeZone).setGmtOffset("GMT+0").setItemId(1).build();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
index 66ccc6e..ab32fa2 100644
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
@@ -31,11 +31,11 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
index 582400d..15df916 100644
--- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
@@ -27,6 +27,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.bluetooth.BluetoothA2dp;
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
@@ -60,6 +61,7 @@
@Mock
private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private Context mContext;
private AbstractBluetoothA2dpPreferenceController mController;
@@ -68,11 +70,12 @@
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = spy(new AbstractBluetoothA2dpPreferenceControllerImpl(mContext, mLifecycle,
mBluetoothA2dpConfigStore));
- doReturn(mBluetoothCodecConfig).when(mController).getCodecConfig();
- doNothing().when(mController).setCodecConfigPreference(any());
+ doReturn(mBluetoothCodecConfig).when(mController).getCodecConfig(null);
+ doNothing().when(mController).setCodecConfigPreference(any(), any());
when(mBluetoothA2dpConfigStore.createCodecConfig()).thenReturn(mBluetoothCodecConfig);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
@@ -84,7 +87,7 @@
mController.onPreferenceChange(mPreference, "" /* new value */);
- verify(mController).setCodecConfigPreference(any());
+ verify(mController).setCodecConfigPreference(any(), any());
}
@Test
@@ -93,7 +96,7 @@
mController.onPreferenceChange(mPreference, "" /* new value */);
- verify(mController, never()).setCodecConfigPreference(any());
+ verify(mController, never()).setCodecConfigPreference(any(), any());
}
@Test
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java
index fe0a41a..7074c58 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java
@@ -22,6 +22,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
import android.support.v7.preference.ListPreference;
@@ -61,13 +62,15 @@
private String[] mListValues;
private Context mContext;
private BluetoothAudioBitsPerSamplePreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = spy(new BluetoothAudioBitsPerSamplePreferenceController(mContext,
mLifecycle, mBluetoothA2dpConfigStore));
mListValues = mController.getListValues();
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java
index c4dcc19..fd7b096 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java
@@ -22,6 +22,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
import android.support.v7.preference.ListPreference;
@@ -60,13 +61,15 @@
private String[] mListValues;
private Context mContext;
private BluetoothAudioChannelModePreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = spy(new BluetoothAudioChannelModePreferenceController(mContext,
mLifecycle, mBluetoothA2dpConfigStore));
mListValues = mController.getListValues();
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java
index 29d8047..43bf3ea 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java
@@ -22,6 +22,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
import android.support.v7.preference.ListPreference;
@@ -65,13 +66,15 @@
private String[] mListValues;
private Context mContext;
private BluetoothAudioCodecPreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = spy(new BluetoothAudioCodecPreferenceController(mContext, mLifecycle,
mBluetoothA2dpConfigStore));
mListValues = mController.getListValues();
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java
index e76f1d0..1aff160 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java
@@ -22,6 +22,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
import android.support.v7.preference.ListPreference;
@@ -60,13 +61,15 @@
private String[] mListValues;
private Context mContext;
private BluetoothAudioQualityPreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = spy(new BluetoothAudioQualityPreferenceController(mContext,
mLifecycle, mBluetoothA2dpConfigStore));
mListValues = mController.getListValues();
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
index 4c113b1..3eab359 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
@@ -22,6 +22,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
import android.support.v7.preference.ListPreference;
@@ -60,6 +61,7 @@
* 4: 96.0 kHz
*/
private String[] mListValues;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private Context mContext;
private BluetoothAudioSampleRatePreferenceController mController;
@@ -68,7 +70,8 @@
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = spy(new BluetoothAudioSampleRatePreferenceController(mContext, mLifecycle,
mBluetoothA2dpConfigStore));
mListValues = mController.getListValues();
diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
index 1443d16..7c8f318 100644
--- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
@@ -96,11 +96,11 @@
}
@Test
- public void isAvailable_withUserBuild_shouldReturnFalse() {
+ public void isAvailable_withUserBuild_shouldReturnTrue() {
SettingsShadowSystemProperties.set(
CameraLaserSensorPreferenceController.BUILD_TYPE, USER_BUILD);
- assertThat(mController.isAvailable()).isFalse();
+ assertThat(mController.isAvailable()).isTrue();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
index bfe30fb..a5dfa56 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
@@ -23,6 +23,7 @@
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import com.android.settings.TestConfig;
@@ -53,6 +54,7 @@
@Mock
private DevelopmentSettingsDashboardFragment mSettings;
private Context mContext;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private SwitchBar mSwitchBar;
private DevelopmentSwitchBarController mController;
@@ -61,7 +63,8 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mSwitchBar = new SwitchBar(mContext);
when(mSettings.getContext()).thenReturn(mContext);
}
diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
new file mode 100644
index 0000000..a6af6d6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.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.development;
+
+import static com.android.settings.development.EmulateDisplayCutoutPreferenceController
+ .EMULATION_OVERLAY_PREFIX;
+
+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.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.om.IOverlayManager;
+import android.content.om.OverlayInfo;
+import android.content.pm.PackageManager;
+import android.support.v7.preference.ListPreference;
+
+import com.android.settings.TestConfig;
+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.annotation.Config;
+
+import java.util.Arrays;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class EmulateDisplayCutoutPreferenceControllerTest {
+
+ static final OverlayInfo ONE_DISABLED =
+ new FakeOverlay(EMULATION_OVERLAY_PREFIX + ".one", false);
+ static final OverlayInfo ONE_ENABLED =
+ new FakeOverlay(EMULATION_OVERLAY_PREFIX + ".one", true);
+ static final OverlayInfo TWO_DISABLED =
+ new FakeOverlay(EMULATION_OVERLAY_PREFIX + ".two", false);
+ static final OverlayInfo TWO_ENABLED =
+ new FakeOverlay(EMULATION_OVERLAY_PREFIX + ".two", true);
+
+ @Mock Context mContext;
+ @Mock IOverlayManager mOverlayManager;
+ @Mock PackageManager mPackageManager;
+ @Mock ListPreference mPreference;
+ EmulateDisplayCutoutPreferenceController mController;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mockCurrentOverlays();
+ when(mPackageManager.getApplicationInfo(any(), anyInt())).thenThrow(
+ PackageManager.NameNotFoundException.class);
+ mController = createController();
+ mController.setPreference(mPreference);
+ }
+
+ Object mockCurrentOverlays(OverlayInfo... overlays) {
+ return when(mOverlayManager.getOverlayInfosForTarget(eq("android"), anyInt()))
+ .thenReturn(Arrays.<OverlayInfo>asList(overlays));
+ }
+
+ @Test
+ public void isAvailable_true() throws Exception {
+ mockCurrentOverlays(ONE_DISABLED, TWO_DISABLED);
+
+ assertThat(createController().isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_false() throws Exception {
+ mockCurrentOverlays();
+
+ assertThat(createController().isAvailable()).isFalse();
+ }
+
+ @Test
+ public void onPreferenceChange_enable() throws Exception {
+ mockCurrentOverlays(ONE_DISABLED, TWO_DISABLED);
+
+ mController.onPreferenceChange(null, TWO_DISABLED.packageName);
+
+ verify(mOverlayManager).setEnabled(eq(TWO_DISABLED.packageName), eq(true), anyInt());
+ }
+
+ @Test
+ public void onPreferenceChange_disable() throws Exception {
+ mockCurrentOverlays(ONE_DISABLED, TWO_ENABLED);
+
+ mController.onPreferenceChange(null, "");
+
+ verify(mOverlayManager).setEnabled(eq(TWO_ENABLED.packageName), eq(false), anyInt());
+ }
+
+ @Test
+ public void updateState_enabled() throws Exception {
+ mockCurrentOverlays(ONE_DISABLED, TWO_ENABLED);
+
+ mController.updateState(null);
+
+ verify(mPreference).setValueIndex(2);
+ }
+
+ @Test
+ public void updateState_disabled() throws Exception {
+ mockCurrentOverlays(ONE_DISABLED, TWO_DISABLED);
+
+ mController.updateState(null);
+
+ verify(mPreference).setValueIndex(0);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchEnabled() throws Exception {
+ mockCurrentOverlays();
+
+ mController.onDeveloperOptionsSwitchEnabled();
+
+ verify(mPreference).setEnabled(true);
+ verify(mOverlayManager, never()).setEnabled(any(), eq(true), anyInt());
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled() throws Exception {
+ mockCurrentOverlays(ONE_ENABLED, TWO_DISABLED);
+
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ verify(mPreference).setEnabled(false);
+ verify(mOverlayManager).setEnabled(eq(ONE_ENABLED.packageName), eq(false), anyInt());
+ }
+
+ private EmulateDisplayCutoutPreferenceController createController() {
+ return new EmulateDisplayCutoutPreferenceController(mContext, mPackageManager,
+ mOverlayManager);
+ }
+
+ private static class FakeOverlay extends OverlayInfo {
+ private final boolean mEnabled;
+
+ public FakeOverlay(String pkg, boolean enabled) {
+ super(pkg, "android", "/", 0, 0);
+ mEnabled = enabled;
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return mEnabled;
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
index 09e48d3..8522b99 100644
--- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
@@ -37,6 +37,7 @@
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowParcel;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
index 1dc1255..57978a6 100644
--- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
@@ -19,6 +19,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.os.SystemProperties;
import android.support.v7.preference.ListPreference;
@@ -53,13 +54,15 @@
private Context mContext;
private LogPersistPreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = new LogPersistPreferenceController(mContext, mFragment, mLifecycle);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
SystemProperties.set("ro.debuggable", "1");
diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java
index fac74ac..8a7198d 100644
--- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.content.res.Resources;
import android.support.v7.preference.PreferenceScreen;
@@ -55,13 +56,15 @@
@Mock
private Resources mResources;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private PictureColorModePreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = new PictureColorModePreferenceController(mContext, mLifecycle);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
mPreference);
diff --git a/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java
index 6b55984..8719bb4 100644
--- a/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java
@@ -33,6 +33,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.usb.UsbManager;
@@ -70,6 +71,7 @@
private PackageManager mPackageManager;
private Context mContext;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private SelectUsbConfigPreferenceController mController;
@@ -89,7 +91,8 @@
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mContext = spy(RuntimeEnvironment.application);
doReturn(mUsbManager).when(mContext).getSystemService(Context.USB_SERVICE);
doReturn(mPackageManager).when(mContext).getPackageManager();
diff --git a/tests/robotests/src/com/android/settings/development/SetGpuRendererPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SetGpuRendererPreferenceControllerTest.java
deleted file mode 100644
index 7b3097b..0000000
--- a/tests/robotests/src/com/android/settings/development/SetGpuRendererPreferenceControllerTest.java
+++ /dev/null
@@ -1,143 +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.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 android.support.v7.preference.ListPreference;
-import android.support.v7.preference.PreferenceScreen;
-import android.view.ThreadedRenderer;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-
-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;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
-public class SetGpuRendererPreferenceControllerTest {
-
- @Mock
- private ListPreference mPreference;
- @Mock
- private PreferenceScreen mScreen;
-
- /**
- * 0: OpenGl (Default)
- * 1: OpenGl (Skia)
- */
- private String[] mListValues;
- private String[] mListSummaries;
- private Context mContext;
- private SetGpuRendererPreferenceController mController;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mListValues = mContext.getResources().getStringArray(R.array.debug_hw_renderer_values);
- mListSummaries = mContext.getResources().getStringArray(R.array.debug_hw_renderer_entries);
- mController = new SetGpuRendererPreferenceController(mContext);
- when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
- mController.displayPreference(mScreen);
- }
-
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
- }
-
- @Test
- public void onPreferenceChange_noValueSet_shouldSetEmptyString() {
- mController.onPreferenceChange(mPreference, null /* new value */);
-
- String mode = SystemProperties.get(
- ThreadedRenderer.DEBUG_RENDERER_PROPERTY);
- assertThat(mode).isEqualTo("");
- }
-
- @Test
- public void onPreferenceChange_option1Selected_shouldSetOption1() {
- mController.onPreferenceChange(mPreference, mListValues[1]);
-
- String mode = SystemProperties.get(
- ThreadedRenderer.DEBUG_RENDERER_PROPERTY);
- assertThat(mode).isEqualTo(mListValues[1]);
- }
-
- @Test
- public void updateState_option1Set_shouldUpdatePreferenceToOption1() {
- SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY,
- mListValues[1]);
-
- mController.updateState(mPreference);
-
- verify(mPreference).setValue(mListValues[1]);
- verify(mPreference).setSummary(mListSummaries[1]);
- }
-
- @Test
- public void updateState_option0Set_shouldUpdatePreferenceToOption0() {
- SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY,
- mListValues[0]);
-
- mController.updateState(mPreference);
-
- verify(mPreference).setValue(mListValues[0]);
- verify(mPreference).setSummary(mListSummaries[0]);
- }
-
- @Test
- public void updateState_noOptionSet_shouldDefaultToOption0() {
- SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY, null);
-
- mController.updateState(mPreference);
-
- verify(mPreference).setValue(mListValues[0]);
- verify(mPreference).setSummary(mListSummaries[0]);
- }
-
- @Test
- public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
- mController.onDeveloperOptionsSwitchDisabled();
-
- verify(mPreference).setEnabled(false);
- }
-
- @Test
- public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
- mController.onDeveloperOptionsSwitchEnabled();
-
- verify(mPreference).setEnabled(true);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/development/ShadowParcel.java b/tests/robotests/src/com/android/settings/development/ShadowParcel.java
deleted file mode 100644
index 965c959..0000000
--- a/tests/robotests/src/com/android/settings/development/ShadowParcel.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.android.settings.development;
-
-import android.os.Parcel;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-/**
- * This class provides helpers to test logic that reads from parcels.
- */
-@Implements(Parcel.class)
-public class ShadowParcel {
-
- static int sReadIntResult;
-
- @Implementation
- public int readInt() {
- return sReadIntResult;
- }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
new file mode 100644
index 0000000..c691b55
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ShowFirstCrashDialogPreferenceController
+ .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.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ShowFirstCrashDialogPreferenceControllerTest {
+
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+
+ private Context mContext;
+ private SwitchPreference mPreference;
+ private ShowFirstCrashDialogPreferenceController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mPreference = new SwitchPreference(mContext);
+ mController = new ShowFirstCrashDialogPreferenceController(mContext);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+ mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void onPreferenceChange_settingEnabled_showFirstCrashDialogShouldBeOn() {
+ mController.onPreferenceChange(mPreference, true /* new value */);
+
+ final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, -1 /* default */);
+
+ assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+ }
+
+ @Test
+ public void onPreferenceChange_settingDisabled_showFirstCrashDialogShouldBeOff() {
+ mController.onPreferenceChange(mPreference, false /* new value */);
+
+ final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, -1 /* default */);
+
+ assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+ }
+
+ @Test
+ public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, SETTING_VALUE_OFF);
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void updateState_settingEnabled_preferenceShouldBeChecked() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, SETTING_VALUE_ON);
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, -1 /* default */);
+
+ assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+ assertThat(mPreference.isChecked()).isFalse();
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+ mController.onDeveloperOptionsSwitchEnabled();
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void onShowFirstCrashDialogGlobalOff_shouldEnablePreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.SHOW_FIRST_CRASH_DIALOG, SETTING_VALUE_OFF);
+
+ mController.displayPreference(mPreferenceScreen);
+
+ assertThat(mController.isAvailable()).isTrue();
+ assertThat(mPreference.isVisible()).isTrue();
+ }
+
+ @Test
+ public void onShowFirstCrashDialogGlobalOn_shouldDisablePreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.SHOW_FIRST_CRASH_DIALOG, SETTING_VALUE_ON);
+
+ mController.displayPreference(mPreferenceScreen);
+
+ assertThat(mController.isAvailable()).isFalse();
+ assertThat(mPreference.isVisible()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
index a5cfa22..32768b6 100644
--- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
@@ -37,6 +37,7 @@
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowParcel;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java
deleted file mode 100644
index ebda837..0000000
--- a/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java
+++ /dev/null
@@ -1,112 +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.development;
-
-import static com.android.settings.development.WifiAggressiveHandoverPreferenceController
- .SETTING_VALUE_OFF;
-import static com.android.settings.development.WifiAggressiveHandoverPreferenceController
- .SETTING_VALUE_ON;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.wifi.WifiManager;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.TestConfig;
-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.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiAggressiveHandoverPreferenceControllerTest {
-
- @Mock
- private Context mContext;
- @Mock
- private WifiManager mWifiManager;
- @Mock
- private SwitchPreference mPreference;
- @Mock
- private PreferenceScreen mPreferenceScreen;
-
- private WifiAggressiveHandoverPreferenceController mController;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
- mController = new WifiAggressiveHandoverPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
- mController.displayPreference(mPreferenceScreen);
- }
-
- @Test
- public void onPreferenceChange_settingEnabled_shouldEnableAggressiveHandover() {
- mController.onPreferenceChange(mPreference, true /* new value */);
-
- verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_ON);
- }
-
- @Test
- public void onPreferenceChange_settingDisabled_shouldDisableAggressiveHandover() {
- mController.onPreferenceChange(mPreference, false /* new value */);
-
- verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_OFF);
- }
-
- @Test
- public void updateState_settingEnabled_shouldEnablePreference() {
- when(mWifiManager.getAggressiveHandover()).thenReturn(1);
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(true);
- }
-
- @Test
- public void updateState_settingDisabled_shouldDisablePreference() {
- when(mWifiManager.getAggressiveHandover()).thenReturn(0);
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(false);
- }
-
- @Test
- public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
- mController.onDeveloperOptionsSwitchEnabled();
-
- verify(mPreference).setEnabled(true);
- }
-
- @Test
- public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
- mController.onDeveloperOptionsSwitchDisabled();
-
- verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_OFF);
- verify(mPreference).setEnabled(false);
- verify(mPreference).setChecked(false);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java
new file mode 100644
index 0000000..9a80c5c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java
@@ -0,0 +1,133 @@
+/*
+ * 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.android.settings.development.WifiConnectedMacRandomizationPreferenceController
+ .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 android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+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.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiConnectedMacRandomizationPreferenceControllerTest {
+
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+
+ private Context mContext;
+ private SwitchPreference mPreference;
+ private WifiConnectedMacRandomizationPreferenceController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = new WifiConnectedMacRandomizationPreferenceController(mContext);
+ mPreference = new SwitchPreference(mContext);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+ mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void isAvailable_trueSupportFlag_shouldReturnTrue() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_falseSupportFlag_shouldReturnFalse() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void onPreferenceChange_settingEnabled_shouldEnableConnectedMacRandomization() {
+ mController.onPreferenceChange(mPreference, true /* new value */);
+
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, -1 /* default */);
+
+ assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+ }
+
+ @Test
+ public void onPreferenceChange_settingDisabled_shouldDisableConnectedMacRandomization() {
+ mController.onPreferenceChange(mPreference, false /* new value */);
+
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, -1 /* default */);
+
+ assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+ }
+
+ @Test
+ public void updateState_settingEnabled_shouldEnablePreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, SETTING_VALUE_ON);
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void updateState_settingDisabled_shouldDisablePreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, SETTING_VALUE_OFF);
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+ mController.onDeveloperOptionsSwitchEnabled();
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, -1 /* default */);
+
+ assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+ assertThat(mPreference.isChecked()).isFalse();
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WifiRoamScansPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiRoamScansPreferenceControllerTest.java
deleted file mode 100644
index 60e5e49..0000000
--- a/tests/robotests/src/com/android/settings/development/WifiRoamScansPreferenceControllerTest.java
+++ /dev/null
@@ -1,110 +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.development;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.wifi.WifiManager;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.TestConfig;
-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.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiRoamScansPreferenceControllerTest {
-
- @Mock
- private Context mContext;
- @Mock
- private WifiManager mWifiManager;
- @Mock
- private SwitchPreference mPreference;
- @Mock
- private PreferenceScreen mPreferenceScreen;
-
- private WifiRoamScansPreferenceController mController;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
- mController = new WifiRoamScansPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
- mController.displayPreference(mPreferenceScreen);
- }
-
- @Test
- public void onPreferenceChange_shouldEnableRoamScanning() {
- mController.onPreferenceChange(mPreference, true /* new value */);
-
- verify(mWifiManager).setAllowScansWithTraffic(
- WifiRoamScansPreferenceController.SETTING_VALUE_ON);
- }
-
- @Test
- public void onPreferenceChange_shouldDisableRoamScanning() {
- mController.onPreferenceChange(mPreference, false /* new value */);
-
- verify(mWifiManager).setAllowScansWithTraffic(
- WifiRoamScansPreferenceController.SETTING_VALUE_OFF);
- }
-
- @Test
- public void updateState_shouldEnablePreference() {
- when(mWifiManager.getAllowScansWithTraffic()).thenReturn(1);
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(true);
- }
-
- @Test
- public void updateState_shouldDisablePreference() {
- when(mWifiManager.getAllowScansWithTraffic()).thenReturn(0);
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(false);
- }
-
- @Test
- public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
- mController.onDeveloperOptionsSwitchEnabled();
-
- verify(mPreference).setEnabled(true);
- }
-
- @Test
- public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
- mController.onDeveloperOptionsSwitchDisabled();
-
- verify(mWifiManager).setAllowScansWithTraffic(
- WifiRoamScansPreferenceController.SETTING_VALUE_OFF);
- verify(mPreference).setEnabled(false);
- verify(mPreference).setChecked(false);
- }
-}
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 f831506..8c38d22 100644
--- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
@@ -25,6 +25,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.support.v7.preference.PreferenceScreen;
@@ -47,6 +48,7 @@
@Mock
private PreferenceScreen mScreen;
private Context mContext;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private FeatureFlagsPreferenceController mController;
@@ -54,7 +56,8 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = new FeatureFlagsPreferenceController(mContext, mLifecycle);
when(mScreen.getContext()).thenReturn(mContext);
mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/development/qstile/LayerTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/LayerTraceTest.java
new file mode 100644
index 0000000..0e42759
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/qstile/LayerTraceTest.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.development.qstile;
+
+import static com.android.settings.development.qstile.DevelopmentTiles.LayerTrace
+ .SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE;
+import static com.android.settings.development.qstile.DevelopmentTiles.LayerTrace
+ .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;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.widget.Toast;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowParcel;
+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.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LayerTraceTest {
+ @Mock
+ private IBinder mSurfaceFlinger;
+ @Mock
+ private Toast mToast;
+
+ private DevelopmentTiles.LayerTrace mLayerTraceTile;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mLayerTraceTile = spy(new DevelopmentTiles.LayerTrace());
+ ReflectionHelpers.setField(mLayerTraceTile, "mSurfaceFlinger", mSurfaceFlinger);
+ ReflectionHelpers.setField(mLayerTraceTile, "mToast", mToast);
+ }
+
+ @After
+ public void after() {
+ verifyNoMoreInteractions(mSurfaceFlinger);
+ verifyNoMoreInteractions(mToast);
+ }
+
+ @Test
+ @Config(shadows = {ShadowParcel.class})
+ public void sfReturnsTraceEnabled_shouldReturnEnabled() throws RemoteException {
+ ShadowParcel.sReadBoolResult = true;
+ assertThat(mLayerTraceTile.isEnabled()).isTrue();
+ verify(mSurfaceFlinger)
+ .transact(eq(SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE), any(), any(),
+ eq(0 /* flags */));
+ }
+
+ @Test
+ @Config(shadows = {ShadowParcel.class})
+ public void sfReturnsTraceDisabled_shouldReturnDisabled() throws RemoteException {
+ ShadowParcel.sReadBoolResult = false;
+ assertThat(mLayerTraceTile.isEnabled()).isFalse();
+ verify(mSurfaceFlinger)
+ .transact(eq(SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE), any(), any(),
+ eq(0 /* flags */));
+ }
+
+ @Test
+ public void sfUnavailable_shouldReturnDisabled() throws RemoteException {
+ ReflectionHelpers.setField(mLayerTraceTile, "mSurfaceFlinger", null);
+ assertThat(mLayerTraceTile.isEnabled()).isFalse();
+ }
+
+ @Test
+ @Config(shadows = {ShadowParcel.class})
+ public void setIsEnableTrue_shouldEnableLayerTrace() throws RemoteException {
+ mLayerTraceTile.setIsEnabled(true);
+ assertThat(ShadowParcel.sWriteIntResult).isEqualTo(1);
+ verify(mSurfaceFlinger)
+ .transact(eq(SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE), any(), isNull(),
+ eq(0 /* flags */));
+ }
+
+ @Test
+ @Config(shadows = {ShadowParcel.class})
+ public void setIsEnableFalse_shouldDisableLayerTraceAndShowToast() throws RemoteException {
+ mLayerTraceTile.setIsEnabled(false);
+ assertThat(ShadowParcel.sWriteIntResult).isEqualTo(0);
+ verify(mSurfaceFlinger)
+ .transact(eq(SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE), any(), isNull(),
+ eq(0 /* flags */));
+ verify(mToast).show();
+ }
+
+ @Test
+ public void setIsEnableAndSfUnavailable_shouldDoNothing() throws RemoteException {
+ ReflectionHelpers.setField(mLayerTraceTile, "mSurfaceFlinger", null);
+ mLayerTraceTile.setIsEnabled(true);
+ mLayerTraceTile.setIsEnabled(false);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/qstile/WindowTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/WindowTraceTest.java
new file mode 100644
index 0000000..d8a8084
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/qstile/WindowTraceTest.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.development.qstile;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import android.os.RemoteException;
+import android.widget.Toast;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowParcel;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.IWindowManagerWrapper;
+
+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.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WindowTraceTest {
+ @Mock
+ private IWindowManagerWrapper mWindowManager;
+ @Mock
+ private Toast mToast;
+
+ private DevelopmentTiles.WindowTrace mWindowTrace;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mWindowTrace = spy(new DevelopmentTiles.WindowTrace());
+ ReflectionHelpers.setField(mWindowTrace, "mWindowManager", mWindowManager);
+ ReflectionHelpers.setField(mWindowTrace, "mToast", mToast);
+ }
+
+ @After
+ public void teardown() {
+ verifyNoMoreInteractions(mToast);
+ }
+
+ @Test
+ public void wmReturnsTraceEnabled_shouldReturnEnabled() throws RemoteException {
+ doReturn(true).when(mWindowManager).isWindowTraceEnabled();
+ assertThat(mWindowTrace.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void wmReturnsTraceDisabled_shouldReturnDisabled() throws RemoteException {
+ doReturn(false).when(mWindowManager).isWindowTraceEnabled();
+ assertThat(mWindowTrace.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void wmThrowsRemoteException_shouldReturnDisabled() throws RemoteException {
+ doThrow(new RemoteException("Unknown"))
+ .when(mWindowManager).isWindowTraceEnabled();
+ assertThat(mWindowTrace.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void setIsEnableTrue_shouldEnableWindowTrace() throws RemoteException {
+ mWindowTrace.setIsEnabled(true);
+ verify(mWindowManager).startWindowTrace();
+ verifyNoMoreInteractions(mWindowManager);
+ }
+
+ @Test
+ @Config(shadows = {ShadowParcel.class})
+ public void setIsEnableFalse_shouldDisableWindowTraceAndShowToast() throws RemoteException {
+ mWindowTrace.setIsEnabled(false);
+ verify(mWindowManager).stopWindowTrace();
+ verify(mToast).show();
+ verifyNoMoreInteractions(mWindowManager);
+ }
+
+ @Test
+ public void setIsEnableAndWmThrowsRemoteException_shouldDoNothing() throws RemoteException {
+ doThrow(new RemoteException("Unknown")).when(mWindowManager).isWindowTraceEnabled();
+ mWindowTrace.setIsEnabled(true);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceControllerTest.java
new file mode 100644
index 0000000..e5708ba
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceControllerTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AdditionalSystemUpdatePreferenceControllerTest {
+
+ private Context mContext;
+ private AdditionalSystemUpdatePreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = RuntimeEnvironment.application;
+ mController = new AdditionalSystemUpdatePreferenceController(mContext);
+ }
+
+ @Test
+ public void displayPrefs_ifNotAvailable_shouldNotDisplay() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void displayPrefs_ifAvailable_shouldDisplay() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java
new file mode 100644
index 0000000..521800b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.any;
+import static org.mockito.Mockito.when;
+
+import android.accounts.Account;
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+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.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BrandedAccountPreferenceControllerTest {
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private Context mContext;
+ private BrandedAccountPreferenceController mController;
+ private FakeFeatureFactory fakeFeatureFactory;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ fakeFeatureFactory = FakeFeatureFactory.setupForTest();
+ mController = new BrandedAccountPreferenceController(mContext);
+ }
+
+ @Test
+ public void isAvailable_defaultOff() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void isAvailable_onWhenAccountIsAvailable() {
+ when(fakeFeatureFactory.mAccountFeatureProvider.getAccounts(any(Context.class))).thenReturn(
+ new Account[]
+ {new Account("fake@account.foo", "fake.reallyfake")});
+ mController = new BrandedAccountPreferenceController(mContext);
+ assertThat(mController.isAvailable()).isTrue();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
index ab68c17..ee5d5d0 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -28,6 +28,7 @@
import android.app.Activity;
import android.app.Fragment;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.os.Build;
import android.os.UserManager;
@@ -74,6 +75,7 @@
@Mock
private UserManager mUserManager;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private FakeFeatureFactory mFactory;
private Preference mPreference;
@@ -83,7 +85,8 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mFactory = FakeFeatureFactory.setupForTest();
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
mController = new BuildNumberPreferenceController(
mContext, mActivity, mFragment, mLifecycle);
diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java
similarity index 89%
rename from tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
rename to tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java
index 09ff9db..7555d8e 100644
--- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 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,11 +14,11 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.deviceinfo;
-import static com.android.settings.DeviceInfoSettings.NON_SIM_PREFERENCES_COUNT;
-import static com.android.settings.DeviceInfoSettings.SIM_PREFERENCES_COUNT;
import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
+import static com.android.settings.deviceinfo.DeviceInfoSettings.NON_SIM_PREFERENCES_COUNT;
+import static com.android.settings.deviceinfo.DeviceInfoSettings.SIM_PREFERENCES_COUNT;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
@@ -33,6 +33,8 @@
import android.support.v7.preference.PreferenceScreen;
import android.telephony.TelephonyManager;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -51,6 +53,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
import java.util.List;
@@ -82,12 +85,14 @@
mSettings = spy(new DeviceInfoSettings());
doReturn(mActivity).when(mSettings).getActivity();
+ doReturn(mContext).when(mSettings).getContext();
doReturn(mContext.getTheme()).when(mActivity).getTheme();
doReturn(mContext.getResources()).when(mSettings).getResources();
doNothing().when(mSettings).onCreatePreferences(any(), any());
doReturn(mScreen).when(mSettings).getPreferenceScreen();
- doReturn(mTelephonyManager).when(mSettings).getSystemService(Context.TELEPHONY_SERVICE);
+ ShadowApplication.getInstance().setSystemService(Context.TELEPHONY_SERVICE,
+ mTelephonyManager);
}
@Test
@@ -95,7 +100,7 @@
SettingsShadowSystemProperties.class
})
public void getPrefXml_shouldReturnDeviceInfoXml() {
- assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings_v2);
+ assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
new file mode 100644
index 0000000..4ff79ca
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.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.deviceinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.provider.Settings;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.ValidatedEditTextPreference;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DeviceNamePreferenceControllerTest {
+ private static final String TESTING_STRING = "Testing";
+
+ @Mock
+ private LocalBluetoothAdapter mBluetoothAdapter;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private LocalBluetoothManager mBluetoothManager;
+ @Mock
+ private WifiManager mWifiManager;
+ @Mock
+ private PreferenceScreen mScreen;
+ private ValidatedEditTextPreference mPreference;
+ private DeviceNamePreferenceController mController;
+ private Context mContext;
+
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ ShadowApplication shadowApplication = ShadowApplication.getInstance();
+ shadowApplication.setSystemService(Context.WIFI_SERVICE, mWifiManager);
+ mContext = shadowApplication.getApplicationContext();
+ mPreference = new ValidatedEditTextPreference(mContext);
+ when(mBluetoothManager.getBluetoothAdapter()).thenReturn(mBluetoothAdapter);
+ when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+ final WifiConfiguration configuration = new WifiConfiguration();
+ configuration.SSID = "test-ap";
+ when(mWifiManager.getWifiApConfiguration()).thenReturn(configuration);
+
+ mController = new DeviceNamePreferenceController(mContext);
+ mController.setLocalBluetoothManager(mBluetoothManager);
+ }
+
+ @Test
+ public void constructor_defaultDeviceNameIsModelName() {
+ assertThat(mController.getSummary()).isEqualTo(Build.MODEL);
+ }
+
+ @Test
+ public void constructor_deviceNameLoadedIfSet() {
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEVICE_NAME,
+ "Test");
+ mController = new DeviceNamePreferenceController(mContext);
+ mController.setLocalBluetoothManager(mBluetoothManager);
+ assertThat(mController.getSummary()).isEqualTo("Test");
+ }
+
+ @Test
+ public void isTextValid_nameUnder33CharactersIsValid() {
+ assertThat(mController.isTextValid("12345678901234567890123456789012")).isTrue();
+ }
+
+ @Test
+ public void isTextValid_nameTooLongIsInvalid() {
+ assertThat(mController.isTextValid("123456789012345678901234567890123")).isFalse();
+ }
+
+ @Test
+ public void setDeviceName_preferenceUpdatedWhenDeviceNameUpdated() {
+ mController.onPreferenceChange(mPreference, TESTING_STRING);
+
+ assertThat(mPreference.getSummary()).isEqualTo(TESTING_STRING);
+ }
+
+ @Test
+ public void setDeviceName_bluetoothNameUpdatedWhenDeviceNameUpdated() {
+ mController.onPreferenceChange(mPreference, TESTING_STRING);
+
+ verify(mBluetoothAdapter).setName(eq(TESTING_STRING));
+ }
+
+ @Test
+ public void setDeviceName_wifiTetherNameUpdatedWhenDeviceNameUpdated() {
+ mController.onPreferenceChange(mPreference, TESTING_STRING);
+
+ ArgumentCaptor<WifiConfiguration> captor = ArgumentCaptor.forClass(WifiConfiguration.class);
+ verify(mWifiManager).setWifiApConfiguration(captor.capture());
+ assertThat(captor.getValue().SSID).isEqualTo(TESTING_STRING);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java
new file mode 100644
index 0000000..36f0662
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.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.support.v7.preference.PreferenceScreen;
+import android.telephony.TelephonyManager;
+
+import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
+import com.android.settings.TestConfig;
+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.SettingsShadowSystemProperties;
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+ manifest = TestConfig.MANIFEST_PATH,
+ sdk = TestConfig.SDK_VERSION,
+ shadows = {ShadowConnectivityManager.class, ShadowUserManager.class}
+)
+public class MyDeviceInfoFragmentTest {
+ @Mock
+ private Activity mActivity;
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private TelephonyManager mTelephonyManager;
+
+ private Context mContext;
+ private MyDeviceInfoFragment mSettings;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ FakeFeatureFactory.setupForTest();
+ mContext = RuntimeEnvironment.application;
+ mSettings = spy(new MyDeviceInfoFragment());
+
+ when(mSettings.getActivity()).thenReturn(mActivity);
+ when(mSettings.getContext()).thenReturn(mContext);
+ when(mActivity.getTheme()).thenReturn(mContext.getTheme());
+ when(mActivity.getResources()).thenReturn(mContext.getResources());
+ doNothing().when(mSettings).onCreatePreferences(any(), any());
+
+ doReturn(mScreen).when(mSettings).getPreferenceScreen();
+ when(mSettings.getPreferenceScreen()).thenReturn(mScreen);
+ ShadowApplication.getInstance().setSystemService(Context.TELEPHONY_SERVICE,
+ mTelephonyManager);
+ }
+
+ @Test
+ @Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class,
+ SettingsShadowSystemProperties.class})
+ public void onCreate_fromSearch_shouldNotOverrideInitialExpandedCount() {
+ final Bundle args = new Bundle();
+ args.putString(EXTRA_FRAGMENT_ARG_KEY, "search_key");
+ mSettings.setArguments(args);
+
+ mSettings.onCreate(null /* icicle */);
+
+ verify(mScreen).setInitialExpandedChildrenCount(Integer.MAX_VALUE);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
index 1fd5430..b5b84da 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
@@ -16,7 +16,9 @@
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.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -28,6 +30,7 @@
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.Before;
import org.junit.Test;
@@ -36,29 +39,32 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+ manifest = TestConfig.MANIFEST_PATH,
+ sdk = TestConfig.SDK_VERSION,
+ shadows = {
+ ShadowUserManager.class
+ })
public class SystemUpdatePreferenceControllerTest {
- @Mock(answer = RETURNS_DEEP_STUBS)
- private Context mContext;
- @Mock
- private UserManager mUserManager;
@Mock
private PreferenceScreen mScreen;
+ private Context mContext;
private SystemUpdatePreferenceController mController;
private Preference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
- when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
mController = new SystemUpdatePreferenceController(mContext);
mPreference = new Preference(RuntimeEnvironment.application);
mPreference.setKey(mController.getPreferenceKey());
@@ -66,12 +72,9 @@
}
@Test
- public void updateNonIndexable_bothAvailable_shouldNotUpdate() {
+ public void updateNonIndexable_ifAvailable_shouldNotUpdate() {
final List<String> keys = new ArrayList<>();
- when(mUserManager.isAdminUser()).thenReturn(true);
- when(mContext.getResources().getBoolean(
- R.bool.config_additional_system_update_setting_enable))
- .thenReturn(true);
+ ShadowUserManager.getShadow().setIsAdminUser(true);
mController.updateNonIndexableKeys(keys);
@@ -79,7 +82,8 @@
}
@Test
- public void updateNonIndexable_nothingAvailable_shouldUpdateWith2Prefs() {
+ public void updateNonIndexable_ifNotAvailable_shouldUpdate() {
+ ShadowUserManager.getShadow().setIsAdminUser(false);
final List<String> keys = new ArrayList<>();
mController.updateNonIndexableKeys(keys);
@@ -88,31 +92,37 @@
}
@Test
- public void displayPrefs_nothingAvailable_shouldNotDisplay() {
+ public void displayPrefs_ifVisible_butNotAdminUser_shouldNotDisplay() {
+ ShadowUserManager.getShadow().setIsAdminUser(false);
mController.displayPreference(mScreen);
assertThat(mPreference.isVisible()).isFalse();
}
@Test
- public void updateState_shouldSetToAndroidVersion() {
- mController = new SystemUpdatePreferenceController(RuntimeEnvironment.application);
+ @Config(qualifiers = "mcc999")
+ public void displayPrefs_ifAdminUser_butNotVisible_shouldNotDisplay() {
+ ShadowUserManager.getShadow().setIsAdminUser(true);
+ mController.displayPreference(mScreen);
+ assertThat(mPreference.isVisible()).isFalse();
+ }
+
+ @Test
+ public void displayPrefs_ifAvailable_shouldDisplay() {
+ ShadowUserManager.getShadow().setIsAdminUser(true);
+
+ mController.displayPreference(mScreen);
+
+ assertThat(mPreference.isVisible()).isTrue();
+ }
+
+ @Test
+ public void updateState_shouldSetToAndroidVersion() {
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
.isEqualTo(RuntimeEnvironment.application.getString(R.string.about_summary,
Build.VERSION.RELEASE));
}
-
- @Test
- public void displayPrefs_oneAvailable_shouldDisplayOne() {
- when(mContext.getResources().getBoolean(
- R.bool.config_additional_system_update_setting_enable))
- .thenReturn(true);
-
- mController.displayPreference(mScreen);
-
- assertThat(mPreference.isVisible()).isFalse();
- }
-}
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
similarity index 93%
rename from tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2Test.java
rename to tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
index 5fa8a91..b3440f4 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2Test.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
@@ -44,7 +44,7 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FirmwareVersionPreferenceControllerV2Test {
+public class FirmwareVersionPreferenceControllerTest {
@Mock
private Preference mPreference;
@@ -54,13 +54,13 @@
private Fragment mFragment;
private Context mContext;
- private FirmwareVersionPreferenceControllerV2 mController;
+ private FirmwareVersionPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController = new FirmwareVersionPreferenceControllerV2(mContext, mFragment);
+ mController = new FirmwareVersionPreferenceController(mContext, mFragment);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2Test.java
rename to tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
index 186d9b7..610ccfd 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2Test.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
@@ -50,7 +50,7 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ImeiInfoPreferenceControllerV2Test {
+public class ImeiInfoPreferenceControllerTest {
@Mock
private Preference mPreference;
@@ -66,14 +66,14 @@
private Fragment mFragment;
private Context mContext;
- private ImeiInfoPreferenceControllerV2 mController;
+ private ImeiInfoPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
- mController = spy(new ImeiInfoPreferenceControllerV2(mContext, mFragment));
+ mController = spy(new ImeiInfoPreferenceController(mContext, mFragment));
doReturn(true).when(mController).isAvailable();
when(mScreen.getContext()).thenReturn(mContext);
doReturn(mSecondSimPreference).when(mController).createNewPreference(mContext);
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 2f896ac..b10de63 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -18,6 +18,7 @@
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
.CELLULAR_NETWORK_TYPE_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.EID_INFO_VALUE_ID;
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
.ICCID_INFO_LABEL_ID;
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
@@ -47,6 +48,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
@@ -59,6 +61,7 @@
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.EuiccManagerWrapper;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
@@ -90,10 +93,12 @@
private CarrierConfigManager mCarrierConfigManager;
@Mock
private PersistableBundle mPersistableBundle;
-
+ @Mock
+ private EuiccManagerWrapper mEuiccManager;
private SimStatusDialogController mController;
private Context mContext;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
@@ -101,18 +106,22 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
when(mDialog.getContext()).thenReturn(mContext);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = spy(
new SimStatusDialogController(mDialog, mLifecycle, 0 /* phone id */));
+ mEuiccManager = spy(new EuiccManagerWrapper(mContext));
doReturn(mServiceState).when(mController).getCurrentServiceState();
doReturn(0).when(mController).getDbm(any());
doReturn(0).when(mController).getAsuLevel(any());
doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();
doReturn("").when(mController).getPhoneNumber();
doReturn(mSignalStrength).when(mController).getSignalStrength();
+ doReturn("").when(mEuiccManager).getEid();
ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
ReflectionHelpers.setField(mController, "mCarrierConfigManager", mCarrierConfigManager);
ReflectionHelpers.setField(mController, "mSubscriptionInfo", mSubscriptionInfo);
+ ReflectionHelpers.setField(mController, "mEuiccManager", mEuiccManager);
when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(mPersistableBundle);
}
@@ -270,4 +279,14 @@
verify(mDialog).setText(ICCID_INFO_VALUE_ID, iccid);
}
+
+ @Test
+ public void initialize_showEid_shouldSetEidToSetting() {
+ final String eid = "12351351231241";
+ doReturn(eid).when(mEuiccManager).getEid();
+
+ mController.initialize();
+
+ verify(mDialog).setText(EID_INFO_VALUE_ID, eid);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2Test.java
rename to tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
index 8e9cb0b..1419304 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2Test.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
@@ -47,7 +47,7 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SimStatusPreferenceControllerV2Test {
+public class SimStatusPreferenceControllerTest {
@Mock
private Preference mPreference;
@@ -63,14 +63,14 @@
private Fragment mFragment;
private Context mContext;
- private SimStatusPreferenceControllerV2 mController;
+ private SimStatusPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
- mController = spy(new SimStatusPreferenceControllerV2(mContext, mFragment));
+ mController = spy(new SimStatusPreferenceController(mContext, mFragment));
doReturn(true).when(mController).isAvailable();
when(mScreen.getContext()).thenReturn(mContext);
doReturn(mSecondSimPreference).when(mController).createNewPreference(mContext);
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 90ce395..9c56611 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
@@ -37,13 +37,13 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.os.RoSystemProperties;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.deletionhelper.ActivationWarningFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.After;
import org.junit.Before;
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 1a3139d..2da756f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -50,13 +50,13 @@
import com.android.settings.SubSettings;
import com.android.settings.TestConfig;
import com.android.settings.applications.manageapplications.ManageApplications;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.deviceinfo.PrivateVolumeSettings;
import com.android.settings.deviceinfo.StorageItemPreference;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.deviceinfo.StorageVolumeProvider;
import org.junit.After;
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 6ad37ce..e251be0 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
@@ -38,10 +38,10 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.deviceinfo.StorageVolumeProvider;
import org.junit.After;
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
index e1ce694..c003f17 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
@@ -32,11 +32,11 @@
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
index f3a1edd..affb40b 100644
--- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
@@ -21,6 +21,7 @@
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -56,6 +57,7 @@
private Context mContext;
@Mock
private PackageManager mPackageManager;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private SwitchPreference mPreference;
private ContentResolver mContentResolver;
@@ -66,7 +68,8 @@
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest();
mContentResolver = RuntimeEnvironment.application.getContentResolver();
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mPreference = new SwitchPreference(RuntimeEnvironment.application);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mContext.getContentResolver()).thenReturn(mContentResolver);
diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
index 33bc4f8..d4af8b8 100644
--- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
@@ -20,8 +20,12 @@
import static com.google.common.truth.Truth.assertThat;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -34,16 +38,20 @@
import com.android.settings.TimeoutListPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManagerWrapper;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
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 java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
@@ -93,4 +101,34 @@
mController.updateState(mPreference);
verify(mPreference).removeUnusableTimeouts(timeout, null);
}
+
+ @Test
+ public void testUpdateStateWithAdminTimeoutsAndRestriction() {
+ final int profileUserId = UserHandle.myUserId();
+ final long timeout = 100;
+ when(mUserManager.getProfiles(profileUserId)).thenReturn(Collections.emptyList());
+ ShadowDevicePolicyManagerWrapper.setMaximumTimeToLock(profileUserId, timeout);
+
+ int userId = UserHandle.myUserId();
+ List<UserManager.EnforcingUser> enforcingUsers = new ArrayList<>();
+ // Add two enforcing users so that RestrictedLockUtils.checkIfRestrictionEnforced returns
+ // non-null.
+ enforcingUsers.add(new UserManager.EnforcingUser(userId,
+ UserManager.RESTRICTION_SOURCE_DEVICE_OWNER));
+ enforcingUsers.add(new UserManager.EnforcingUser(userId,
+ UserManager.RESTRICTION_SOURCE_PROFILE_OWNER));
+ when(mUserManager.getUserRestrictionSources(
+ UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT, UserHandle.of(userId)))
+ .thenReturn(enforcingUsers);
+
+ mController.updateState(mPreference);
+
+ ArgumentCaptor<Long> longCaptor = ArgumentCaptor.forClass(Long.class);
+ ArgumentCaptor<EnforcedAdmin> adminCaptor = ArgumentCaptor.forClass(EnforcedAdmin.class);
+
+ verify(mPreference, times(2)).removeUnusableTimeouts(
+ longCaptor.capture(), adminCaptor.capture());
+ assertEquals(0, (long)longCaptor.getValue());
+ assertTrue(adminCaptor.getValue() != null);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
index 5874984..d449419 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
@@ -17,9 +17,12 @@
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 android.support.v7.preference.Preference;
import com.android.settings.R;
@@ -33,6 +36,7 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
/**
@@ -42,15 +46,17 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class ManageDeviceAdminPreferenceControllerTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ @Mock
+ private Resources mResources;
+
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
-
private ManageDeviceAdminPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new ManageDeviceAdminPreferenceController(mContext);
}
@@ -61,25 +67,32 @@
when(mFeatureFactory.enterprisePrivacyFeatureProvider
.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile()).thenReturn(0);
- when(mContext.getResources().getString(R.string.number_of_device_admins_none))
+ when (mContext.getResources()).thenReturn(mResources);
+ when(mResources.getString(R.string.number_of_device_admins_none))
.thenReturn("no apps");
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("no apps");
when(mFeatureFactory.enterprisePrivacyFeatureProvider
.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile()).thenReturn(5);
- when(mContext.getResources().getQuantityString(R.plurals.number_of_device_admins, 5, 5))
+ when(mResources.getQuantityString(R.plurals.number_of_device_admins, 5, 5))
.thenReturn("5 active apps");
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("5 active apps");
}
@Test
- public void testIsAvailable() {
+ public void isAvailable_byDefault_isTrue() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_isFalse() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void testHandlePreferenceTreeClick() {
assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
.isFalse();
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
index c590fd3..5418ead 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -36,6 +36,7 @@
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settings.testutils.shadow.ShadowVibrator;
@@ -69,12 +70,15 @@
private FingerprintEnrollEnrolling mActivity;
+ private FakeFeatureFactory mFactory;
+
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowUtils.setFingerprintManager(mFingerprintManager);
ShadowVibrator.addToServiceMap();
+ mFactory = FakeFeatureFactory.setupForTest();
mActivity = Robolectric.buildActivity(
FingerprintEnrollEnrolling.class,
new Intent()
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
index d495b74..be53aa5 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -33,6 +33,7 @@
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockSettingsHelper;
+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.ShadowEventLogWriter;
@@ -69,10 +70,13 @@
private FingerprintEnrollFindSensor mActivity;
+ private FakeFeatureFactory mFactory;
+
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowUtils.setFingerprintManager(mFingerprintManager);
+ mFactory = FakeFeatureFactory.setupForTest();
mActivity = Robolectric.buildActivity(
FingerprintEnrollFindSensor.class,
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
index 0254bcb..f52f437 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
@@ -30,6 +30,7 @@
import com.android.settings.R;
import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
@@ -63,9 +64,12 @@
private ActivityController<FingerprintSuggestionActivity> mController;
+ private FakeFeatureFactory mFactory;
+
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mFactory = FakeFeatureFactory.setupForTest();
final Intent intent = new Intent();
mController = Robolectric.buildActivity(FingerprintSuggestionActivity.class, intent);
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
index c3899e9..c786608 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
@@ -27,6 +27,7 @@
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockSettingsHelper;
+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.ShadowEventLogWriter;
@@ -61,10 +62,13 @@
private SetupFingerprintEnrollFindSensor mActivity;
+ private FakeFeatureFactory mFactory;
+
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowUtils.setFingerprintManager(mFingerprintManager);
+ mFactory = FakeFeatureFactory.setupForTest();
}
private void createActivity(Intent intent) {
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index 2d98bf4..f5b0c8a 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -35,6 +35,7 @@
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.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowFingerprintManager;
@@ -72,6 +73,7 @@
@Mock
private UserInfo mUserInfo;
+ private FakeFeatureFactory mFactory;
private ActivityController<SetupFingerprintEnrollIntroduction> mController;
@@ -83,6 +85,8 @@
.setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
ShadowFingerprintManager.addToServiceMap();
+ mFactory = FakeFeatureFactory.setupForTest();
+
final Intent intent = new Intent();
mController = Robolectric.buildActivity(SetupFingerprintEnrollIntroduction.class, intent);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
index 3d04ac5..30fdccb 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
@@ -18,6 +18,11 @@
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;
+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;
@@ -34,10 +39,12 @@
import android.os.Build;
import android.os.UserManager;
import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
import android.widget.Button;
import com.android.settings.R;
import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
@@ -87,19 +94,21 @@
private DevicePolicyManager mDevicePolicyManager;
@Mock
private DevicePolicyManagerWrapper mDevicePolicyManagerWrapper;
- @Mock
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private AdvancedPowerUsageDetail mFragment;
@Mock
private PowerWhitelistBackend mPowerWhitelistBackend;
private BackgroundActivityPreferenceController mController;
- private SwitchPreference mPreference;
+ private Preference mPreference;
private Context mShadowContext;
+ private BatteryUtils mBatteryUtils;
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mShadowContext = RuntimeEnvironment.application;
+ FakeFeatureFactory.setupForTest();
when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
@@ -115,58 +124,45 @@
mHighApplicationInfo.targetSdkVersion = Build.VERSION_CODES.O;
mLowApplicationInfo.targetSdkVersion = Build.VERSION_CODES.L;
- mPreference = new SwitchPreference(mShadowContext);
+ mBatteryUtils = spy(new BatteryUtils(mShadowContext));
+ doNothing().when(mBatteryUtils).setForceAppStandby(anyInt(), anyString(), anyInt());
+
+ mPreference = new Preference(mShadowContext);
+ mPreference.setKey(BackgroundActivityPreferenceController.KEY_BACKGROUND_ACTIVITY);
mController = spy(new BackgroundActivityPreferenceController(
mContext, mFragment, UID_LOW_SDK, LOW_SDK_PACKAGE, mPowerWhitelistBackend));
mController.mDpm = mDevicePolicyManagerWrapper;
+ mController.mBatteryUtils = mBatteryUtils;
}
@Test
- public void testOnPreferenceChange_TurnOnCheck_MethodInvoked() {
- mController.onPreferenceChange(mPreference, true);
+ public void testHandlePreferenceTreeClick_restrictApp_showDialog() {
+ doReturn(AppOpsManager.MODE_ALLOWED).when(mAppOpsManager).checkOpNoThrow(anyInt(),
+ anyInt(), anyString());
- verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_LOW_SDK,
- LOW_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
- verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
- LOW_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
+ mController.handlePreferenceTreeClick(mPreference);
- assertThat(mPreference.getSummary())
- .isEqualTo(mShadowContext.getText(R.string.background_activity_summary_on));
+ verify(mController).showDialog();
}
@Test
- public void testOnPreferenceChange_TurnOnCheckHighSDK_MethodInvoked() {
- mController = new BackgroundActivityPreferenceController(mContext, mFragment, UID_HIGH_SDK,
- HIGH_SDK_PACKAGE, mPowerWhitelistBackend);
- mController.onPreferenceChange(mPreference, true);
- verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_HIGH_SDK,
- HIGH_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
- verify(mAppOpsManager, never()).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_HIGH_SDK,
- HIGH_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
- assertThat(mPreference.getSummary())
- .isEqualTo(mShadowContext.getText(R.string.background_activity_summary_on));
+ public void testHandlePreferenceTreeClick_unRestrictApp_setModeAllowed() {
+ doReturn(AppOpsManager.MODE_IGNORED).when(mAppOpsManager).checkOpNoThrow(anyInt(),
+ anyInt(), anyString());
+
+ mController.handlePreferenceTreeClick(mPreference);
+
+ verify(mBatteryUtils).setForceAppStandby(UID_LOW_SDK, LOW_SDK_PACKAGE,
+ AppOpsManager.MODE_ALLOWED);
}
@Test
- public void testUpdateState_CheckOn_SetCheckedTrue() {
+ public void testUpdateState_noError_setEnabled() {
when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_ALLOWED);
mController.updateState(mPreference);
- assertThat(mPreference.isChecked()).isTrue();
- assertThat(mPreference.isEnabled()).isTrue();
- verify(mController).updateSummary(mPreference);
- }
-
- @Test
- public void testUpdateState_CheckOff_SetCheckedFalse() {
- when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
- LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_IGNORED);
-
- mController.updateState(mPreference);
-
- assertThat(mPreference.isChecked()).isFalse();
assertThat(mPreference.isEnabled()).isTrue();
verify(mController).updateSummary(mPreference);
}
@@ -175,7 +171,6 @@
public void testUpdateState_whitelisted() {
when(mPowerWhitelistBackend.isWhitelisted(LOW_SDK_PACKAGE)).thenReturn(true);
mController.updateState(mPreference);
- assertThat(mPreference.isChecked()).isTrue();
assertThat(mPreference.isEnabled()).isFalse();
assertThat(mPreference.getSummary()).isEqualTo(
mShadowContext.getText(R.string.background_activity_summary_whitelisted));
@@ -193,37 +188,23 @@
}
@Test
- public void testUpdateSummary_modeDefault_showSummaryOn() {
+ public void testUpdateSummary_modeDefault_showNotRestricted() {
when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_DEFAULT);
- final CharSequence expectedSummary = mShadowContext.getText(
- R.string.background_activity_summary_on);
mController.updateSummary(mPreference);
- assertThat(mPreference.getSummary()).isEqualTo(expectedSummary);
+ assertThat(mPreference.getSummary()).isEqualTo("No");
}
@Test
- public void testUpdateSummary_modeIgnored_showSummaryOff() {
+ public void testUpdateSummary_modeIgnored_showRestricted() {
when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_IGNORED);
- final CharSequence expectedSummary = mShadowContext.getText(
- R.string.background_activity_summary_off);
mController.updateSummary(mPreference);
- assertThat(mPreference.getSummary()).isEqualTo(expectedSummary);
- }
-
- @Test
- public void testIsLegacyApp_SdkLowerThanO_ReturnTrue() {
- assertThat(mController.isLegacyApp(LOW_SDK_PACKAGE)).isTrue();
- }
-
- @Test
- public void testIsLegacyApp_SdkLargerOrEqualThanO_ReturnFalse() {
- assertThat(mController.isLegacyApp(HIGH_SDK_PACKAGE)).isFalse();
+ assertThat(mPreference.getSummary()).isEqualTo("Yes");
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java
new file mode 100644
index 0000000..ac8800e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.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.fuelgauge;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.text.format.DateUtils;
+
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.batterytip.AppInfo;
+import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager;
+import com.android.settings.testutils.DatabaseTestUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BatteryDatabaseManagerTest {
+ private static String PACKAGE_NAME_NEW = "com.android.app1";
+ private static int TYPE_NEW = 1;
+ private static String PACKAGE_NAME_OLD = "com.android.app2";
+ private static int TYPE_OLD = 2;
+ private static long NOW = System.currentTimeMillis();
+ private static long ONE_DAY_BEFORE = NOW - DateUtils.DAY_IN_MILLIS;
+ private static long TWO_DAYS_BEFORE = NOW - 2 * DateUtils.DAY_IN_MILLIS;
+ private Context mContext;
+ private BatteryDatabaseManager mBatteryDatabaseManager;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = RuntimeEnvironment.application;
+ mBatteryDatabaseManager = spy(new BatteryDatabaseManager(mContext));
+ }
+
+ @After
+ public void cleanUp() {
+ DatabaseTestUtils.clearDb(mContext);
+ }
+
+ @Test
+ public void testAllFunctions() {
+ mBatteryDatabaseManager.insertAnomaly(PACKAGE_NAME_NEW, TYPE_NEW, NOW);
+ mBatteryDatabaseManager.insertAnomaly(PACKAGE_NAME_OLD, TYPE_OLD, TWO_DAYS_BEFORE);
+
+ // In database, it contains two record
+ List<AppInfo> totalAppInfos = mBatteryDatabaseManager.queryAllAnomaliesAfter(0);
+ assertThat(totalAppInfos).hasSize(2);
+ verifyAppInfo(totalAppInfos.get(0), PACKAGE_NAME_NEW, TYPE_NEW);
+ verifyAppInfo(totalAppInfos.get(1), PACKAGE_NAME_OLD, TYPE_OLD);
+
+ // Only one record shows up if we query by timestamp
+ List<AppInfo> appInfos = mBatteryDatabaseManager.queryAllAnomaliesAfter(ONE_DAY_BEFORE);
+ assertThat(appInfos).hasSize(1);
+ verifyAppInfo(appInfos.get(0), PACKAGE_NAME_NEW, TYPE_NEW);
+
+ mBatteryDatabaseManager.deleteAllAnomaliesBeforeTimeStamp(ONE_DAY_BEFORE);
+
+ // The obsolete record is removed from database
+ List<AppInfo> appInfos1 = mBatteryDatabaseManager.queryAllAnomaliesAfter(0);
+ assertThat(appInfos1).hasSize(1);
+ verifyAppInfo(appInfos1.get(0), PACKAGE_NAME_NEW, TYPE_NEW);
+
+ }
+
+ private void verifyAppInfo(final AppInfo appInfo, String packageName, int type) {
+ assertThat(appInfo.packageName).isEqualTo(packageName);
+ assertThat(appInfo.anomalyType).isEqualTo(type);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 9276424..58bc14b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -30,6 +30,7 @@
import static org.mockito.Mockito.when;
import android.app.Activity;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.content.Intent;
import android.os.BatteryManager;
@@ -89,13 +90,15 @@
private TextView mSummary2;
private LayoutPreference mBatteryLayoutPref;
private Intent mBatteryIntent;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mContext = spy(RuntimeEnvironment.application);
mBatteryMeterView = new BatteryMeterView(mContext);
mBatteryPercentText = new TextView(mContext);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
index 305bd58..4e1b26c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
@@ -76,6 +76,7 @@
@Test
public void test_loadInBackground_dischargingOldEstimate_dischargingLabelNotNull() {
BatteryInfoLoader loader = new BatteryInfoLoader(mContext, mHelper);
+ loader.batteryUtils = new BatteryUtils(mContext);
BatteryInfo info = loader.loadInBackground();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index 1393d57..fe90751 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;
@@ -101,6 +103,8 @@
private static final double PRECISION = 0.001;
private static final int SDK_VERSION = Build.VERSION_CODES.L;
private static final String PACKAGE_NAME = "com.android.app";
+ private static final String HIGH_SDK_PACKAGE = "com.android.package.high";
+ private static final String LOW_SDK_PACKAGE = "com.android.package.low";
@Mock
private BatteryStats.Uid mUid;
@@ -135,15 +139,18 @@
@Mock
private ApplicationInfo mApplicationInfo;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private BatteryStatsHelper mBatteryStatsHelper;
+ @Mock
+ private ApplicationInfo mHighApplicationInfo;
+ @Mock
+ private ApplicationInfo mLowApplicationInfo;
private BatteryUtils mBatteryUtils;
private FakeFeatureFactory mFeatureFactory;
private PowerUsageFeatureProvider mProvider;
+ private List<BatterySipper> mUsageList;
@Before
- public void setUp() {
+ public void setUp() throws PackageManager.NameNotFoundException {
MockitoAnnotations.initMocks(this);
mFeatureFactory = FakeFeatureFactory.setupForTest();
@@ -162,6 +169,14 @@
when(mBatteryStatsHelper.getStats().computeBatteryRealtime(anyLong(), anyInt())).thenReturn(
TIME_SINCE_LAST_FULL_CHARGE_US);
+ when(mPackageManager.getApplicationInfo(HIGH_SDK_PACKAGE, PackageManager.GET_META_DATA))
+ .thenReturn(mHighApplicationInfo);
+ when(mPackageManager.getApplicationInfo(LOW_SDK_PACKAGE, PackageManager.GET_META_DATA))
+ .thenReturn(mLowApplicationInfo);
+ mHighApplicationInfo.targetSdkVersion = Build.VERSION_CODES.O;
+ mLowApplicationInfo.targetSdkVersion = Build.VERSION_CODES.L;
+
+
mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
mNormalBatterySipper.totalPowerMah = TOTAL_BATTERY_USAGE;
@@ -194,6 +209,12 @@
mBatteryUtils.mPowerUsageFeatureProvider = mProvider;
doReturn(0L).when(mBatteryUtils).getForegroundServiceTotalTimeUs(
any(BatteryStats.Uid.class), anyLong());
+
+ mUsageList = new ArrayList<>();
+ mUsageList.add(mNormalBatterySipper);
+ mUsageList.add(mScreenBatterySipper);
+ mUsageList.add(mCellBatterySipper);
+ doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
}
@Test
@@ -468,4 +489,38 @@
verify(mBatteryStatsHelper).refreshStats(BatteryStats.STATS_SINCE_CHARGED,
mUserManager.getUserProfiles());
}
+
+ @Test
+ public void testFindBatterySipperByType_findTypeScreen() {
+ BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
+ BatterySipper.DrainType.SCREEN);
+
+ assertThat(sipper).isSameAs(mScreenBatterySipper);
+ }
+
+ @Test
+ public void testFindBatterySipperByType_findTypeApp() {
+ BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
+ BatterySipper.DrainType.APP);
+
+ assertThat(sipper).isSameAs(mNormalBatterySipper);
+ }
+
+ @Test
+ public void testCalculateScreenUsageTime_returnCorrectTime() {
+ mScreenBatterySipper.usageTimeMs = TIME_EXPECTED_FOREGROUND;
+
+ assertThat(mBatteryUtils.calculateScreenUsageTime(mBatteryStatsHelper)).isEqualTo(
+ TIME_EXPECTED_FOREGROUND);
+ }
+
+ @Test
+ public void testIsLegacyApp_SdkLowerThanO_ReturnTrue() {
+ assertThat(mBatteryUtils.isLegacyApp(LOW_SDK_PACKAGE)).isTrue();
+ }
+
+ @Test
+ public void testIsLegacyApp_SdkLargerOrEqualThanO_ReturnFalse() {
+ assertThat(mBatteryUtils.isLegacyApp(HIGH_SDK_PACKAGE)).isFalse();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
index c992d0a..8aa0659 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
@@ -67,7 +67,6 @@
private static final String PACKAGE_NAME_1 = "com.android.app1";
private static final String PACKAGE_NAME_2 = "com.android.app2";
private static final String PACKAGE_NAME_3 = "com.android.app3";
- private static final int USER_ID = 1;
@Mock
private SettingsActivity mSettingsActivity;
@@ -198,16 +197,4 @@
assertThat(mBundle.getParcelableArrayList(
PowerUsageAnomalyDetails.EXTRA_ANOMALY_LIST)).isEqualTo(mAnomalyList);
}
-
- @Test
- public void testGetBadgedIcon_usePackageNameAndUserId() throws
- PackageManager.NameNotFoundException {
- doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME_1,
- PackageManager.GET_META_DATA);
-
- mFragment.getBadgedIcon(PACKAGE_NAME_1, USER_ID);
-
- // Verify that it uses the correct user id
- verify(mIconDrawableFactory).getBadgedIcon(mApplicationInfo, USER_ID);
- }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 2728909..6fecf3c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -248,34 +248,6 @@
}
@Test
- public void testFindBatterySipperByType_findTypeScreen() {
- BatterySipper sipper = mFragment.findBatterySipperByType(mUsageList,
- BatterySipper.DrainType.SCREEN);
-
- assertThat(sipper).isSameAs(mScreenBatterySipper);
- }
-
- @Test
- public void testFindBatterySipperByType_findTypeApp() {
- BatterySipper sipper = mFragment.findBatterySipperByType(mUsageList,
- BatterySipper.DrainType.APP);
-
- assertThat(sipper).isSameAs(mNormalBatterySipper);
- }
-
- @Test
- public void testUpdateScreenPreference_showCorrectSummary() {
- doReturn(mScreenBatterySipper).when(mFragment).findBatterySipperByType(any(), any());
- doReturn(mRealContext).when(mFragment).getContext();
- final CharSequence expectedSummary = Utils.formatElapsedTime(mRealContext, USAGE_TIME_MS,
- false);
-
- mFragment.updateScreenPreference();
-
- assertThat(mScreenUsagePref.getSubtitle()).isEqualTo(expectedSummary);
- }
-
- @Test
public void testUpdateLastFullChargePreference_showCorrectSummary() {
doReturn(mRealContext).when(mFragment).getContext();
@@ -285,16 +257,6 @@
}
@Test
- public void testUpdatePreference_usageListEmpty_shouldNotCrash() {
- when(mBatteryHelper.getUsageList()).thenReturn(new ArrayList<BatterySipper>());
- doReturn(STUB_STRING).when(mFragment).getString(anyInt(), any());
- doReturn(mRealContext).when(mFragment).getContext();
-
- // Should not crash when update
- mFragment.updateScreenPreference();
- }
-
- @Test
public void testNonIndexableKeys_MatchPreferenceKeys() {
final Context context = RuntimeEnvironment.application;
final List<String> niks = PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
new file mode 100644
index 0000000..5e43d1d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class RestrictAppPreferenceControllerTest {
+
+ @Mock
+ private AppOpsManager mAppOpsManager;
+ @Mock
+ private AppOpsManager.PackageOps mPackageOps;
+ @Mock
+ private SettingsActivity mSettingsActivity;
+ @Mock
+ private PreferenceFragment mFragment;
+ private List<AppOpsManager.PackageOps> mPackageOpsList;
+ private RestrictAppPreferenceController mRestrictAppPreferenceController;
+ private Preference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
+ doReturn(mContext).when(mSettingsActivity).getApplicationContext();
+ mRestrictAppPreferenceController = new RestrictAppPreferenceController(mSettingsActivity,
+ mFragment);
+ mPackageOpsList = new ArrayList<>();
+ mPreference = new Preference(mContext);
+ mPreference.setKey(mRestrictAppPreferenceController.getPreferenceKey());
+ }
+
+ @Test
+ public void testUpdateState_oneApp_showCorrectSummary() {
+ mPackageOpsList.add(mPackageOps);
+ doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any());
+
+ mRestrictAppPreferenceController.updateState(mPreference);
+
+ assertThat(mPreference.getSummary()).isEqualTo("1 app");
+ }
+
+ @Test
+ public void testUpdateState_twoApps_showCorrectSummary() {
+ mPackageOpsList.add(mPackageOps);
+ mPackageOpsList.add(mPackageOps);
+ doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any());
+
+ mRestrictAppPreferenceController.updateState(mPreference);
+
+ assertThat(mPreference.getSummary()).isEqualTo("2 apps");
+ }
+
+ @Test
+ public void testUpdateState_zeroApp_disabled() {
+ doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any());
+
+ mRestrictAppPreferenceController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void testHandlePreferenceTreeClick_startFragment() {
+ mRestrictAppPreferenceController.handlePreferenceTreeClick(mPreference);
+
+ verify(mSettingsActivity).startPreferencePanelAsUser(eq(mFragment),
+ eq(RestrictedAppDetails.class.getName()), any(), eq(R.string.restricted_app_title),
+ any(), any());
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
new file mode 100644
index 0000000..521ead4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceManager;
+import android.util.IconDrawableFactory;
+
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class RestrictedAppDetailsTest {
+ private static final String PACKAGE_NAME = "com.android.app";
+ private static final String APP_NAME = "app";
+ private static final int UID = 1234;
+ @Mock
+ private PackageManager mPackageManager;
+ @Mock
+ private ApplicationInfo mApplicationInfo;
+ @Mock
+ private IconDrawableFactory mIconDrawableFactory;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private PreferenceManager mPreferenceManager;
+ private RestrictedAppDetails mFragment;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ mFragment = spy(new RestrictedAppDetails());
+
+ doReturn(mPreferenceManager).when(mFragment).getPreferenceManager();
+ doReturn(mContext).when(mPreferenceManager).getContext();
+ mFragment.mPackageManager = mPackageManager;
+ mFragment.mIconDrawableFactory = mIconDrawableFactory;
+ mFragment.mPackageOpsList = new ArrayList<>();
+ mFragment.mPackageOpsList.add(
+ new AppOpsManager.PackageOps(PACKAGE_NAME, UID, null /* entries */));
+ mFragment.mRestrictedAppListGroup = spy(new PreferenceCategory(mContext));
+ doReturn(mPreferenceManager).when(mFragment.mRestrictedAppListGroup).getPreferenceManager();
+ }
+
+ @Test
+ public void testRefreshUi_displayPreference() throws Exception {
+ doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME, 0);
+ doReturn(APP_NAME).when(mPackageManager).getApplicationLabel(mApplicationInfo);
+
+ mFragment.refreshUi();
+
+ assertThat(mFragment.mRestrictedAppListGroup.getPreferenceCount()).isEqualTo(1);
+ final Preference preference = mFragment.mRestrictedAppListGroup.getPreference(0);
+ assertThat(preference.getKey()).isEqualTo(PACKAGE_NAME);
+ assertThat(preference.getTitle()).isEqualTo(APP_NAME);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
new file mode 100644
index 0000000..cc5fb30
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SmartBatteryPreferenceControllerTest {
+ private static final int ON = 1;
+ private static final int OFF = 0;
+
+ private SmartBatteryPreferenceController mController;
+ private SwitchPreference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = RuntimeEnvironment.application;
+ mController = new SmartBatteryPreferenceController(mContext);
+ mPreference = new SwitchPreference(mContext);
+ }
+
+ @Test
+ public void testUpdateState_smartBatteryOn_preferenceChecked() {
+ putSmartBatteryValue(ON);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void testUpdateState_smartBatteryOff_preferenceUnchecked() {
+ putSmartBatteryValue(OFF);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void testUpdateState_checkPreference_smartBatteryOn() {
+ mController.onPreferenceChange(mPreference, true);
+
+ assertThat(getSmartBatteryValue()).isEqualTo(ON);
+ }
+
+ @Test
+ public void testUpdateState_unCheckPreference_smartBatteryOff() {
+ mController.onPreferenceChange(mPreference, false);
+
+ assertThat(getSmartBatteryValue()).isEqualTo(OFF);
+ }
+
+ private void putSmartBatteryValue(int value) {
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.APP_STANDBY_ENABLED,
+ value);
+ }
+
+ private int getSmartBatteryValue() {
+ return Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.APP_STANDBY_ENABLED, ON);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
index 38391c9..3e33823 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
@@ -24,7 +24,6 @@
import android.util.Pair;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.fuelgauge.anomaly.action.StopAndBackgroundCheckAction;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
@@ -32,6 +31,7 @@
import com.android.settings.fuelgauge.anomaly.checker.WakeLockAnomalyDetector;
import com.android.settings.testutils.shadow.ShadowKeyValueListParserWrapperImpl;
import com.android.settings.fuelgauge.anomaly.checker.WakeupAlarmAnomalyDetector;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java
new file mode 100644
index 0000000..16b45df
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.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.batterytip;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Parcel;
+import android.text.format.DateUtils;
+
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AppInfoTest {
+ private static final String PACKAGE_NAME = "com.android.app";
+ private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
+ private static final long SCREEN_TIME_MS = DateUtils.HOUR_IN_MILLIS;
+
+ private AppInfo mAppInfo;
+
+ @Before
+ public void setUp() {
+ mAppInfo = new AppInfo.Builder()
+ .setPackageName(PACKAGE_NAME)
+ .setAnomalyType(ANOMALY_TYPE)
+ .setScreenOnTimeMs(SCREEN_TIME_MS)
+ .build();
+ }
+
+ @Test
+ public void testParcel() {
+ Parcel parcel = Parcel.obtain();
+ mAppInfo.writeToParcel(parcel, mAppInfo.describeContents());
+ parcel.setDataPosition(0);
+
+ final AppInfo appInfo = new AppInfo(parcel);
+
+ assertThat(appInfo.packageName).isEqualTo(PACKAGE_NAME);
+ assertThat(appInfo.anomalyType).isEqualTo(ANOMALY_TYPE);
+ assertThat(appInfo.screenOnTimeMs).isEqualTo(SCREEN_TIME_MS);
+ }
+
+ @Test
+ public void testCompareTo_hasCorrectOrder() {
+ final AppInfo appInfo = new AppInfo.Builder()
+ .setPackageName(PACKAGE_NAME)
+ .setAnomalyType(ANOMALY_TYPE)
+ .setScreenOnTimeMs(SCREEN_TIME_MS + 100)
+ .build();
+
+ List<AppInfo> appInfos = new ArrayList<>();
+ appInfos.add(appInfo);
+ appInfos.add(mAppInfo);
+
+ Collections.sort(appInfos);
+ assertThat(appInfos.get(0).screenOnTimeMs).isLessThan(appInfos.get(1).screenOnTimeMs);
+ }
+
+ @Test
+ public void testBuilder() {
+ assertThat(mAppInfo.packageName).isEqualTo(PACKAGE_NAME);
+ assertThat(mAppInfo.anomalyType).isEqualTo(ANOMALY_TYPE);
+ assertThat(mAppInfo.screenOnTimeMs).isEqualTo(SCREEN_TIME_MS);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
new file mode 100644
index 0000000..ddee314
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.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.fuelgauge.batterytip;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.text.format.DateUtils;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowRuntimePermissionPresenter;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAlertDialog;
+import org.robolectric.shadows.ShadowDialog;
+import org.robolectric.util.FragmentTestUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+ shadows = ShadowRuntimePermissionPresenter.class)
+public class BatteryTipDialogFragmentTest {
+ private static final String PACKAGE_NAME = "com.android.app";
+ private static final long SCREEN_TIME_MS = DateUtils.HOUR_IN_MILLIS;
+
+ private BatteryTipDialogFragment mDialogFragment;
+ private Context mContext;
+ private HighUsageTip mHighUsageTip;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ FakeFeatureFactory.setupForTest();
+
+ List<AppInfo> highUsageTips = new ArrayList<>();
+ highUsageTips.add(new AppInfo.Builder().setScreenOnTimeMs(SCREEN_TIME_MS).setPackageName(
+ PACKAGE_NAME).build());
+ mHighUsageTip = new HighUsageTip(SCREEN_TIME_MS, highUsageTips);
+ }
+
+ @Test
+ public void testOnCreateDialog_highUsageTip_fireHighUsageDialog() {
+ mDialogFragment = BatteryTipDialogFragment.newInstance(mHighUsageTip);
+
+ FragmentTestUtil.startFragment(mDialogFragment);
+
+ final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+ ShadowAlertDialog shadowDialog = shadowOf(dialog);
+
+ assertThat(shadowDialog.getMessage()).isEqualTo(
+ mContext.getString(R.string.battery_tip_dialog_message, "1h"));
+ }
+
+
+}
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 e4e8eef..83b3225 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
@@ -18,12 +18,18 @@
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;
import android.content.Context;
+import android.content.Intent;
+import android.os.PowerManager;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.BatteryInfo;
+import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.batterytip.detectors.BatteryTipDetector;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,6 +37,7 @@
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;
@@ -42,46 +49,45 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryTipLoaderTest {
- @Mock
+ private static final int[] TIP_ORDER = {
+ BatteryTip.TipType.SMART_BATTERY_MANAGER,
+ BatteryTip.TipType.HIGH_DEVICE_USAGE,
+ BatteryTip.TipType.BATTERY_SAVER,
+ BatteryTip.TipType.LOW_BATTERY,
+ BatteryTip.TipType.SUMMARY};
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private BatteryStatsHelper mBatteryStatsHelper;
@Mock
- private BatteryTipDetector mBatteryTipDetector;
+ private PowerManager mPowerManager;
@Mock
- private BatteryTip mBatteryTip;
+ private Intent mIntent;
+ @Mock
+ private BatteryUtils mBatteryUtils;
+ @Mock
+ private BatteryInfo mBatteryInfo;
private Context mContext;
private BatteryTipLoader mBatteryTipLoader;
- private List<BatteryTip> mBatteryTips;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- doReturn(mBatteryTip).when(mBatteryTipDetector).detect();
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mContext).when(mContext).getApplicationContext();
+ doReturn(mPowerManager).when(mContext).getSystemService(Context.POWER_SERVICE);
+ doReturn(mIntent).when(mContext).registerReceiver(any(), any());
+ doReturn(mBatteryInfo).when(mBatteryUtils).getBatteryInfo(any(), any());
mBatteryTipLoader = new BatteryTipLoader(mContext, mBatteryStatsHelper);
- mBatteryTips = new ArrayList<>();
+ mBatteryTipLoader.mBatteryUtils = mBatteryUtils;
}
@Test
- public void testAddBatteryTipFromDetector_tipVisible_addAndUpdateCount() {
- doReturn(true).when(mBatteryTip).isVisible();
- mBatteryTipLoader.mVisibleTips = 0;
+ public void testLoadBackground_containsAllTipsWithOrder() {
+ final List<BatteryTip> batteryTips = mBatteryTipLoader.loadInBackground();
- mBatteryTipLoader.addBatteryTipFromDetector(mBatteryTips, mBatteryTipDetector);
-
- assertThat(mBatteryTips.contains(mBatteryTip)).isTrue();
- assertThat(mBatteryTipLoader.mVisibleTips).isEqualTo(1);
+ assertThat(batteryTips.size()).isEqualTo(TIP_ORDER.length);
+ for (int i = 0, size = batteryTips.size(); i < size; i++) {
+ assertThat(batteryTips.get(i).getType()).isEqualTo(TIP_ORDER[i]);
+ }
}
-
- @Test
- public void testAddBatteryTipFromDetector_tipInvisible_doNotAddCount() {
- doReturn(false).when(mBatteryTip).isVisible();
- mBatteryTipLoader.mVisibleTips = 0;
-
- mBatteryTipLoader.addBatteryTipFromDetector(mBatteryTips, mBatteryTipDetector);
-
- assertThat(mBatteryTips.contains(mBatteryTip)).isTrue();
- assertThat(mBatteryTipLoader.mVisibleTips).isEqualTo(0);
- }
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
index 1198b27..78c86f8 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
@@ -24,6 +24,7 @@
import android.content.Context;
import android.provider.Settings;
+import android.text.format.DateUtils;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -42,6 +43,8 @@
+ ",battery_saver_tip_enabled=false"
+ ",high_usage_enabled=true"
+ ",high_usage_app_count=5"
+ + ",high_usage_period_ms=2000"
+ + ",high_usage_battery_draining=30"
+ ",app_restriction_enabled=true"
+ ",reduced_battery_enabled=true"
+ ",reduced_battery_percent=30"
@@ -66,6 +69,8 @@
assertThat(batteryTipPolicy.batterySaverTipEnabled).isFalse();
assertThat(batteryTipPolicy.highUsageEnabled).isTrue();
assertThat(batteryTipPolicy.highUsageAppCount).isEqualTo(5);
+ assertThat(batteryTipPolicy.highUsagePeriodMs).isEqualTo(2000);
+ assertThat(batteryTipPolicy.highUsageBatteryDraining).isEqualTo(30);
assertThat(batteryTipPolicy.appRestrictionEnabled).isTrue();
assertThat(batteryTipPolicy.reducedBatteryEnabled).isTrue();
assertThat(batteryTipPolicy.reducedBatteryPercent).isEqualTo(30);
@@ -85,10 +90,12 @@
assertThat(batteryTipPolicy.batterySaverTipEnabled).isTrue();
assertThat(batteryTipPolicy.highUsageEnabled).isTrue();
assertThat(batteryTipPolicy.highUsageAppCount).isEqualTo(3);
+ assertThat(batteryTipPolicy.highUsagePeriodMs).isEqualTo(2 * DateUtils.HOUR_IN_MILLIS);
+ assertThat(batteryTipPolicy.highUsageBatteryDraining).isEqualTo(25);
assertThat(batteryTipPolicy.appRestrictionEnabled).isTrue();
- assertThat(batteryTipPolicy.reducedBatteryEnabled).isTrue();
+ assertThat(batteryTipPolicy.reducedBatteryEnabled).isFalse();
assertThat(batteryTipPolicy.reducedBatteryPercent).isEqualTo(50);
- assertThat(batteryTipPolicy.lowBatteryEnabled).isTrue();
+ assertThat(batteryTipPolicy.lowBatteryEnabled).isFalse();
assertThat(batteryTipPolicy.lowBatteryHour).isEqualTo(16);
}
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 944587f..b4149c1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
@@ -15,6 +15,9 @@
*/
package com.android.settings.fuelgauge.batterytip;
+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;
@@ -29,6 +32,7 @@
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.SettingsActivity;
import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.SummaryTip;
@@ -57,6 +61,8 @@
private PreferenceScreen mPreferenceScreen;
@Mock
private BatteryTip mBatteryTip;
+ @Mock
+ private SettingsActivity mSettingsActivity;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PreferenceManager mPreferenceManager;
@@ -85,7 +91,7 @@
mNewBatteryTips.add(new SummaryTip(BatteryTip.StateType.INVISIBLE));
mBatteryTipPreferenceController = new BatteryTipPreferenceController(mContext, KEY_PREF,
- mBatteryTipListener);
+ mSettingsActivity, null, mBatteryTipListener);
mBatteryTipPreferenceController.mPreferenceGroup = mPreferenceGroup;
mBatteryTipPreferenceController.mPrefContext = mContext;
}
@@ -109,7 +115,8 @@
}
@Test
- public void testHandlePreferenceTreeClick_noDialog_invokeAction() {
+ public void testHandlePreferenceTreeClick_noDialog_invokeCallback() {
+ doReturn(SMART_BATTERY_MANAGER).when(mBatteryTip).getType();
List<BatteryTip> batteryTips = new ArrayList<>();
batteryTips.add(mBatteryTip);
doReturn(mPreference).when(mBatteryTip).buildPreference(any());
@@ -119,7 +126,7 @@
mBatteryTipPreferenceController.handlePreferenceTreeClick(mPreference);
- verify(mBatteryTip).action();
+ verify(mBatteryTipListener).onBatteryTipHandled(mBatteryTip);
}
private void assertOnlyContainsSummaryTip(final PreferenceGroup preferenceGroup) {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java
new file mode 100644
index 0000000..5bdae0c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.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.fuelgauge.batterytip;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.BatteryStats;
+import android.text.format.DateUtils;
+
+import com.android.settings.TestConfig;
+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.annotation.Config;
+
+import java.time.Duration;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class HighUsageDataParserTest {
+ private static final long PERIOD_ONE_MINUTE_MS = Duration.ofMinutes(1).toMillis();
+ private static final long END_TIME_MS = 2 * PERIOD_ONE_MINUTE_MS;
+ private static final int THRESHOLD_LOW = 10;
+ private static final int THRESHOLD_HIGH = 20;
+ private HighUsageDataParser mDataParser;
+ private BatteryStats.HistoryItem mFirstItem;
+ private BatteryStats.HistoryItem mSecondItem;
+ private BatteryStats.HistoryItem mThirdItem;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mFirstItem = new BatteryStats.HistoryItem();
+ mFirstItem.batteryLevel = 100;
+ mFirstItem.currentTime = 0;
+ mSecondItem = new BatteryStats.HistoryItem();
+ mSecondItem.batteryLevel = 95;
+ mSecondItem.currentTime = PERIOD_ONE_MINUTE_MS;
+ mThirdItem = new BatteryStats.HistoryItem();
+ mThirdItem.batteryLevel = 80;
+ mThirdItem.currentTime = END_TIME_MS;
+ }
+
+ @Test
+ public void testDataParser_thresholdLow_isHeavilyUsed() {
+ mDataParser = new HighUsageDataParser(PERIOD_ONE_MINUTE_MS, THRESHOLD_LOW);
+ parseData();
+
+ assertThat(mDataParser.isDeviceHeavilyUsed()).isTrue();
+ }
+
+ @Test
+ public void testDataParser_thresholdHigh_notHeavilyUsed() {
+ mDataParser = new HighUsageDataParser(PERIOD_ONE_MINUTE_MS, THRESHOLD_HIGH);
+ parseData();
+
+ assertThat(mDataParser.isDeviceHeavilyUsed()).isFalse();
+ }
+
+ private void parseData() {
+ mDataParser.onParsingStarted(0, END_TIME_MS);
+ mDataParser.onDataPoint(0, mFirstItem);
+ mDataParser.onDataPoint(PERIOD_ONE_MINUTE_MS, mSecondItem);
+ mDataParser.onDataPoint(END_TIME_MS, mThirdItem);
+
+ mDataParser.onParsingDone();
+ }
+}
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
new file mode 100644
index 0000000..ace6da9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.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.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;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.BatteryManager;
+import android.os.PowerManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
+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;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class EarlyWarningDetectorTest {
+ private Context mContext;
+ private BatteryTipPolicy mPolicy;
+ private EarlyWarningDetector mEarlyWarningDetector;
+ @Mock
+ private Intent mIntent;
+ @Mock
+ private PowerManager mPowerManager;
+ private FakeFeatureFactory mFakeFeatureFactory;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ mPolicy = spy(new BatteryTipPolicy(mContext));
+ doReturn(mPowerManager).when(mContext).getSystemService(Context.POWER_SERVICE);
+ doReturn(mIntent).when(mContext).registerReceiver(any(), any());
+ doReturn(0).when(mIntent).getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+ mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
+ doReturn(true).when(mFakeFeatureFactory.powerUsageFeatureProvider).getEarlyWarningSignal(
+ any(), any());
+
+ mEarlyWarningDetector = new EarlyWarningDetector(mPolicy, mContext);
+ }
+
+ @Test
+ public void testDetect_policyDisabled_tipInvisible() {
+ ReflectionHelpers.setField(mPolicy, "batterySaverTipEnabled", false);
+
+ assertThat(mEarlyWarningDetector.detect().isVisible()).isFalse();
+ }
+
+ @Test
+ public void testDetect_batterySaverOn_tipInvisible() {
+ doReturn(true).when(mPowerManager).isPowerSaveMode();
+
+ assertThat(mEarlyWarningDetector.detect().isVisible()).isFalse();
+ }
+
+ @Test
+ public void testDetect_charging_tipInvisible() {
+ doReturn(1).when(mIntent).getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+
+ assertThat(mEarlyWarningDetector.detect().isVisible()).isFalse();
+ }
+
+ @Test
+ public void testDetect_noEarlyWarning_tipInvisible() {
+ doReturn(false).when(mFakeFeatureFactory.powerUsageFeatureProvider).getEarlyWarningSignal(
+ any(), any());
+
+ assertThat(mEarlyWarningDetector.detect().isVisible()).isFalse();
+ }
+
+}
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
new file mode 100644
index 0000000..8df7c56
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge.batterytip.detectors;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.os.BatteryStats;
+import android.text.format.DateUtils;
+
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.BatteryInfo;
+import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
+import com.android.settings.fuelgauge.batterytip.HighUsageDataParser;
+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.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class HighUsageDetectorTest {
+ private Context mContext;
+ @Mock
+ private BatteryStatsHelper mBatteryStatsHelper;
+ @Mock
+ private BatteryUtils mBatteryUtils;
+ @Mock
+ private BatterySipper mBatterySipper;
+ @Mock
+ private HighUsageDataParser mDataParser;
+
+ private BatteryTipPolicy mPolicy;
+ private HighUsageDetector mHighUsageDetector;
+ private List<BatterySipper> mUsageList;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = RuntimeEnvironment.application;
+ mPolicy = spy(new BatteryTipPolicy(mContext));
+ mHighUsageDetector = spy(new HighUsageDetector(mContext, mPolicy, mBatteryStatsHelper));
+ mHighUsageDetector.mBatteryUtils = mBatteryUtils;
+ mHighUsageDetector.mDataParser = mDataParser;
+ doNothing().when(mHighUsageDetector).parseBatteryData();
+
+ mUsageList = new ArrayList<>();
+ mUsageList.add(mBatterySipper);
+ }
+
+ @Test
+ public void testDetect_disabledByPolicy_tipInvisible() {
+ ReflectionHelpers.setField(mPolicy, "highUsageEnabled", false);
+
+ assertThat(mHighUsageDetector.detect().isVisible()).isFalse();
+ }
+
+ @Test
+ public void testDetect_containsHighUsageApp_tipVisible() {
+ doReturn(true).when(mDataParser).isDeviceHeavilyUsed();
+ doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
+ doReturn(DateUtils.HOUR_IN_MILLIS).when(mBatteryUtils).getProcessTimeMs(
+ BatteryUtils.StatusType.FOREGROUND, mBatterySipper.uidObj,
+ BatteryStats.STATS_SINCE_CHARGED);
+
+ assertThat(mHighUsageDetector.detect().isVisible()).isTrue();
+ }
+}
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 4866a6a..d953b7c 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
@@ -52,6 +52,8 @@
mContext = RuntimeEnvironment.application;
mPolicy = spy(new BatteryTipPolicy(mContext));
+ ReflectionHelpers.setField(mPolicy, "lowBatteryEnabled", true);
+
mLowBatteryDetector = new LowBatteryDetector(mPolicy, mBatteryInfo);
}
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
new file mode 100644
index 0000000..8400d89
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.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.fuelgauge.batterytip.detectors;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
+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;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SmartBatteryDetectorTest {
+ private Context mContext;
+ private BatteryTipPolicy mPolicy;
+ private SmartBatteryDetector mSmartBatteryDetector;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = RuntimeEnvironment.application;
+ mPolicy = spy(new BatteryTipPolicy(mContext));
+ mSmartBatteryDetector = new SmartBatteryDetector(mPolicy, mContext.getContentResolver());
+ }
+
+ @Test
+ public void testDetect_smartBatteryOff_tipVisible() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.APP_STANDBY_ENABLED, 0);
+
+ assertThat(mSmartBatteryDetector.detect().isVisible()).isTrue();
+ }
+
+ @Test
+ public void testDetect_smartBatteryOn_tipInvisible() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.APP_STANDBY_ENABLED, 1);
+
+ assertThat(mSmartBatteryDetector.detect().isVisible()).isFalse();
+ }
+}
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 389a6c3..12e98e9 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
@@ -51,22 +51,15 @@
@Test
public void testDetect_disabledByPolicy_tipInvisible() {
ReflectionHelpers.setField(mPolicy, "summaryEnabled", false);
- SummaryDetector detector = new SummaryDetector(mPolicy, 0 /* visibleTips */);
+ SummaryDetector detector = new SummaryDetector(mPolicy);
assertThat(detector.detect().isVisible()).isFalse();
}
@Test
- public void testDetect_noOtherTips_tipVisible() {
- SummaryDetector detector = new SummaryDetector(mPolicy, 0 /* visibleTips */);
+ public void testDetect_notDisabled_tipVisible() {
+ SummaryDetector detector = new SummaryDetector(mPolicy);
assertThat(detector.detect().isVisible()).isTrue();
}
-
- @Test
- public void testDetect_hasOtherTips_tipInVisible() {
- SummaryDetector detector = new SummaryDetector(mPolicy, 1 /* visibleTips */);
-
- assertThat(detector.detect().isVisible()).isFalse();
- }
}
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 eec8e76..6efd5d3 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
@@ -19,6 +19,8 @@
import android.app.Dialog;
import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
import android.support.annotation.IdRes;
import android.support.v7.preference.Preference;
@@ -58,10 +60,32 @@
assertThat(preference.getIcon()).isEqualTo(mContext.getDrawable(ICON_ID));
}
+ @Test
+ public void testParcelable() {
+ final BatteryTip batteryTip = new TestBatteryTip();
+
+ Parcel parcel = Parcel.obtain();
+ batteryTip.writeToParcel(parcel, batteryTip.describeContents());
+ parcel.setDataPosition(0);
+
+ final BatteryTip parcelTip = new TestBatteryTip(parcel);
+
+ assertThat(parcelTip.getTitle(mContext)).isEqualTo(TITLE);
+ assertThat(parcelTip.getSummary(mContext)).isEqualTo(SUMMARY);
+ assertThat(parcelTip.getIconId()).isEqualTo(ICON_ID);
+ }
+
/**
* Used to test the non abstract methods in {@link TestBatteryTip}
*/
- public class TestBatteryTip extends BatteryTip {
+ public static class TestBatteryTip extends BatteryTip {
+ TestBatteryTip() {
+ super(TipType.SUMMARY, StateType.NEW, true);
+ }
+
+ TestBatteryTip(Parcel in) {
+ super(in);
+ }
@Override
public String getTitle(Context context) {
@@ -83,15 +107,15 @@
// do nothing
}
- @Override
- public void action() {
- // do nothing
- }
+ public final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ public BatteryTip createFromParcel(Parcel in) {
+ return new TestBatteryTip(in);
+ }
- @Override
- public Dialog buildDialog() {
- return null;
- }
+ public BatteryTip[] newArray(int size) {
+ return new TestBatteryTip[size];
+ }
+ };
}
}
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
new file mode 100644
index 0000000..66d5f81
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.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.fuelgauge.batterytip.tips;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.Parcel;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class EarlyWarningTipTest {
+ private Context mContext;
+ private EarlyWarningTip mEarlyWarningTip;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mEarlyWarningTip = new EarlyWarningTip(BatteryTip.StateType.NEW,
+ false /* powerSaveModeOn */);
+ }
+
+ @Test
+ public void testParcelable() {
+ Parcel parcel = Parcel.obtain();
+ mEarlyWarningTip.writeToParcel(parcel, mEarlyWarningTip.describeContents());
+ parcel.setDataPosition(0);
+
+ final EarlyWarningTip parcelTip = new EarlyWarningTip(parcel);
+
+ assertThat(parcelTip.isPowerSaveModeOn()).isFalse();
+ }
+
+ @Test
+ public void testInfo_stateNew_displayPowerModeInfo() {
+ final EarlyWarningTip tip = new EarlyWarningTip(BatteryTip.StateType.NEW,
+ false /* powerModeOn */);
+
+ assertThat(tip.getTitle(mContext)).isEqualTo("Turn on Low Battery Mode");
+ assertThat(tip.getSummary(mContext)).isEqualTo("Extend your battery life");
+ assertThat(tip.getIconId()).isEqualTo(R.drawable.ic_battery_alert_24dp);
+ }
+
+ @Test
+ public void testInfo_stateHandled_displayPowerModeHandledInfo() {
+ final EarlyWarningTip tip = new EarlyWarningTip(BatteryTip.StateType.HANDLED,
+ false /* powerModeOn */);
+
+ assertThat(tip.getTitle(mContext)).isEqualTo("Low Battery Mode is on");
+ assertThat(tip.getSummary(mContext)).isEqualTo("Some features are limited");
+ assertThat(tip.getIconId()).isEqualTo(R.drawable.ic_perm_device_information_green_24dp);
+ }
+
+ @Test
+ public void testUpdate_powerModeTurnedOn_typeBecomeHandled() {
+ final EarlyWarningTip nextTip = new EarlyWarningTip(BatteryTip.StateType.INVISIBLE,
+ true /* powerModeOn */);
+
+ mEarlyWarningTip.updateState(nextTip);
+
+ assertThat(mEarlyWarningTip.getState()).isEqualTo(BatteryTip.StateType.HANDLED);
+ }
+}
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
new file mode 100644
index 0000000..0689778
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.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.fuelgauge.batterytip.tips;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.Parcel;
+import android.text.format.DateUtils;
+
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.batterytip.AppInfo;
+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 java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class HighUsageTipTest {
+ private static final String PACKAGE_NAME = "com.android.app";
+ private static final long SCREEN_TIME = 30 * DateUtils.MINUTE_IN_MILLIS;
+
+ private Context mContext;
+ private HighUsageTip mBatteryTip;
+ private List<AppInfo> mUsageAppList;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+
+ mUsageAppList = new ArrayList<>();
+ mUsageAppList.add(new AppInfo.Builder()
+ .setPackageName(PACKAGE_NAME)
+ .setScreenOnTimeMs(SCREEN_TIME)
+ .build());
+ mBatteryTip = new HighUsageTip(SCREEN_TIME, mUsageAppList);
+ }
+
+ @Test
+ public void testParcelable() {
+
+ Parcel parcel = Parcel.obtain();
+ mBatteryTip.writeToParcel(parcel, mBatteryTip.describeContents());
+ parcel.setDataPosition(0);
+
+ final HighUsageTip parcelTip = new HighUsageTip(parcel);
+
+ assertThat(parcelTip.getTitle(mContext)).isEqualTo("Phone used heavily");
+ assertThat(parcelTip.getType()).isEqualTo(BatteryTip.TipType.HIGH_DEVICE_USAGE);
+ assertThat(parcelTip.getState()).isEqualTo(BatteryTip.StateType.NEW);
+ assertThat(parcelTip.getScreenTimeMs()).isEqualTo(SCREEN_TIME);
+ assertThat(parcelTip.mHighUsageAppList.size()).isEqualTo(1);
+ final AppInfo app = parcelTip.mHighUsageAppList.get(0);
+ assertThat(app.packageName).isEqualTo(PACKAGE_NAME);
+ assertThat(app.screenOnTimeMs).isEqualTo(SCREEN_TIME);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
index 2716fc3..220aa6d 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
@@ -18,6 +18,7 @@
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 static org.mockito.Mockito.when;
@@ -34,6 +35,7 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.ArrayList;
@@ -44,18 +46,18 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class GameControllerPreferenceControllerTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
@Mock
private InputManager mInputManager;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private InputDevice mInputDevice;
+ private Context mContext;
private GameControllerPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mInputManager);
mController = new GameControllerPreferenceController(mContext);
}
@@ -111,6 +113,14 @@
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void testIsAvailable_ifDisabled_shouldReturnFalse() {
+ mController = new GameControllerPreferenceController(mContext);
+
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void updateNonIndexableKeys_shouldIncludeCategoryAndPrefKeys() {
when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{});
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
index 8f9b2c5..356cfb4 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
@@ -18,6 +18,7 @@
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;
@@ -37,6 +38,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -65,11 +67,23 @@
}
@Test
- public void shouldAlwaysBeAvailable() {
+ public void testPhysicalKeyboard_byDefault_shouldBeShown() {
+ final Context context = spy(RuntimeEnvironment.application.getApplicationContext());
+ mController = new PhysicalKeyboardPreferenceController(context, null);
+
assertThat(mController.isAvailable()).isTrue();
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void testPhysicalKeyboard_ifDisabled_shouldNotBeShown() {
+ final Context context = spy(RuntimeEnvironment.application.getApplicationContext());
+ mController = new PhysicalKeyboardPreferenceController(context, null);
+
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
@Config(shadows = {
ShadowInputDevice.class,
})
diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
index 4457cc0..c41a03b 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
@@ -16,7 +16,10 @@
package com.android.settings.inputmethod;
+import static org.mockito.Mockito.spy;
+
import android.content.Context;
+import android.content.res.Resources;
import android.support.v7.preference.Preference;
import android.view.textservice.SpellCheckerInfo;
import android.view.textservice.TextServicesManager;
@@ -46,6 +49,9 @@
private Context mContext;
@Mock
private TextServicesManager mTextServicesManager;
+ @Mock
+ private Resources mResources;
+
private Context mAppContext;
private Preference mPreference;
private SpellCheckerPreferenceController mController;
@@ -56,11 +62,24 @@
mAppContext = RuntimeEnvironment.application;
when(mContext.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
.thenReturn(mTextServicesManager);
+ when(mContext.getResources()).thenReturn(mResources);
+ when(mResources.getBoolean(R.bool.config_show_spellcheckers_settings)).thenReturn(true);
mPreference = new Preference(mAppContext);
mController = new SpellCheckerPreferenceController(mContext);
}
@Test
+ public void testSpellChecker_byDefault_shouldBeShown() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void testSpellChecker_ifDisabled_shouldNotBeShown() {
+ when(mResources.getBoolean(R.bool.config_show_spellcheckers_settings)).thenReturn(false);
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void updateState_NoSpellerChecker_shouldSetSummaryToDefault() {
when(mTextServicesManager.isSpellCheckerEnabled()).thenReturn(true);
when(mTextServicesManager.getCurrentSpellChecker()).thenReturn(null);
diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
index fe2b0df..c078725 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
@@ -21,6 +21,7 @@
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -75,11 +76,21 @@
}
@Test
- public void shouldAlwaysBeAvailable() {
+ public void testVirtualKeyboard_byDefault_shouldBeShown() {
+ final Context context = spy(RuntimeEnvironment.application.getApplicationContext());
+ mController = new VirtualKeyboardPreferenceController(context);
assertThat(mController.isAvailable()).isTrue();
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void testVirtualKeyboard_ifDisabled_shouldNotBeShown() {
+ final Context context = spy(RuntimeEnvironment.application.getApplicationContext());
+ mController = new VirtualKeyboardPreferenceController(context);
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void updateState_noEnabledIMEs_setEmptySummary() {
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
index 6984e6a..90a4a12 100644
--- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
@@ -17,10 +17,13 @@
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;
import android.content.Context;
+import android.content.res.AssetManager;
import android.support.v7.preference.Preference;
import com.android.settings.TestConfig;
@@ -33,6 +36,7 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.ArrayList;
@@ -42,35 +46,45 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PhoneLanguagePreferenceControllerTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
@Mock
private Preference mPreference;
+ @Mock
+ private AssetManager mAssets;
+
+ private Context mContext;
private FakeFeatureFactory mFeatureFactory;
private PhoneLanguagePreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+ when(mContext.getAssets()).thenReturn(mAssets);
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new PhoneLanguagePreferenceController(mContext);
}
@Test
public void testIsAvailable_hasMultipleLocales_shouldReturnTrue() {
- when(mContext.getAssets().getLocales()).thenReturn(new String[] {"en", "de"});
+ when(mAssets.getLocales()).thenReturn(new String[] {"en", "de"});
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void testIsAvailable_hasSingleLocales_shouldReturnFalse() {
- when(mContext.getAssets().getLocales()).thenReturn(new String[] {"en"});
+ when(mAssets.getLocales()).thenReturn(new String[] {"en"});
assertThat(mController.isAvailable()).isFalse();
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void testIsAvailable_ifDisabled_shouldReturnFalse() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void testUpdateState_shouldUpdateSummary() {
final String testSummary = "test";
when(mFeatureFactory.localeFeatureProvider.getLocaleNames()).thenReturn(testSummary);
diff --git a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java
new file mode 100644
index 0000000..32217df
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.language;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PointerSpeedControllerTest {
+
+ private Context mContext;
+ private PointerSpeedController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+ mController = new PointerSpeedController(mContext);
+ }
+
+ @Test
+ public void testDeviceAdministrators_byDefault_shouldBeShown() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void testDeviceAdministrators_ifDisabled_shouldNotBeShown() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
index 15067c9..18cb12a 100644
--- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
@@ -18,6 +18,7 @@
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;
@@ -45,19 +46,19 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TtsPreferenceControllerTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
@Mock
private TtsEngines mTtsEngines;
@Mock
private PreferenceScreen mScreen;
+ private Context mContext;
private TtsPreferenceController mController;
private Preference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
mController = new TtsPreferenceController(mContext, mTtsEngines);
mPreference = new Preference(RuntimeEnvironment.application);
@@ -89,4 +90,11 @@
assertThat(mPreference.isVisible()).isTrue();
}
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void testIsAvailable_ifDisabled_shouldReturnFalse() {
+
+ assertThat(mController.isAvailable()).isFalse();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
index 1ee52ca..737c16d 100644
--- a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
+++ b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
@@ -20,6 +20,7 @@
import android.view.View;
import android.widget.TextView;
import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSettingsPreferenceFragment;
@@ -27,6 +28,7 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@@ -39,6 +41,11 @@
private LocaleListEditor mLocaleListEditor;
+ @Mock
+ private Context mContext;
+
+ private FakeFeatureFactory mFactory;
+
@Before
public void setUp() {
mLocaleListEditor = new LocaleListEditor();
@@ -48,11 +55,13 @@
RuntimeEnvironment.application.getSystemService(Context.RESTRICTIONS_SERVICE));
ReflectionHelpers.setField(mLocaleListEditor, "mUserManager",
RuntimeEnvironment.application.getSystemService(Context.USER_SERVICE));
+ mFactory = FakeFeatureFactory.setupForTest();
}
@Test
public void testDisallowConfigLocale_unrestrict() {
ReflectionHelpers.setField(mLocaleListEditor, "mIsUiRestricted", true);
+ mLocaleListEditor.onAttach(mContext);
mLocaleListEditor.onResume();
Assert.assertEquals(View.GONE, mLocaleListEditor.getEmptyTextView().getVisibility());
}
@@ -60,6 +69,7 @@
@Test
public void testDisallowConfigLocale_restrict() {
ReflectionHelpers.setField(mLocaleListEditor, "mIsUiRestricted", false);
+ mLocaleListEditor.onAttach(mContext);
mLocaleListEditor.onResume();
Assert.assertEquals(View.VISIBLE, mLocaleListEditor.getEmptyTextView().getVisibility());
}
diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
index 1e50770..1bae729 100644
--- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
@@ -30,6 +30,7 @@
import static org.mockito.Mockito.when;
import android.app.ActivityManager;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.content.Intent;
import android.content.pm.UserInfo;
@@ -42,6 +43,7 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.wrapper.LocationManagerWrapper;
import java.util.ArrayList;
import java.util.List;
import org.junit.Before;
@@ -52,11 +54,15 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH,
sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowSecureSettings.class})
+ shadows = {
+ ShadowSecureSettings.class,
+ LocationEnablerTest.ShadowLocationManagerWrapper.class})
public class LocationEnablerTest {
@Mock
@@ -66,6 +72,7 @@
private Context mContext;
private LocationEnabler mEnabler;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
@@ -73,7 +80,8 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mEnabler = spy(new LocationEnabler(mContext, mListener, mLifecycle));
}
@@ -121,7 +129,7 @@
}
@Test
- public void isEnabled_locationONotRestricted_shouldReturnTrue() {
+ public void isEnabled_locationNotRestricted_shouldReturnTrue() {
when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
assertThat(mEnabler.isEnabled(Settings.Secure.LOCATION_MODE_BATTERY_SAVING)).isTrue();
@@ -171,18 +179,45 @@
}
@Test
- public void setLocationMode_notRestricted_shouldBroadcastUpdate() {
+ public void setLocationMode_notRestricted_shouldBroadcastUpdateAndSetChanger() {
when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_BATTERY_SAVING);
-
mEnabler.setLocationMode(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
verify(mContext).sendBroadcastAsUser(
argThat(actionMatches(LocationManager.MODE_CHANGING_ACTION)),
eq(UserHandle.of(ActivityManager.getCurrentUser())),
eq(WRITE_SECURE_SETTINGS));
+ assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.LOCATION_CHANGER, Settings.Secure.LOCATION_CHANGER_UNKNOWN))
+ .isEqualTo(Settings.Secure.LOCATION_CHANGER_SYSTEM_SETTINGS);
+ }
+ @Test
+ public void setLocationEnabled_notRestricted_shouldRefreshLocation() {
+ when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+ mEnabler.setLocationEnabled(true);
+
+ verify(mEnabler).refreshLocationMode();
+ }
+
+ @Test
+ public void setLocationEnabled_notRestricted_shouldBroadcastUpdateAndSetChanger() {
+ when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+ mEnabler.setLocationEnabled(true);
+
+ verify(mContext).sendBroadcastAsUser(
+ argThat(actionMatches(LocationManager.MODE_CHANGING_ACTION)),
+ eq(UserHandle.of(ActivityManager.getCurrentUser())),
+ eq(WRITE_SECURE_SETTINGS));
+ assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.LOCATION_CHANGER, Settings.Secure.LOCATION_CHANGER_UNKNOWN))
+ .isEqualTo(Settings.Secure.LOCATION_CHANGER_SYSTEM_SETTINGS);
}
@Test
@@ -206,6 +241,23 @@
assertThat(mEnabler.isManagedProfileRestrictedByBase()).isTrue();
}
+ @Test
+ public void setRestriction_getShareLocationEnforcedAdmin_shouldReturnEnforcedAdmin() {
+ int userId = UserHandle.myUserId();
+ List<UserManager.EnforcingUser> enforcingUsers = new ArrayList<>();
+ // Add two enforcing users so that RestrictedLockUtils.checkIfRestrictionEnforced returns
+ // non-null.
+ enforcingUsers.add(new UserManager.EnforcingUser(userId,
+ UserManager.RESTRICTION_SOURCE_DEVICE_OWNER));
+ enforcingUsers.add(new UserManager.EnforcingUser(userId,
+ UserManager.RESTRICTION_SOURCE_PROFILE_OWNER));
+ when(mUserManager.getUserRestrictionSources(
+ UserManager.DISALLOW_CONFIG_LOCATION_MODE, UserHandle.of(userId)))
+ .thenReturn(enforcingUsers);
+
+ assertThat(mEnabler.getShareLocationEnforcedAdmin(userId) != null).isTrue();
+ }
+
private void mockManagedProfile() {
final List<UserHandle> userProfiles = new ArrayList<>();
final UserHandle userHandle = mock(UserHandle.class);
@@ -220,4 +272,13 @@
private static ArgumentMatcher<Intent> actionMatches(String expected) {
return intent -> TextUtils.equals(expected, intent.getAction());
}
+
+ @Implements(value = LocationManagerWrapper.class)
+ public static class ShadowLocationManagerWrapper {
+
+ @Implementation
+ public void setLocationEnabledForUser(boolean enabled, UserHandle userHandle) {
+ // Do nothing
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
index 97fdb83..5b2455f 100644
--- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
@@ -25,6 +25,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.content.pm.UserInfo;
import android.os.UserHandle;
@@ -68,6 +69,7 @@
private Context mContext;
private LocationForWorkPreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
@@ -75,7 +77,8 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = spy(new LocationForWorkPreferenceController(mContext, mLifecycle));
mockManagedProfile();
ReflectionHelpers.setField(mController, "mLocationEnabler", mEnabler);
diff --git a/tests/robotests/src/com/android/settings/location/LocationModeBatterySavingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeBatterySavingPreferenceControllerTest.java
deleted file mode 100644
index aa05cc6..0000000
--- a/tests/robotests/src/com/android/settings/location/LocationModeBatterySavingPreferenceControllerTest.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.location;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import com.android.settings.TestConfig;
-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.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LocationModeBatterySavingPreferenceControllerTest {
-
- private Lifecycle mLifecycle;
-
- @Before
- public void setUp() {
- mLifecycle = new Lifecycle(() -> mLifecycle);
- }
-
- @Test
- public void getLocationMode_shouldReturnModeBatterySaving() {
- final LocationModeBatterySavingPreferenceController controller =
- new LocationModeBatterySavingPreferenceController(mock(Context.class), mLifecycle);
-
- assertThat(controller.getLocationMode())
- .isEqualTo(Settings.Secure.LOCATION_MODE_BATTERY_SAVING);
- }
-
-}
diff --git a/tests/robotests/src/com/android/settings/location/LocationModeHighAccuracyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeHighAccuracyPreferenceControllerTest.java
deleted file mode 100644
index fd1bb02..0000000
--- a/tests/robotests/src/com/android/settings/location/LocationModeHighAccuracyPreferenceControllerTest.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.location;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import com.android.settings.TestConfig;
-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.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LocationModeHighAccuracyPreferenceControllerTest {
-
- private Lifecycle mLifecycle;
-
- @Before
- public void setUp() {
- mLifecycle = new Lifecycle(() -> mLifecycle);
- }
-
- @Test
- public void getLocationMode_shouldReturnModeHighAccuracy() {
- final LocationModeHighAccuracyPreferenceController controller =
- new LocationModeHighAccuracyPreferenceController(mock(Context.class), mLifecycle);
-
- assertThat(controller.getLocationMode())
- .isEqualTo(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
- }
-
-}
diff --git a/tests/robotests/src/com/android/settings/location/LocationModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModePreferenceControllerTest.java
deleted file mode 100644
index 5383ed3..0000000
--- a/tests/robotests/src/com/android/settings/location/LocationModePreferenceControllerTest.java
+++ /dev/null
@@ -1,138 +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 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;
-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.UserManager;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
-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.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LocationModePreferenceControllerTest {
-
- @Mock
- private LocationSettings mFragment;
- @Mock
- private SettingsActivity mActivity;
- @Mock
- private Preference mPreference;
- @Mock
- private PreferenceScreen mScreen;
- @Mock
- private UserManager mUserManager;
-
- private Context mContext;
- private LocationModePreferenceController mController;
- private Lifecycle mLifecycle;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- mLifecycle = new Lifecycle(() -> mLifecycle);
- mController = new LocationModePreferenceController(mContext, mFragment, mLifecycle);
- when(mFragment.getActivity()).thenReturn(mActivity);
- when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
- }
-
- @Test
- @Config(qualifiers = "mcc999")
- public void locationModePreference_ifXmlSetToFalse_shouldNotBeAvailable() {
- assertFalse(mController.isAvailable());
- }
-
- @Test
- public void locationModePreference_ifXmlSetToTrue_shouldBeAvailable() {
- assertTrue(mController.isAvailable());
- }
-
- @Test
- public void onLocationModeChanged_locationOff_shouldDisablePreference() {
- when(mUserManager.hasUserRestriction(any())).thenReturn(false);
- mController.displayPreference(mScreen);
-
- mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_OFF, false);
-
- verify(mPreference).setEnabled(false);
- }
-
- @Test
- public void onLocationModeChanged_restricted_shouldDisablePreference() {
- when(mUserManager.hasUserRestriction(any())).thenReturn(true);
- mController.displayPreference(mScreen);
-
- mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
-
- verify(mPreference).setEnabled(false);
- }
-
- @Test
- public void onLocationModeChanged_locationOnNotRestricted_shouldEnablePreference() {
- when(mUserManager.hasUserRestriction(any())).thenReturn(false);
- mController.displayPreference(mScreen);
-
- mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
-
- verify(mPreference).setEnabled(true);
- }
-
- @Test
- public void onLocationModeChanged_shouldUpdateSummary() {
- mController.displayPreference(mScreen);
-
- mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
-
- verify(mPreference).setSummary(anyInt());
- }
-
- @Test
- public void handlePreferenceTreeClick_shouldStartLocationModeFragment() {
- final Preference preference = new Preference(mContext);
- preference.setKey(mController.getPreferenceKey());
-
- mController.handlePreferenceTreeClick(preference);
-
- verify(mActivity).startPreferencePanel(any(), eq(LocationMode.class.getName()), any(),
- eq(R.string.location_mode_screen_title), any(), any(), anyInt());
- }
-
-}
diff --git a/tests/robotests/src/com/android/settings/location/LocationModeRadioButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeRadioButtonPreferenceControllerTest.java
deleted file mode 100644
index ae98acc..0000000
--- a/tests/robotests/src/com/android/settings/location/LocationModeRadioButtonPreferenceControllerTest.java
+++ /dev/null
@@ -1,137 +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 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 android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import com.android.settings.widget.RadioButtonPreference;
-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.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowSecureSettings.class})
-public class LocationModeRadioButtonPreferenceControllerTest {
-
- @Mock
- private RadioButtonPreference mPreference;
- @Mock
- private PreferenceScreen mScreen;
-
- private Context mContext;
- private LocationModeRadioButtonPreferenceController mController;
- private Lifecycle mLifecycle;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mLifecycle = new Lifecycle(() -> mLifecycle);
- mController = new LocationModeRadioButtonPreferenceControllerTestable(mContext, mLifecycle);
- when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
- }
-
- @Test
- public void displayPreference_shouldAddClickListener() {
- mController.displayPreference(mScreen);
-
- verify(mPreference).setOnClickListener(mController);
- }
-
- @Test
- public void onRadioButtonClicked_shouldSetLocationModeToOwnMode() {
- mController.displayPreference(mScreen);
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
-
- mController.onRadioButtonClicked(mPreference);
-
- assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF))
- .isEqualTo(mController.getLocationMode());
- }
-
- @Test
- public void onLocationModeChanged_otherModeSelected_shouldUncheckPreference() {
- mController.displayPreference(mScreen);
-
- mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
-
- verify(mPreference).setChecked(false);
- }
-
- @Test
- public void onLocationModeChanged_ownModeSelected_shouldCheckPreference() {
- mController.displayPreference(mScreen);
-
- mController.onLocationModeChanged(mController.getLocationMode(), false);
-
- verify(mPreference).setChecked(true);
- }
-
- @Test
- public void onLocationModeChanged_locationOff_shouldDisablePreference() {
- mController.displayPreference(mScreen);
-
- mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_OFF, false);
-
- verify(mPreference).setEnabled(false);
- }
-
- @Test
- public void onLocationModeChanged_locationOn_shouldDisablePreference() {
- mController.displayPreference(mScreen);
-
- mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
-
- verify(mPreference).setEnabled(true);
- }
-
- private class LocationModeRadioButtonPreferenceControllerTestable
- extends LocationModeRadioButtonPreferenceController {
-
- public LocationModeRadioButtonPreferenceControllerTestable(Context context,
- Lifecycle lifecycle) {
- super(context, lifecycle);
- }
-
- @Override
- public String getPreferenceKey() {
- return "test";
- }
-
- @Override
- protected int getLocationMode() {
- return Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
- }
- }
-}
diff --git a/tests/robotests/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceControllerTest.java
deleted file mode 100644
index 8561c97..0000000
--- a/tests/robotests/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceControllerTest.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.location;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import com.android.settings.TestConfig;
-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.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LocationModeSensorsOnlyPreferenceControllerTest {
-
- private Lifecycle mLifecycle;
-
- @Before
- public void setUp() {
- mLifecycle = new Lifecycle(() -> mLifecycle);
- }
-
- @Test
- public void getLocationMode_shouldReturnModeSensorsOnly() {
- final LocationModeSensorsOnlyPreferenceController controller =
- new LocationModeSensorsOnlyPreferenceController(mock(Context.class), mLifecycle);
-
- assertThat(controller.getLocationMode())
- .isEqualTo(Settings.Secure.LOCATION_MODE_SENSORS_ONLY);
- }
-
-}
diff --git a/tests/robotests/src/com/android/settings/location/LocationModeTest.java b/tests/robotests/src/com/android/settings/location/LocationModeTest.java
deleted file mode 100644
index 0e7a9d7..0000000
--- a/tests/robotests/src/com/android/settings/location/LocationModeTest.java
+++ /dev/null
@@ -1,73 +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 com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LocationModeTest {
-
- private Context mContext;
- private LocationMode mFragment;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- mFragment = new LocationMode();
- }
-
- @Test
- public void testSearchIndexProvider_shouldIndexResource() {
- final List<SearchIndexableResource> indexRes =
- mFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext,
- true /* enabled */);
-
- assertThat(indexRes).isNotNull();
- assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
- }
-
- @Test
- @Config(qualifiers = "mcc999")
- public void testSearchIndexProvider_ifPageDisabled_shouldNotIndexResource() {
- final List<String> niks = LocationMode.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(mContext);
- final int xmlId = mFragment.getPreferenceScreenResId();
-
- final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
- assertThat(niks).containsAllIn(keys);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
index fe45a93..e4aa075 100644
--- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
@@ -25,6 +25,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
@@ -62,6 +63,7 @@
@Mock
private PreferenceScreen mScreen;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private LocationPreferenceController mController;
@@ -71,7 +73,8 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = new LocationPreferenceController(mContext, mLifecycle);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@@ -106,45 +109,30 @@
}
@Test
- public void getLocationSummary_sensorsOnly_shouldSetSummarySensorsOnly() {
+ public void getLocationSummary_sensorsOnly_shouldSetSummaryOn() {
Secure.putInt(mContext.getContentResolver(),
Secure.LOCATION_MODE, Secure.LOCATION_MODE_SENSORS_ONLY);
assertThat(mController.getLocationSummary(mContext)).isEqualTo(
- mContext.getString(R.string.location_on_summary,
- mContext.getString(R.string.location_mode_sensors_only_title)));
+ mContext.getString(R.string.location_on_summary));
}
@Test
- public void getLocationSummary_highAccuracy_shouldSetSummarHighAccuracy() {
+ public void getLocationSummary_highAccuracy_shouldSetSummaryOn() {
Secure.putInt(mContext.getContentResolver(),
Secure.LOCATION_MODE, Secure.LOCATION_MODE_HIGH_ACCURACY);
assertThat(mController.getLocationSummary(mContext)).isEqualTo(
- mContext.getString(R.string.location_on_summary,
- mContext.getString(R.string.location_mode_high_accuracy_title)));
+ mContext.getString(R.string.location_on_summary));
}
@Test
- public void getLocationSummary_batterySaving_shouldSetSummaryBatterySaving() {
+ public void getLocationSummary_batterySaving_shouldSetSummaryOn() {
Secure.putInt(mContext.getContentResolver(),
Secure.LOCATION_MODE, Secure.LOCATION_MODE_BATTERY_SAVING);
assertThat(mController.getLocationSummary(mContext)).isEqualTo(
- mContext.getString(R.string.location_on_summary,
- mContext.getString(R.string.location_mode_battery_saving_title)));
- }
-
- @Test
- public void getLocationString_shouldCorrectString() {
- assertThat(mController.getLocationString(Secure.LOCATION_MODE_OFF)).isEqualTo(
- R.string.location_mode_location_off_title);
- assertThat(mController.getLocationString(Secure.LOCATION_MODE_SENSORS_ONLY)).isEqualTo(
- R.string.location_mode_sensors_only_title);
- assertThat(mController.getLocationString(Secure.LOCATION_MODE_BATTERY_SAVING)).isEqualTo(
- R.string.location_mode_battery_saving_title);
- assertThat(mController.getLocationString(Secure.LOCATION_MODE_HIGH_ACCURACY)).isEqualTo(
- R.string.location_mode_high_accuracy_title);
+ mContext.getString(R.string.location_on_summary));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java
new file mode 100644
index 0000000..7577ac1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.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.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LocationScanningPreferenceControllerTest {
+
+ private Context mContext;
+ private LocationScanningPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+ mController = new LocationScanningPreferenceController(mContext);
+ }
+
+ @Test
+ public void testLocationScanning_byDefault_shouldBeShown() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void testLocationScanning_ifDisabled_shouldNotBeShown() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
index caf15f8..51a375e 100644
--- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
@@ -25,6 +25,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.provider.Settings;
import android.support.v7.preference.Preference;
@@ -62,13 +63,15 @@
private Context mContext;
private LocationServicePreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = spy(new LocationServicePreferenceController(
mContext, mFragment, mLifecycle, mSettingsInjector));
final String key = mController.getPreferenceKey();
diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
index 35c0f82..4410d6f 100644
--- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
@@ -22,6 +22,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.provider.Settings;
@@ -54,6 +55,7 @@
private Context mContext;
private LocationSwitchBarController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
@@ -61,7 +63,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
ReflectionHelpers.setField(mSwitchBar, "mSwitch", mSwitch);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = spy(new LocationSwitchBarController(
mContext, mSwitchBar, mLifecycle));
ReflectionHelpers.setField(mController, "mLocationEnabler", mEnabler);
@@ -85,18 +88,17 @@
}
@Test
- public void onSwitchChanged_switchChecked_shouldSetPreviousLocationMode() {
+ public void onSwitchChanged_switchChecked_shouldSetLocationEnabled() {
mController.onSwitchChanged(mSwitch, true);
- verify(mEnabler).setLocationMode(
- android.provider.Settings.Secure.LOCATION_MODE_PREVIOUS);
+ verify(mEnabler).setLocationEnabled(true);
}
@Test
- public void onSwitchChanged_switchUnchecked_shouldSetLocationModeOff() {
+ public void onSwitchChanged_switchUnchecked_shouldSetLocationDisabled() {
mController.onSwitchChanged(mSwitch, false);
- verify(mEnabler).setLocationMode(android.provider.Settings.Secure.LOCATION_MODE_OFF);
+ verify(mEnabler).setLocationEnabled(false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
index a9794c2..f114ff3 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
@@ -25,6 +25,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.os.Bundle;
import android.provider.Settings;
@@ -33,6 +34,7 @@
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.FeatureFlagUtils;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.TestConfig;
@@ -44,8 +46,7 @@
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.location.RecentLocationApps;
import com.android.settingslib.location.RecentLocationApps.Request;
-import java.util.ArrayList;
-import java.util.List;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -57,6 +58,9 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import java.util.ArrayList;
+import java.util.List;
+
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RecentLocationRequestPreferenceControllerTest {
@@ -72,13 +76,15 @@
private Context mContext;
private RecentLocationRequestPreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = spy(new RecentLocationRequestPreferenceController(
mContext, mFragment, mLifecycle, mRecentLocationApps));
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mCategory);
diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
index 9dea6f5..320ae9e 100644
--- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
@@ -16,11 +16,12 @@
package com.android.settings.network;
-import static junit.framework.Assert.assertFalse;
+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.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.Resources;
@@ -37,25 +38,22 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AirplaneModePreferenceControllerTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
-
- @Mock
- private Resources mResources;
-
@Mock
private PreferenceScreen mScreen;
@Mock
private PackageManager mPackageManager;
+ private Context mContext;
private AirplaneModePreferenceController mController;
+ private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private FakeFeatureFactory mFactory;
@@ -63,17 +61,18 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mFactory = FakeFeatureFactory.setupForTest();
- doReturn(mResources).when(mContext).getResources();
+ mContext = spy(RuntimeEnvironment.application);
doReturn(mPackageManager).when(mContext).getPackageManager();
mController = spy(new AirplaneModePreferenceController(mContext, null));
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mLifecycle.addObserver(mController);
}
@Test
- public void airplaneModePreference_shouldNotBeAvailable_ifHasLeanbackFeature() {
- when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(true);
- assertFalse(mController.isAvailable());
+ @Config(qualifiers = "mcc999")
+ public void airplaneModePreference_shouldNotBeAvailable_ifSetToNotVisible() {
+ assertThat(mController.isAvailable()).isFalse();
mController.displayPreference(mScreen);
@@ -81,4 +80,22 @@
mController.onResume();
mController.onPause();
}
+
+ @Test
+ public void airplaneModePreference_shouldNotBeAvailable_ifHasLeanbackFeature() {
+ when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(true);
+ assertThat(mController.isAvailable()).isFalse();
+
+ mController.displayPreference(mScreen);
+
+ // This should not crash
+ mController.onResume();
+ mController.onPause();
+ }
+
+ @Test
+ public void airplaneModePreference_shouldBeAvailable_ifNoLeanbackFeature() {
+ when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(false);
+ assertThat(mController.isAvailable()).isTrue();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index d593b58..f070f7a 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -27,6 +27,7 @@
import static org.mockito.Mockito.when;
import static org.robolectric.shadow.api.Shadow.extract;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.net.ConnectivityManager;
import android.os.UserManager;
@@ -66,13 +67,15 @@
private PreferenceScreen mScreen;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
private MobileNetworkPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
when(mContext.getSystemService(Context.TELEPHONY_SERVICE))
.thenReturn(mTelephonyManager);
}
diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
index c35f1cf..d030531 100644
--- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
@@ -27,6 +27,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.IConnectivityManager;
@@ -65,6 +66,7 @@
private Preference mPreference;
private VpnPreferenceController mController;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
@Before
public void setUp() {
@@ -77,7 +79,8 @@
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
mController = spy(new VpnPreferenceController(mContext));
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mLifecycle.addObserver(mController);
}
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java
new file mode 100644
index 0000000..033c221
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.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.nfc;
+
+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.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class NfcForegroundPreferenceTest {
+ @Mock
+ private PaymentBackend mPaymentBackend;
+
+ private Context mContext;
+ private PreferenceScreen mScreen;
+ private NfcForegroundPreference mPreference;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mScreen = spy(new PreferenceScreen(mContext, null));
+ when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
+ when(mPaymentBackend.isForegroundMode()).thenReturn(false);
+ mPreference = new NfcForegroundPreference(mContext, mPaymentBackend);
+ mScreen.addPreference(mPreference);
+ }
+
+ @Test
+ public void testTogglingMode() {
+ String nfc_payment_favor_default = mContext.getString(R.string.nfc_payment_favor_default);
+ String nfc_payment_favor_open = mContext.getString(R.string.nfc_payment_favor_open);
+
+ assertThat(mPreference.getEntry()).isEqualTo(nfc_payment_favor_default);
+ assertThat(mPreference.getSummary()).isEqualTo(nfc_payment_favor_default);
+
+ mPreference.setValueIndex(0);
+ mPreference.callChangeListener(mPreference.getEntryValues()[0]);
+ verify(mPaymentBackend).setForegroundMode(true);
+ assertThat(mPreference.getEntry()).isEqualTo(nfc_payment_favor_open);
+ assertThat(mPreference.getSummary()).isEqualTo(nfc_payment_favor_open);
+
+ mPreference.setValueIndex(1);
+ mPreference.callChangeListener(mPreference.getEntryValues()[1]);
+ verify(mPaymentBackend).setForegroundMode(false);
+ assertThat(mPreference.getEntry()).isEqualTo(nfc_payment_favor_default);
+ assertThat(mPreference.getSummary()).isEqualTo(nfc_payment_favor_default);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
index 7b0b033..b2fbb00 100644
--- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
@@ -27,9 +27,12 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -37,19 +40,25 @@
public class AlarmVolumePreferenceControllerTest {
@Mock
- private Context mContext;
- @Mock
private AudioHelper mHelper;
+ private Context mContext;
private AlarmVolumePreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
mController = new AlarmVolumePreferenceController(mContext, null, null, mHelper);
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_isFalse() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void isAvailable_singleVolume_shouldReturnFalse() {
when(mHelper.isSingleVolume()).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
index 2b2d024..c24f02e 100644
--- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
@@ -31,11 +31,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.shadows.ShadowApplication;
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;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -50,15 +52,15 @@
private ContentResolver mContentResolver;
@Mock
private SoundSettings mSetting;
- @Mock
- private Context mContext;
+ private Context mContext;
private ChargingSoundPreferenceController mController;
private SwitchPreference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
@@ -68,11 +70,17 @@
}
@Test
- public void isAvailable_isAlwaysTrue() {
+ public void isAvailable_byDefault_isTrue() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_isFalse() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void displayPreference_chargingSoundEnabled_shouldCheckedPreference() {
Global.putInt(mContentResolver, Global.CHARGING_SOUNDS_ENABLED, 1);
diff --git a/tests/robotests/src/com/android/settings/notification/EnableZenModeDialogTest.java b/tests/robotests/src/com/android/settings/notification/EnableZenModeDialogTest.java
new file mode 100644
index 0000000..8b5ef79
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/EnableZenModeDialogTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
+import android.net.Uri;
+import android.service.notification.Condition;
+import android.view.LayoutInflater;
+
+import com.android.settings.TestConfig;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class EnableZenModeDialogTest {
+ private EnableZenModeDialog mController;
+
+ @Mock
+ private Context mContext;
+ @Mock
+ private Activity mActivity;
+ @Mock
+ private Fragment mFragment;
+
+ private Context mShadowContext;
+ private LayoutInflater mLayoutInflater;
+ private Condition mCountdownCondition;
+ private Condition mAlarmCondition;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mShadowContext = RuntimeEnvironment.application;
+ when(mActivity.getApplicationContext()).thenReturn(mShadowContext);
+ when(mContext.getApplicationContext()).thenReturn(mContext);
+ when(mFragment.getContext()).thenReturn(mShadowContext);
+ mLayoutInflater = LayoutInflater.from(mShadowContext);
+ when(mActivity.getLayoutInflater()).thenReturn(mLayoutInflater);
+
+ mController = spy(new EnableZenModeDialog());
+ mController.mContext = mContext;
+ mController.mActivity = mActivity;
+ mController.mForeverId = Condition.newId(mContext).appendPath("forever").build();
+ when(mContext.getString(com.android.internal.R.string.zen_mode_forever))
+ .thenReturn("testSummary");
+ mController.getContentView();
+
+ // these methods use static calls to ZenModeConfig which would normally fail in robotests,
+ // so instead do nothing:
+ doNothing().when(mController).bindGenericCountdown();
+ doReturn(null).when(mController).getTimeUntilNextAlarmCondition();
+ doNothing().when(mController).bindNextAlarm(any());
+
+ // as a result of doing nothing above, must bind manually:
+ Uri alarm = Condition.newId(mContext).appendPath("alarm").build();
+ mAlarmCondition = new Condition(alarm, "alarm", "", "", 0, 0, 0);
+ Uri countdown = Condition.newId(mContext).appendPath("countdown").build();
+ mCountdownCondition = new Condition(countdown, "countdown", "", "", 0, 0, 0);
+ mController.bind(mCountdownCondition,
+ mController.mZenRadioGroupContent.getChildAt(
+ EnableZenModeDialog.COUNTDOWN_CONDITION_INDEX),
+ EnableZenModeDialog.COUNTDOWN_CONDITION_INDEX);
+ mController.bind(mAlarmCondition,
+ mController.mZenRadioGroupContent.getChildAt(
+ EnableZenModeDialog.COUNTDOWN_ALARM_CONDITION_INDEX),
+ EnableZenModeDialog.COUNTDOWN_ALARM_CONDITION_INDEX);
+ }
+
+ @Test
+ public void testForeverChecked() {
+ mController.bindConditions(mController.forever());
+
+ assertTrue(mController.getConditionTagAt(EnableZenModeDialog.FOREVER_CONDITION_INDEX).rb
+ .isChecked());
+ assertFalse(mController.getConditionTagAt(EnableZenModeDialog.COUNTDOWN_CONDITION_INDEX).rb
+ .isChecked());
+ assertFalse(mController.getConditionTagAt(
+ EnableZenModeDialog.COUNTDOWN_ALARM_CONDITION_INDEX).rb.isChecked());
+ }
+
+ @Test
+ public void testNoneChecked() {
+ mController.bindConditions(null);
+ assertFalse(mController.getConditionTagAt(EnableZenModeDialog.FOREVER_CONDITION_INDEX).rb
+ .isChecked());
+ assertFalse(mController.getConditionTagAt(EnableZenModeDialog.COUNTDOWN_CONDITION_INDEX).rb
+ .isChecked());
+ assertFalse(mController.getConditionTagAt(
+ EnableZenModeDialog.COUNTDOWN_ALARM_CONDITION_INDEX).rb.isChecked());
+ }
+
+ @Test
+ public void testAlarmChecked() {
+ doReturn(false).when(mController).isCountdown(mAlarmCondition);
+ doReturn(true).when(mController).isAlarm(mAlarmCondition);
+
+ mController.bindConditions(mAlarmCondition);
+ assertFalse(mController.getConditionTagAt(EnableZenModeDialog.FOREVER_CONDITION_INDEX).rb
+ .isChecked());
+ assertFalse(mController.getConditionTagAt(EnableZenModeDialog.COUNTDOWN_CONDITION_INDEX).rb
+ .isChecked());
+ assertTrue(mController.getConditionTagAt(
+ EnableZenModeDialog.COUNTDOWN_ALARM_CONDITION_INDEX).rb.isChecked());
+ }
+
+ @Test
+ public void testCountdownChecked() {
+ doReturn(false).when(mController).isAlarm(mCountdownCondition);
+ doReturn(true).when(mController).isCountdown(mCountdownCondition);
+
+ mController.bindConditions(mCountdownCondition);
+ assertFalse(mController.getConditionTagAt(EnableZenModeDialog.FOREVER_CONDITION_INDEX).rb
+ .isChecked());
+ assertTrue(mController.getConditionTagAt(EnableZenModeDialog.COUNTDOWN_CONDITION_INDEX).rb
+ .isChecked());
+ assertFalse(mController.getConditionTagAt(
+ EnableZenModeDialog.COUNTDOWN_ALARM_CONDITION_INDEX).rb.isChecked());
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
index ca7fc44..688575a 100644
--- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
@@ -27,31 +27,39 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MediaVolumePreferenceControllerTest {
- @Mock
private Context mContext;
-
private MediaVolumePreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
mController = new MediaVolumePreferenceController(mContext, null, null);
}
@Test
- public void isAlwaysAvailable() {
+ public void isAvailable_byDefault_isTrue() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_isFalse() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void getAudioStream_shouldReturnMusic() {
assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_MUSIC);
}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
index 940a948..f712ec8 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
@@ -27,25 +27,39 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotificationRingtonePreferenceControllerTest {
- @Mock
private Context mContext;
private NotificationRingtonePreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
mController = new NotificationRingtonePreferenceController(mContext);
}
@Test
+ public void isAvailable_byDefault_isTrue() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_isFalse() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void getRingtoneType_shouldReturnNotification() {
assertThat(mController.getRingtoneType()).isEqualTo(RingtoneManager.TYPE_NOTIFICATION);
}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
index f919e7b..131fb18 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
@@ -29,9 +29,12 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -39,8 +42,6 @@
public class NotificationVolumePreferenceControllerTest {
@Mock
- private Context mContext;
- @Mock
private AudioHelper mHelper;
@Mock
private TelephonyManager mTelephonyManager;
@@ -49,11 +50,13 @@
@Mock
private Vibrator mVibrator;
+ private Context mContext;
private NotificationVolumePreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
when(mContext.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);
when(mContext.getSystemService(Context.VIBRATOR_SERVICE)).thenReturn(mVibrator);
@@ -61,6 +64,12 @@
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_shouldReturnFalse() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void isAvailable_singleVolume_shouldReturnFalse() {
when(mHelper.isSingleVolume()).thenReturn(true);
when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
new file mode 100644
index 0000000..a25bb00
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.argThat;
+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.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.service.notification.NotifyingApp;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatcher;
+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(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class RecentNotifyingAppsPreferenceControllerTest {
+
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private PreferenceCategory mCategory;
+ @Mock
+ private Preference mSeeAllPref;
+ @Mock
+ private PreferenceCategory mDivider;
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private ApplicationsState mAppState;
+ @Mock
+ private PackageManager mPackageManager;
+ @Mock
+ private ApplicationsState.AppEntry mAppEntry;
+ @Mock
+ private ApplicationInfo mApplicationInfo;
+ @Mock
+ private NotificationBackend mBackend;
+
+ private Context mContext;
+ private RecentNotifyingAppsPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
+ doReturn(mPackageManager).when(mContext).getPackageManager();
+
+ mController = new RecentNotifyingAppsPreferenceController(
+ mContext, mBackend, mAppState, null);
+ when(mScreen.findPreference(anyString())).thenReturn(mCategory);
+
+ when(mScreen.findPreference(RecentNotifyingAppsPreferenceController.KEY_SEE_ALL))
+ .thenReturn(mSeeAllPref);
+ when(mScreen.findPreference(RecentNotifyingAppsPreferenceController.KEY_DIVIDER))
+ .thenReturn(mDivider);
+ when(mCategory.getContext()).thenReturn(mContext);
+ }
+
+ @Test
+ public void isAlwaysAvailable() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void doNotIndexCategory() {
+ final List<String> nonIndexable = new ArrayList<>();
+
+ mController.updateNonIndexableKeys(nonIndexable);
+
+ assertThat(nonIndexable).containsAllOf(mController.getPreferenceKey(),
+ RecentNotifyingAppsPreferenceController.KEY_DIVIDER);
+ }
+
+ @Test
+ public void onDisplayAndUpdateState_shouldRefreshUi() {
+ mController = spy(new RecentNotifyingAppsPreferenceController(
+ mContext, null, (ApplicationsState) null, null));
+
+ doNothing().when(mController).refreshUi(mContext);
+
+ mController.displayPreference(mScreen);
+ mController.updateState(mCategory);
+
+ verify(mController, times(2)).refreshUi(mContext);
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void display_shouldNotShowRecents_showAppInfoPreference() {
+ 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);
+ verify(mDivider).setVisible(false);
+ }
+
+ @Test
+ public void display_showRecents() {
+ final List<NotifyingApp> apps = new ArrayList<>();
+ final NotifyingApp app1 = new NotifyingApp()
+ .setPackage("pkg.class")
+ .setLastNotified(System.currentTimeMillis());
+ final NotifyingApp app2 = new NotifyingApp()
+ .setLastNotified(System.currentTimeMillis())
+ .setPackage("com.android.settings");
+ final NotifyingApp app3 = new NotifyingApp()
+ .setLastNotified(System.currentTimeMillis() - 1000)
+ .setPackage("pkg.class2");
+
+ apps.add(app1);
+ apps.add(app2);
+ apps.add(app3);
+
+ // app1, app2 are valid apps. app3 is invalid.
+ when(mAppState.getEntry(app1.getPackage(), UserHandle.myUserId()))
+ .thenReturn(mAppEntry);
+ when(mAppState.getEntry(app2.getPackage(), UserHandle.myUserId()))
+ .thenReturn(mAppEntry);
+ when(mAppState.getEntry(app3.getPackage(), UserHandle.myUserId()))
+ .thenReturn(null);
+ when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn(
+ new ResolveInfo());
+ when(mBackend.getRecentApps()).thenReturn(apps);
+ mAppEntry.info = mApplicationInfo;
+
+ 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));
+
+ verify(mSeeAllPref).setSummary(null);
+ verify(mSeeAllPref).setIcon(R.drawable.ic_chevron_right_24dp);
+ verify(mDivider).setVisible(true);
+ }
+
+ @Test
+ public void display_showRecentsWithInstantApp() {
+ // Regular app.
+ final List<NotifyingApp> apps = new ArrayList<>();
+ final NotifyingApp app1 = new NotifyingApp().
+ setLastNotified(System.currentTimeMillis())
+ .setPackage("com.foo.bar");
+ apps.add(app1);
+
+ // Instant app.
+ final NotifyingApp app2 = new NotifyingApp()
+ .setLastNotified(System.currentTimeMillis() + 200)
+ .setPackage("com.foo.barinstant");
+ apps.add(app2);
+
+ ApplicationsState.AppEntry app1Entry = mock(ApplicationsState.AppEntry.class);
+ ApplicationsState.AppEntry app2Entry = mock(ApplicationsState.AppEntry.class);
+ app1Entry.info = mApplicationInfo;
+ app2Entry.info = mApplicationInfo;
+
+ when(mAppState.getEntry(app1.getPackage(), UserHandle.myUserId())).thenReturn(app1Entry);
+ when(mAppState.getEntry(app2.getPackage(), UserHandle.myUserId())).thenReturn(app2Entry);
+
+ // Only the regular app app1 should have its intent resolve.
+ when(mPackageManager.resolveActivity(argThat(intentMatcher(app1.getPackage())),
+ anyInt())).thenReturn(new ResolveInfo());
+
+ when(mBackend.getRecentApps()).thenReturn(apps);
+
+ // Make sure app2 is considered an instant app.
+ ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+ (InstantAppDataProvider) (ApplicationInfo info) -> {
+ if (info == app2Entry.info) {
+ return true;
+ } else {
+ return false;
+ }
+ });
+
+ mController.displayPreference(mScreen);
+
+ ArgumentCaptor<Preference> prefCaptor = ArgumentCaptor.forClass(Preference.class);
+ verify(mCategory, times(2)).addPreference(prefCaptor.capture());
+ List<Preference> prefs = prefCaptor.getAllValues();
+ assertThat(prefs.get(1).getKey()).isEqualTo(app1.getPackage());
+ assertThat(prefs.get(0).getKey()).isEqualTo(app2.getPackage());
+ }
+
+ @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()
+ .setLastNotified(System.currentTimeMillis())
+ .setPackage("pkg.class");
+ apps.add(app1);
+
+ when(mAppState.getEntry(app1.getPackage(), UserHandle.myUserId()))
+ .thenReturn(mAppEntry);
+ when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn(
+ new ResolveInfo());
+ when(mBackend.getRecentApps()).thenReturn(apps);
+ mAppEntry.info = mApplicationInfo;
+
+ mController.displayPreference(mScreen);
+
+ verify(mCategory).addPreference(argThat(summaryMatches("0 min. ago")));
+ }
+
+ private static ArgumentMatcher<Preference> summaryMatches(String expected) {
+ return preference -> TextUtils.equals(expected, preference.getSummary());
+ }
+
+ // Used for matching an intent with a specific package name.
+ private static ArgumentMatcher<Intent> intentMatcher(String packageName) {
+ return intent -> packageName.equals(intent.getPackage());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
index f94f8bf..e6a8718 100644
--- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
@@ -31,11 +31,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.shadows.ShadowApplication;
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;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -50,15 +52,15 @@
private ContentResolver mContentResolver;
@Mock
private SoundSettings mSetting;
- @Mock
- private Context mContext;
+ private Context mContext;
private ScreenLockSoundPreferenceController mController;
private SwitchPreference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
@@ -68,11 +70,17 @@
}
@Test
- public void isAvailable_isAlwaysTrue() {
+ public void isAvailable_byDefault_isTrue() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_isFalse() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void displayPreference_lockScreenSoundEnabled_shouldCheckedPreference() {
System.putInt(mContentResolver, System.LOCKSCREEN_SOUNDS_ENABLED, 1);
diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
index 9025979..33d5073 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
@@ -20,14 +20,11 @@
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;
-import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -50,8 +47,10 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.RestrictedLockUtils;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -62,7 +61,9 @@
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
+ SettingsShadowResources.class
+})
public class SoundPreferenceControllerTest {
private Context mContext;
@@ -87,11 +88,18 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+ SettingsShadowResources.overrideResource(com.android.internal.R.string.ringtone_silent,
+ "silent");
mContext = shadowApplication.getApplicationContext();
mController = spy(new SoundPreferenceController(
mContext, mFragment, mImportanceListener, mBackend));
}
+ @After
+ public void tearDown() {
+ SettingsShadowResources.reset();
+ }
+
@Test
public void testNoCrashIfNoOnResume() throws Exception {
mController.isAvailable();
diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
index eaf9bb5..d9145ff 100644
--- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
@@ -32,11 +32,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.shadows.ShadowApplication;
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;
@@ -54,15 +56,15 @@
private ContentResolver mContentResolver;
@Mock
private SoundSettings mSetting;
- @Mock
- private Context mContext;
+ private Context mContext;
private TouchSoundPreferenceController mController;
private SwitchPreference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
when(mActivity.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
@@ -73,11 +75,17 @@
}
@Test
- public void isAvailable_isAlwaysTrue() {
+ public void isAvailable_byDefault_isTrue() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_isFalse() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
public void displayPreference_soundEffectEnabled_shouldCheckedPreference() {
System.putInt(mContentResolver, System.SOUND_EFFECTS_ENABLED, 1);
diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
index c18372c..25dba80 100644
--- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
@@ -47,6 +47,7 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.RestrictedListPreference;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowRestrictionUtils;
@@ -115,8 +116,8 @@
@Test
public void testNoCrashIfNoOnResume() throws Exception {
mController.isAvailable();
- mController.updateState(mock(RestrictedDropDownPreference.class));
- mController.onPreferenceChange(mock(RestrictedDropDownPreference.class), true);
+ mController.updateState(mock(RestrictedListPreference.class));
+ mController.onPreferenceChange(mock(RestrictedListPreference.class), true);
}
@Test
@@ -165,7 +166,7 @@
mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
RestrictedLockUtils.EnforcedAdmin.class));
- RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+ RestrictedListPreference pref = mock(RestrictedListPreference.class);
mController.updateState(pref);
verify(pref, times(2)).addRestrictedItem(any());
@@ -187,7 +188,7 @@
mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
RestrictedLockUtils.EnforcedAdmin.class));
- RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+ RestrictedListPreference pref = mock(RestrictedListPreference.class);
mController.updateState(pref);
verify(pref, times(1)).addRestrictedItem(any());
@@ -202,7 +203,7 @@
NotificationChannel channel = mock(NotificationChannel.class);
mController.onResume(appRow, channel, null, null);
- RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+ RestrictedListPreference pref = mock(RestrictedListPreference.class);
mController.updateState(pref);
ArgumentCaptor<CharSequence[]> argumentCaptor =
@@ -221,7 +222,7 @@
NotificationChannel channel = mock(NotificationChannel.class);
mController.onResume(appRow, channel, null, null);
- RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+ RestrictedListPreference pref = mock(RestrictedListPreference.class);
mController.updateState(pref);
ArgumentCaptor<CharSequence[]> argumentCaptor =
@@ -237,7 +238,7 @@
NotificationChannel channel = mock(NotificationChannel.class);
mController.onResume(appRow, channel, null, null);
- RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+ RestrictedListPreference pref = mock(RestrictedListPreference.class);
mController.updateState(pref);
ArgumentCaptor<CharSequence[]> argumentCaptor =
@@ -268,7 +269,7 @@
when(channel.getLockscreenVisibility()).thenReturn(VISIBILITY_NO_OVERRIDE);
mController.onResume(appRow, channel, null, null);
- RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+ RestrictedListPreference pref = mock(RestrictedListPreference.class);
mController.updateState(pref);
ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class);
@@ -287,7 +288,7 @@
when(channel.getLockscreenVisibility()).thenReturn(Notification.VISIBILITY_SECRET);
mController.onResume(appRow, channel, null, null);
- RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+ RestrictedListPreference pref = mock(RestrictedListPreference.class);
mController.updateState(pref);
ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class);
@@ -306,7 +307,7 @@
channel.setLockscreenVisibility(Notification.VISIBILITY_SECRET);
mController.onResume(appRow, channel, null, null);
- RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+ RestrictedListPreference pref = mock(RestrictedListPreference.class);
mController.updateState(pref);
mController.onPreferenceChange(pref, String.valueOf(Notification.VISIBILITY_PRIVATE));
@@ -325,7 +326,7 @@
channel.setLockscreenVisibility(VISIBILITY_NO_OVERRIDE);
mController.onResume(appRow, channel, null, null);
- RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+ RestrictedListPreference pref = mock(RestrictedListPreference.class);
mController.updateState(pref);
mController.onPreferenceChange(pref, String.valueOf(Notification.VISIBILITY_SECRET));
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
index 862b8d0..ed42890 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.FragmentManager;
import android.app.NotificationManager;
import android.content.ContentResolver;
import android.content.Context;
@@ -79,7 +80,8 @@
mContext = shadowApplication.getApplicationContext();
mContentResolver = RuntimeEnvironment.application.getContentResolver();
- mController = new ZenModeButtonPreferenceController(mContext, mock(Lifecycle.class));
+ mController = new ZenModeButtonPreferenceController(mContext, mock(Lifecycle.class),
+ mock(FragmentManager.class));
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
ReflectionHelpers.setField(mController, "mBackend", mBackend);
ReflectionHelpers.setField(mController, "mZenButtonOn", mZenButtonOn);
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
index 21eea0e..18f9e71 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
@@ -21,9 +21,6 @@
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
-import static junit.framework.Assert.assertEquals;
-
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -32,7 +29,7 @@
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
-import android.support.v7.preference.Preference;
+import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
@@ -45,9 +42,9 @@
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.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -60,7 +57,7 @@
@Mock
private NotificationManager mNotificationManager;
@Mock
- private Preference mockPref;
+ private ListPreference mockPref;
@Mock
private NotificationManager.Policy mPolicy;
@Mock
@@ -68,6 +65,15 @@
private ContentResolver mContentResolver;
private Context mContext;
+ /**
+ * Array Values Key
+ * 0: anyone
+ * 1: contacts
+ * 2: starred
+ * 3: none
+ */
+ private String[] mValues;
+
private final boolean CALLS_SETTINGS = true;
private final int MOCK_CALLS_SENDERS = NotificationManager.Policy.PRIORITY_SENDERS_STARRED;
private final int SUMMARY_ID_MOCK_CALLS_SENDERS = R.string.zen_mode_from_starred;
@@ -79,8 +85,11 @@
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
mContext = shadowApplication.getApplicationContext();
+ mValues = mContext.getResources().getStringArray(R.array.zen_mode_contacts_values);
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+
+ when(mBackend.getPriorityCallSenders()).thenReturn(MOCK_CALLS_SENDERS);
when(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE))
.thenCallRealMethod();
when(mBackend.getContactsSummary(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
@@ -97,10 +106,11 @@
@Test
public void updateState_TotalSilence() {
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
+
when(mBackend.isPriorityCategoryEnabled(
- NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
+ NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
.thenReturn(false);
- final Preference mockPref = mock(Preference.class);
+ final ListPreference mockPref = mock(ListPreference.class);
mController.updateState(mockPref);
verify(mockPref).setEnabled(false);
@@ -111,7 +121,7 @@
public void updateState_AlarmsOnly() {
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
- final Preference mockPref = mock(Preference.class);
+ final ListPreference mockPref = mock(ListPreference.class);
mController.updateState(mockPref);
verify(mockPref).setEnabled(false);
@@ -121,14 +131,53 @@
@Test
public void updateState_Priority() {
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+
when(mBackend.isPriorityCategoryEnabled(
NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
.thenReturn(CALLS_SETTINGS);
- when(mBackend.getPriorityCallSenders()).thenReturn(MOCK_CALLS_SENDERS);
mController.updateState(mockPref);
verify(mockPref).setEnabled(true);
verify(mockPref).setSummary(SUMMARY_ID_MOCK_CALLS_SENDERS);
}
+
+ @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/ZenModeCallsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsTest.java
deleted file mode 100644
index 8ed0075..0000000
--- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsTest.java
+++ /dev/null
@@ -1,126 +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 static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.os.UserManager;
-import android.provider.Settings;
-
-import com.android.settings.TestConfig;
-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.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ZenModeCallsTest {
- private ZenModeCallsSettings mCalls;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private ZenModeBackend mBackend;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Activity mActivity;
- @Mock
- private UserManager mUserManager;
- @Mock
- private NotificationManager mNotificationManager;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- when(mActivity.getSystemService(Context.NOTIFICATION_SERVICE))
- .thenReturn(mNotificationManager);
- FakeFeatureFactory.setupForTest();
-
- mCalls = new ZenModeCallsSettings();
- mCalls.onAttach((Context)mActivity);
-
- ReflectionHelpers.setField(mCalls, "mBackend", mBackend);
- }
-
- @Test
- public void getDefaultKeyReturnsBasedOnZen() {
- when(mBackend.getSendersKey(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
- .thenCallRealMethod();
- when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_NO_INTERRUPTIONS);
- assertThat(mCalls.getDefaultKey())
- .isEqualTo(mBackend.getKeyFromSetting(mBackend.SOURCE_NONE));
-
- when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_ALARMS);
- assertThat(mCalls.getDefaultKey())
- .isEqualTo(mBackend.getKeyFromSetting(mBackend.SOURCE_NONE));
-
- when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- when(mBackend.isPriorityCategoryEnabled(
- NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
- .thenReturn(true);
- when(mBackend.getPriorityMessageSenders())
- .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_ANY);
- assertThat(mCalls.getDefaultKey())
- .isEqualTo(mBackend.getKeyFromSetting(
- NotificationManager.Policy.PRIORITY_SENDERS_ANY));
- }
-
- @Test
- public void setAnySender() {
- String key = mBackend.getKeyFromSetting(NotificationManager.Policy.PRIORITY_SENDERS_ANY);
- mCalls.setDefaultKey(key);
- verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
- mBackend.getSettingFromPrefKey(key));
- }
-
- @Test
- public void setNoSender() {
- String key = mBackend.getKeyFromSetting(ZenModeBackend.SOURCE_NONE);
- mCalls.setDefaultKey(key);
- verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
- mBackend.getSettingFromPrefKey(key));
- }
-
- @Test
- public void setStarredSenders() {
- String key = mBackend.getKeyFromSetting(
- NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
- mCalls.setDefaultKey(key);
- verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
- mBackend.getSettingFromPrefKey(key));
- }
-
- @Test
- public void setContactsOnlySenders() {
- String key = mBackend.getKeyFromSetting(
- NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS);
- mCalls.setDefaultKey(key);
- verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
- mBackend.getSettingFromPrefKey(key));
- }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
index 9625623..460534e 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
@@ -21,9 +21,6 @@
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
-import static junit.framework.Assert.assertEquals;
-
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -32,6 +29,7 @@
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
+import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -45,9 +43,9 @@
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.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -60,7 +58,7 @@
@Mock
private NotificationManager mNotificationManager;
@Mock
- private Preference mockPref;
+ private ListPreference mockPref;
@Mock
private NotificationManager.Policy mPolicy;
@Mock
@@ -68,6 +66,15 @@
private ContentResolver mContentResolver;
private Context mContext;
+ /**
+ * Array Values Key
+ * 0: anyone
+ * 1: contacts
+ * 2: starred
+ * 3: none
+ */
+ private String[] mValues;
+
private final boolean MESSAGES_SETTINGS = true;
private final int MOCK_MESSAGES_SENDERS = NotificationManager.Policy.PRIORITY_SENDERS_STARRED;
private final int SUMMARY_ID_MOCK_MESSAGES_SENDERS = R.string.zen_mode_from_starred;
@@ -79,6 +86,7 @@
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
mContext = shadowApplication.getApplicationContext();
+ mValues = mContext.getResources().getStringArray(R.array.zen_mode_contacts_values);
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
@@ -103,7 +111,7 @@
when(mBackend.isPriorityCategoryEnabled(
NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
.thenReturn(false);
- final Preference mockPref = mock(Preference.class);
+ final ListPreference mockPref = mock(ListPreference.class);
mController.updateState(mockPref);
verify(mockPref).setEnabled(false);
@@ -114,7 +122,7 @@
public void updateState_AlarmsOnly() {
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
- final Preference mockPref = mock(Preference.class);
+ final ListPreference mockPref = mock(ListPreference.class);
mController.updateState(mockPref);
verify(mockPref).setEnabled(false);
@@ -134,4 +142,43 @@
verify(mockPref).setEnabled(true);
verify(mockPref).setSummary(SUMMARY_ID_MOCK_MESSAGES_SENDERS);
}
+
+ @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/ZenModeMessagesTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesTest.java
deleted file mode 100644
index 181a238..0000000
--- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesTest.java
+++ /dev/null
@@ -1,126 +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 static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.os.UserManager;
-import android.provider.Settings;
-
-import com.android.settings.TestConfig;
-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.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ZenModeMessagesTest {
- private ZenModeMessagesSettings mMessages;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private ZenModeBackend mBackend;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Activity mActivity;
- @Mock
- private UserManager mUserManager;
- @Mock
- private NotificationManager mNotificationManager;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- when(mActivity.getSystemService(Context.NOTIFICATION_SERVICE))
- .thenReturn(mNotificationManager);
- FakeFeatureFactory.setupForTest();
-
- mMessages = new ZenModeMessagesSettings();
- mMessages.onAttach((Context)mActivity);
-
- ReflectionHelpers.setField(mMessages, "mBackend", mBackend);
- }
-
- @Test
- public void getDefaultKeyReturnsBasedOnZen() {
- when(mBackend.getSendersKey(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
- .thenCallRealMethod();
- when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_NO_INTERRUPTIONS);
- assertThat(mMessages.getDefaultKey())
- .isEqualTo(mBackend.getKeyFromSetting(mBackend.SOURCE_NONE));
-
- when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_ALARMS);
- assertThat(mMessages.getDefaultKey())
- .isEqualTo(mBackend.getKeyFromSetting(mBackend.SOURCE_NONE));
-
- when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- when(mBackend.isPriorityCategoryEnabled(
- NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
- .thenReturn(true);
- when(mBackend.getPriorityMessageSenders())
- .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_ANY);
- assertThat(mMessages.getDefaultKey())
- .isEqualTo(mBackend.getKeyFromSetting(
- NotificationManager.Policy.PRIORITY_SENDERS_ANY));
- }
-
- @Test
- public void setAnySender() {
- String key = mBackend.getKeyFromSetting(NotificationManager.Policy.PRIORITY_SENDERS_ANY);
- mMessages.setDefaultKey(key);
- verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
- mBackend.getSettingFromPrefKey(key));
- }
-
- @Test
- public void setNoSender() {
- String key = mBackend.getKeyFromSetting(ZenModeBackend.SOURCE_NONE);
- mMessages.setDefaultKey(key);
- verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
- mBackend.getSettingFromPrefKey(key));
- }
-
- @Test
- public void setStarredSenders() {
- String key = mBackend.getKeyFromSetting(
- NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
- mMessages.setDefaultKey(key);
- verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
- mBackend.getSettingFromPrefKey(key));
- }
-
- @Test
- public void setContactsOnlySenders() {
- String key = mBackend.getKeyFromSetting(
- NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS);
- mMessages.setDefaultKey(key);
- verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
- mBackend.getSettingFromPrefKey(key));
- }
-}
\ 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 ba52ce2..a7ea4c9 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
@@ -78,7 +78,8 @@
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
- mController = new ZenModeRepeatCallersPreferenceController(mContext, mock(Lifecycle.class));
+ mController = new ZenModeRepeatCallersPreferenceController(mContext, mock(Lifecycle.class),
+ 15);
ReflectionHelpers.setField(mController, "mBackend", mBackend);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index cd5fcc2..a34c106 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -137,6 +137,8 @@
ShadowActivity shadowActivity = shadowOf(activity);
final Intent nextStartedActivity = shadowActivity.getNextStartedActivity();
assertThat(nextStartedActivity).isNotNull();
+ assertThat(nextStartedActivity.getBooleanExtra(
+ ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false)).isTrue();
assertThat(nextStartedActivity.getStringExtra("foo")).named("Foo extra")
.isEqualTo("bar");
}
diff --git a/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultFutureTaskTest.java b/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultFutureTaskTest.java
deleted file mode 100644
index b4f07d7..0000000
--- a/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultFutureTaskTest.java
+++ /dev/null
@@ -1,121 +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.search;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.UserManager;
-import android.view.accessibility.AccessibilityManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-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.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AccessibilityServiceResultFutureTaskTest {
-
- private static final String QUERY = "test_query";
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
- @Mock
- private PackageManager mPackageManager;
- @Mock
- private AccessibilityManager mAccessibilityManager;
- @Mock
- private SiteMapManager mSiteMapManager;
- @Mock
- private UserManager mUserManager;
-
- private AccessibilityServiceResultLoader.AccessibilityServiceResultCallable mCallable;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- when(mContext.getSystemService(Context.ACCESSIBILITY_SERVICE))
- .thenReturn(mAccessibilityManager);
- when((Object)mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
- when(mContext.getPackageManager()).thenReturn(mPackageManager);
-
- mCallable = new AccessibilityServiceResultLoader.AccessibilityServiceResultCallable(
- mContext, QUERY, mSiteMapManager);
- }
-
- @Test
- public void query_noService_shouldNotReturnAnything() throws Exception {
- assertThat(mCallable.call()).isEmpty();
- }
-
- @Test
- public void query_hasServiceMatchingTitle_shouldReturnResult() throws Exception {
- addFakeAccessibilityService();
-
- List<? extends SearchResult> results = mCallable.call();
- assertThat(results).hasSize(1);
-
- SearchResult result = results.get(0);
- assertThat(result.title).isEqualTo(QUERY);
- }
-
- @Test
- public void query_serviceDoesNotMatchTitle_shouldReturnResult() throws Exception {
- addFakeAccessibilityService();
-
- mCallable = new AccessibilityServiceResultLoader.AccessibilityServiceResultCallable(
- mContext,
- QUERY + "no_match", mSiteMapManager);
-
- assertThat(mCallable.call()).isEmpty();
- }
-
- private void addFakeAccessibilityService() {
- final List<AccessibilityServiceInfo> services = new ArrayList<>();
- final AccessibilityServiceInfo info = mock(AccessibilityServiceInfo.class);
- final ResolveInfo resolveInfo = mock(ResolveInfo.class);
- when(info.getResolveInfo()).thenReturn(resolveInfo);
- when(resolveInfo.loadIcon(mPackageManager)).thenReturn(new ColorDrawable(Color.BLUE));
- when(resolveInfo.loadLabel(mPackageManager)).thenReturn(QUERY);
- resolveInfo.serviceInfo = new ServiceInfo();
- resolveInfo.serviceInfo.packageName = "pkg";
- resolveInfo.serviceInfo.name = "class";
- services.add(info);
-
- when(mAccessibilityManager.getInstalledAccessibilityServiceList()).thenReturn(services);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
index cd62c15..a1cafc5 100644
--- a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
+++ b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
@@ -29,7 +29,6 @@
import com.android.settings.DisplaySettings;
import com.android.settings.R;
import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
import com.android.settings.gestures.SwipeToNotificationSettings;
import com.android.settings.search.ResultPayload.Availability;
import com.android.settings.search.ResultPayload.PayloadType;
@@ -40,8 +39,6 @@
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
@@ -69,8 +66,6 @@
sIntent = new Intent("com.android.settings");
}
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private SiteMapManager mSiteMapManager;
private Drawable mDrawable;
private CursorToSearchResultConverter mConverter;
@@ -83,52 +78,11 @@
}
@Test
- public void testParseNullResults_ReturnsNull() {
- final Set<SearchResult> results = mConverter.convertCursor(
- mSiteMapManager, null, BASE_RANK);
- assertThat(results).isNull();
- }
-
- @Test
- public void testParseCursor_NotNull() {
- final Set<SearchResult> results = mConverter.convertCursor(
- mSiteMapManager, getDummyCursor(), BASE_RANK);
- assertThat(results).isNotNull();
- }
-
- @Test
- public void testParseCursor_MatchesRank() {
- final Set<SearchResult> results = mConverter.convertCursor(
- mSiteMapManager, getDummyCursor(), BASE_RANK);
- for (SearchResult result : results) {
- assertThat(result.rank).isEqualTo(BASE_RANK);
- }
- }
-
- @Test
- public void testParseCursor_MatchesTitle() {
- final Set<SearchResult> results = mConverter.convertCursor(
- mSiteMapManager, getDummyCursor(), BASE_RANK);
- for (SearchResult result : results) {
- assertThat(TITLES).contains(result.title);
- }
- }
-
- @Test
- public void testParseCursor_MatchesSummary() {
- final Set<SearchResult> results = mConverter.convertCursor(
- mSiteMapManager, getDummyCursor(), BASE_RANK);
- for (SearchResult result : results) {
- assertThat(result.summary).isEqualTo(SUMMARY);
- }
- }
-
- @Test
public void testParseCursor_MatchesIcon() {
final MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(sIntent));
final String BLANK = "";
- cursor.addRow(new Object[]{
+ cursor.addRow(new Object[] {
KEY.hashCode(), // Doc ID
"Longer than 20 characters", // Title
SUMMARY, // Summary on
@@ -144,8 +98,7 @@
payload // Payload
});
- final Set<SearchResult> results = mConverter.convertCursor(
- mSiteMapManager, cursor, BASE_RANK);
+ final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
Drawable resultDrawable = result.icon;
@@ -157,7 +110,7 @@
@Test
public void testParseCursor_NoIcon() {
final Set<SearchResult> results = mConverter.convertCursor(
- mSiteMapManager, getDummyCursor("noIcon" /* key */, "" /* className */), BASE_RANK);
+ getDummyCursor("noIcon" /* key */, "" /* className */), BASE_RANK);
for (SearchResult result : results) {
assertThat(result.icon).isNull();
}
@@ -165,8 +118,7 @@
@Test
public void testParseCursor_MatchesPayloadType() {
- final Set<SearchResult> results = mConverter.convertCursor(
- mSiteMapManager, getDummyCursor(), BASE_RANK);
+ final Set<SearchResult> results = mConverter.convertCursor(getDummyCursor(), BASE_RANK);
ResultPayload payload;
for (SearchResult result : results) {
payload = result.payload;
@@ -179,7 +131,7 @@
final MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(sIntent));
final String BLANK = "";
- cursor.addRow(new Object[]{
+ cursor.addRow(new Object[] {
KEY.hashCode(), // Doc ID
"Longer than 20 characters", // Title
SUMMARY, // Summary on
@@ -194,8 +146,7 @@
PayloadType.INTENT, // Payload Type
payload // Payload
});
- final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
- BASE_RANK);
+ final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(BASE_RANK + 1);
}
@@ -203,8 +154,7 @@
@Test
public void testParseCursor_MatchesResultPayload() {
- final Set<SearchResult> results = mConverter.convertCursor(
- mSiteMapManager, getDummyCursor(), BASE_RANK);
+ final Set<SearchResult> results = mConverter.convertCursor(getDummyCursor(), BASE_RANK);
ResultPayload payload;
for (SearchResult result : results) {
payload = result.payload;
@@ -228,7 +178,7 @@
final InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, 1 /* onValue */,
intent, true /* isDeviceSupported */, 0 /* defautValue */);
- cursor.addRow(new Object[]{
+ cursor.addRow(new Object[] {
KEY.hashCode(), // Doc ID
TITLES.get(0), // Title
SUMMARY, // Summary on
@@ -243,8 +193,7 @@
type, // Payload Type
ResultPayloadUtils.marshall(payload) // Payload
});
- final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
- BASE_RANK);
+ final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
final InlineSwitchPayload newPayload = (InlineSwitchPayload) result.payload;
@@ -264,9 +213,8 @@
@Test
public void testWifiKey_PrioritizedResult() {
final String key = "main_toggle_wifi";
- final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
- final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
- BASE_RANK);
+ final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
+ final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -276,9 +224,8 @@
@Test
public void testBluetoothKey_PrioritizedResult() {
final String key = "main_toggle_bluetooth";
- final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
- final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
- BASE_RANK);
+ final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
+ final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -288,8 +235,8 @@
@Test
public void testAirplaneKey_PrioritizedResult() {
final String key = "toggle_airplane";
- final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
- Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+ final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
+ Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
}
@@ -298,9 +245,8 @@
@Test
public void testHotspotKey_PrioritizedResult() {
final String key = "tether_settings";
- final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
- final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
- BASE_RANK);
+ final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
+ final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -310,9 +256,8 @@
@Test
public void testBatterySaverKey_PrioritizedResult() {
final String key = "battery_saver";
- final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
- final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
- BASE_RANK);
+ final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
+ final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -322,9 +267,8 @@
@Test
public void testNFCKey_PrioritizedResult() {
final String key = "toggle_nfc";
- final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
- final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
- BASE_RANK);
+ final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
+ final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -334,9 +278,8 @@
@Test
public void testDataSaverKey_PrioritizedResult() {
final String key = "restrict_background";
- final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
- final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
- BASE_RANK);
+ final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
+ final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -346,9 +289,8 @@
@Test
public void testDataUsageKey_PrioritizedResult() {
final String key = "data_usage_enable";
- final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
- final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
- BASE_RANK);
+ final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
+ final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
}
@@ -357,9 +299,8 @@
@Test
public void testRoamingKey_PrioritizedResult() {
final String key = "button_roaming_key";
- final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
- final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
- BASE_RANK);
+ final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
+ final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
index 464e9d3..2687041 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
@@ -23,9 +23,7 @@
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyList;
import static org.mockito.Matchers.anyString;
-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;
@@ -55,7 +53,6 @@
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;
@@ -166,33 +163,6 @@
assertThat(columnNames).containsAllIn(expColumnNames);
}
- // Tests for the flow: IndexOneRaw -> UpdateOneRowWithFilteredData -> UpdateOneRow
-
- @Test
- public void testAddResource_withChildFragment_shouldUpdateSiteMapDb() {
- // FIXME: This test was failing. (count = 6 at the end)
-
-// SearchIndexableResource resource = getFakeResource(R.xml.network_and_internet);
-// mManager.indexOneSearchIndexableData(mDb, localeStr, resource,
-// new HashMap<>());
-// Cursor query = mDb.query(IndexDatabaseHelper.Tables.TABLE_SITE_MAP, SITE_MAP_COLUMNS,
-// null, null, null, null, null);
-// query.moveToPosition(-1);
-// int count = 0;
-// while (query.moveToNext()) {
-// count++;
-// assertThat(query.getString(query.getColumnIndex(SiteMapColumns.PARENT_CLASS)))
-// .isEqualTo(className);
-// assertThat(query.getString(query.getColumnIndex(SiteMapColumns.PARENT_TITLE)))
-// .isEqualTo(mContext.getString(R.string.network_dashboard_title));
-// assertThat(query.getString(query.getColumnIndex(SiteMapColumns.CHILD_CLASS)))
-// .isNotEmpty();
-// assertThat(query.getString(query.getColumnIndex(SiteMapColumns.CHILD_TITLE)))
-// .isNotEmpty();
-// }
-// assertThat(count).isEqualTo(5);
- }
-
// Test new public indexing flow
@Test
@@ -363,31 +333,6 @@
assertThat(cursor.getString(2)).isEqualTo(TITLE_ONE);
}
- @Test
- public void testUpdateAsyncTask_onPostExecute_performsCallback() {
- IndexingCallback callback = mock(IndexingCallback.class);
-
- DatabaseIndexingManager.IndexingTask task = mManager.new IndexingTask(callback);
- task.execute();
-
- Robolectric.flushForegroundThreadScheduler();
-
- verify(callback).onIndexingFinished();
- }
-
- @Test
- public void testUpdateAsyncTask_onPostExecute_setsIndexingComplete() {
- SearchFeatureProviderImpl provider = new SearchFeatureProviderImpl();
- DatabaseIndexingManager manager = spy(provider.getIndexingManager(mContext));
- DatabaseIndexingManager.IndexingTask task = manager.new IndexingTask(null);
- doNothing().when(manager).performIndexing();
-
- task.execute();
- Robolectric.flushForegroundThreadScheduler();
-
- assertThat(provider.isIndexingComplete(mContext)).isTrue();
- }
-
// Util functions
private SearchIndexableRaw getFakeRaw() {
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
deleted file mode 100644
index ca98c15..0000000
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
+++ /dev/null
@@ -1,115 +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.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-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;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class InlineSwitchViewHolderTest {
-
- private static final String TITLE = "title";
- private static final String SUMMARY = "summary";
-
- @Mock
- private SearchFragment mFragment;
-
- @Mock
- private InlineSwitchPayload mPayload;
-
- private FakeFeatureFactory mFeatureFactory;
- private InlineSwitchViewHolder mHolder;
- private Drawable mIcon;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- final Context context = RuntimeEnvironment.application;
- mIcon = context.getDrawable(R.drawable.ic_search_24dp);
- mFeatureFactory = FakeFeatureFactory.setupForTest();
-
- mHolder = new InlineSwitchViewHolder(
- LayoutInflater.from(context).inflate(R.layout.search_inline_switch_item, null),
- context);
- ReflectionHelpers.setField(mHolder, "mMetricsFeatureProvider",
- mFeatureFactory.metricsFeatureProvider);
- }
-
- @Test
- public void testConstructor_MembersNotNull() {
- assertThat(mHolder.titleView).isNotNull();
- assertThat(mHolder.summaryView).isNotNull();
- assertThat(mHolder.iconView).isNotNull();
- assertThat(mHolder.switchView).isNotNull();
- }
-
- @Test
- public void testBindViewElements_AllUpdated() {
- when(mPayload.getValue(any(Context.class))).thenReturn(1);
- SearchResult result = getSearchResult();
- mHolder.onBind(mFragment, result);
- // Precondition: switch is on.
- assertThat(mHolder.switchView.isChecked()).isTrue();
-
- mHolder.switchView.performClick();
-
- assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
- assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
- assertThat(mHolder.iconView.getDrawable()).isEqualTo(mIcon);
- assertThat(mHolder.switchView.isChecked()).isFalse();
- }
-
- private SearchResult getSearchResult() {
- SearchResult.Builder builder = new SearchResult.Builder();
-
- builder.setTitle(TITLE)
- .setSummary(SUMMARY)
- .setRank(1)
- .setPayload(new InlineSwitchPayload("" /* uri */, 0 /* mSettingSource */,
- 1 /* onValue */, null /* intent */, true /* isDeviceSupported */,
- 1 /* default */))
- .addBreadcrumbs(new ArrayList<>())
- .setIcon(mIcon)
- .setPayload(mPayload)
- .setStableId(TITLE.hashCode());
-
- return builder.build();
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/InputDeviceResultFutureTaskTest.java b/tests/robotests/src/com/android/settings/search/InputDeviceResultFutureTaskTest.java
deleted file mode 100644
index e31b3d7..0000000
--- a/tests/robotests/src/com/android/settings/search/InputDeviceResultFutureTaskTest.java
+++ /dev/null
@@ -1,177 +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.search;
-
-import static android.content.Context.INPUT_METHOD_SERVICE;
-
-import static com.android.settings.search.InputDeviceResultLoader.PHYSICAL_KEYBOARD_FRAGMENT;
-import static com.android.settings.search.InputDeviceResultLoader.VIRTUAL_KEYBOARD_FRAGMENT;
-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.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.hardware.input.InputManager;
-import android.view.InputDevice;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowInputDevice;
-
-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 java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowInputDevice.class
- })
-public class InputDeviceResultFutureTaskTest {
-
- private static final String QUERY = "test_query";
- private static final List<String> PHYSICAL_KEYBOARD_BREADCRUMB;
- private static final List<String> VIRTUAL_KEYBOARD_BREADCRUMB;
-
- static {
- PHYSICAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
- VIRTUAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
- PHYSICAL_KEYBOARD_BREADCRUMB.add("Settings");
- PHYSICAL_KEYBOARD_BREADCRUMB.add("physical keyboard");
- VIRTUAL_KEYBOARD_BREADCRUMB.add("Settings");
- VIRTUAL_KEYBOARD_BREADCRUMB.add("virtual keyboard");
- }
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
- @Mock
- private SiteMapManager mSiteMapManager;
- @Mock
- private InputManager mInputManager;
- @Mock
- private InputMethodManager mImm;
- @Mock
- private PackageManager mPackageManager;
-
- private InputDeviceResultLoader.InputDeviceResultCallable mCallable;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- when(mContext.getApplicationContext()).thenReturn(mContext);
- when(mContext.getSystemService(Context.INPUT_SERVICE))
- .thenReturn(mInputManager);
- when(mContext.getSystemService(INPUT_METHOD_SERVICE))
- .thenReturn(mImm);
- when(mContext.getPackageManager())
- .thenReturn(mPackageManager);
- when(mContext.getString(anyInt()))
- .thenAnswer(invocation -> RuntimeEnvironment.application.getString(
- (Integer) invocation.getArguments()[0]));
- mCallable = new InputDeviceResultLoader.InputDeviceResultCallable(mContext, QUERY,
- mSiteMapManager);
- }
-
- @After
- public void tearDown() {
- ShadowInputDevice.reset();
- }
-
- @Test
- public void query_noKeyboard_shouldNotReturnAnything() throws Exception {
-
- assertThat(mCallable.call()).isEmpty();
- }
-
- @Test
- public void query_hasPhysicalKeyboard_match() throws Exception {
- addPhysicalKeyboard(QUERY);
- when(mSiteMapManager.buildBreadCrumb(mContext, PHYSICAL_KEYBOARD_FRAGMENT,
- RuntimeEnvironment.application.getString(R.string.physical_keyboard_title)))
- .thenReturn(PHYSICAL_KEYBOARD_BREADCRUMB);
-
- final List<? extends SearchResult> results = mCallable.call();
-
- assertThat(results).hasSize(1);
- assertThat(results.get(0).title).isEqualTo(QUERY);
- assertThat(results.get(0).breadcrumbs)
- .containsExactlyElementsIn(PHYSICAL_KEYBOARD_BREADCRUMB);
- }
-
- @Test
- public void query_hasVirtualKeyboard_match() throws Exception {
- addVirtualKeyboard(QUERY);
- when(mSiteMapManager.buildBreadCrumb(mContext, VIRTUAL_KEYBOARD_FRAGMENT,
- RuntimeEnvironment.application.getString(R.string.add_virtual_keyboard)))
- .thenReturn(VIRTUAL_KEYBOARD_BREADCRUMB);
-
- final List<? extends SearchResult> results = mCallable.call();
- assertThat(results).hasSize(1);
- assertThat(results.get(0).title).isEqualTo(QUERY);
- assertThat(results.get(0).breadcrumbs)
- .containsExactlyElementsIn(VIRTUAL_KEYBOARD_BREADCRUMB);
- }
-
- @Test
- public void query_hasPhysicalVirtualKeyboard_doNotMatch() throws Exception {
- addPhysicalKeyboard("abc");
- addVirtualKeyboard("def");
-
- assertThat(mCallable.call()).isEmpty();
- verifyZeroInteractions(mSiteMapManager);
- }
-
- private void addPhysicalKeyboard(String name) {
- final InputDevice device = mock(InputDevice.class);
- when(device.isVirtual()).thenReturn(false);
- when(device.isFullKeyboard()).thenReturn(true);
- when(device.getName()).thenReturn(name);
- ShadowInputDevice.sDeviceIds = new int[]{0};
- ShadowInputDevice.addDevice(0, device);
- }
-
- private void addVirtualKeyboard(String name) {
- final List<InputMethodInfo> imis = new ArrayList<>();
- final InputMethodInfo info = mock(InputMethodInfo.class);
- imis.add(info);
- when(info.getServiceInfo()).thenReturn(new ServiceInfo());
- when(info.loadLabel(mPackageManager)).thenReturn(name);
- info.getServiceInfo().packageName = "pkg";
- info.getServiceInfo().name = "class";
- when(mImm.getInputMethodList()).thenReturn(imis);
- }
-
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
deleted file mode 100644
index 1cf1480..0000000
--- a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
+++ /dev/null
@@ -1,441 +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.search;
-
-import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
-import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
-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;
-import static org.mockito.Matchers.anyString;
-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.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.testutils.ApplicationTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
-
-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.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class InstalledAppResultLoaderTest {
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private PackageManagerWrapper mPackageManagerWrapper;
- @Mock
- private UserManager mUserManager;
- @Mock
- private SiteMapManager mSiteMapManager;
-
- private InstalledAppResultLoader.InstalledAppResultCallable mCallable;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
-
- final FakeFeatureFactory factory = FakeFeatureFactory.setupForTest();
- when(factory.searchFeatureProvider.getSiteMapManager())
- .thenReturn(mSiteMapManager);
- final List<UserInfo> infos = new ArrayList<>();
- infos.add(new UserInfo(1, "user 1", 0));
- when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
- when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- when(mContext.getString(R.string.applications_settings))
- .thenReturn("app");
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
- 0 /* targetSdkVersion */),
- ApplicationTestUtils.buildInfo(0 /* uid */, "app2", FLAG_SYSTEM,
- 0 /* targetSdkVersion */),
- ApplicationTestUtils.buildInfo(0 /* uid */, "app3", FLAG_SYSTEM,
- 0 /* targetSdkVersion */),
- ApplicationTestUtils.buildInfo(0 /* uid */, "app4", 0 /* flags */,
- 0 /* targetSdkVersion */),
- ApplicationTestUtils.buildInfo(0 /* uid */, "app", 0 /* flags */,
- 0 /* targetSdkVersion */),
- ApplicationTestUtils.buildInfo(0 /* uid */, "appBuffer", 0 /* flags */,
- 0 /* targetSdkVersion */)));
- }
-
- @Test
- public void query_noMatchingQuery_shouldReturnEmptyResult() throws Exception {
- final String query = "abc";
-
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).isEmpty();
- }
-
- @Test
- public void query_matchingQuery_shouldReturnNonSystemApps() throws Exception {
- final String query = "app";
-
- mCallable = spy(new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager));
- when(mSiteMapManager.buildBreadCrumb(eq(mContext), anyString(), anyString()))
- .thenReturn(Arrays.asList(new String[] {"123"}));
-
- assertThat(mCallable.call()).hasSize(3);
- verify(mSiteMapManager)
- .buildBreadCrumb(eq(mContext), anyString(), anyString());
- }
-
- @Test
- public void query_matchingQuery_shouldReturnSystemAppUpdates() throws Exception {
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_UPDATED_SYSTEM_APP,
- 0 /* targetSdkVersion */)));
- final String query = "app";
-
- mCallable = spy(new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager));
-
- assertThat(mCallable.call()).hasSize(1);
- verify(mSiteMapManager)
- .buildBreadCrumb(eq(mContext), anyString(), anyString());
- }
-
- @Test
- public void query_matchingQuery_shouldReturnSystemAppIfLaunchable() throws Exception {
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
- 0 /* targetSdkVersion */)));
- final List<ResolveInfo> list = mock(List.class);
- when(list.size()).thenReturn(1);
- when(mPackageManagerWrapper.queryIntentActivitiesAsUser(
- any(Intent.class), anyInt(), anyInt()))
- .thenReturn(list);
-
- final String query = "app";
-
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).hasSize(1);
- }
-
- @Test
- public void query_matchingQuery_shouldReturnSystemAppIfHomeApp() throws Exception {
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
- 0 /* targetSdkVersion */)));
- when(mPackageManagerWrapper.queryIntentActivitiesAsUser(
- any(Intent.class), anyInt(), anyInt()))
- .thenReturn(null);
-
- when(mPackageManagerWrapper.getHomeActivities(anyList())).thenAnswer(invocation -> {
- final List<ResolveInfo> list = (List<ResolveInfo>) invocation.getArguments()[0];
- final ResolveInfo info = new ResolveInfo();
- info.activityInfo = new ActivityInfo();
- info.activityInfo.packageName = "app1";
- list.add(info);
- return null;
- });
-
- final String query = "app";
-
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).hasSize(1);
- }
-
- @Test
- public void query_matchingQuery_shouldNotReturnSystemAppIfNotLaunchable() throws Exception {
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
- 0 /* targetSdkVersion */)));
- when(mPackageManagerWrapper.queryIntentActivitiesAsUser(
- any(Intent.class), anyInt(), anyInt()))
- .thenReturn(null);
-
- final String query = "app";
-
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).isEmpty();
- verify(mSiteMapManager, never())
- .buildBreadCrumb(eq(mContext), anyString(), anyString());
- }
-
- @Test
- public void query_matchingQuery_multipleResults() throws Exception {
- final String query = "app";
-
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
- final List<? extends SearchResult> results = mCallable.call();
-
- Set<CharSequence> expectedTitles = new HashSet<>(Arrays.asList("app4", "app", "appBuffer"));
- Set<CharSequence> actualTitles = new HashSet<>();
- for (SearchResult result : results) {
- actualTitles.add(result.title);
- }
- assertThat(actualTitles).isEqualTo(expectedTitles);
- }
-
- @Test
- public void query_normalWord_MatchPrefix() throws Exception {
- final String query = "ba";
- final String packageName = "Bananas";
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).hasSize(1);
- }
-
- @Test
- public void query_CapitalCase_DoestMatchSecondWord() throws Exception {
- final String query = "Apples";
- final String packageName = "BananasApples";
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).isEmpty();
- }
-
- @Test
- public void query_TwoWords_MatchesFirstWord() throws Exception {
- final String query = "Banana";
- final String packageName = "Bananas Apples";
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).hasSize(1);
- }
-
- @Test
- public void query_TwoWords_MatchesSecondWord() throws Exception {
- final String query = "Apple";
- final String packageName = "Bananas Apples";
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).hasSize(1);
- }
-
- @Test
- public void query_ThreeWords_MatchesThirdWord() throws Exception {
- final String query = "Pear";
- final String packageName = "Bananas Apples Pears";
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).hasSize(1);
- }
-
- @Test
- public void query_DoubleSpacedWords_MatchesSecondWord() throws Exception {
- final String query = "Apple";
- final String packageName = "Bananas Apples";
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).hasSize(1);
- }
-
- @Test
- public void query_SpecialChar_MatchesSecondWord() throws Exception {
- final String query = "Apple";
- final String packageName = "Bananas & Apples";
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).hasSize(1);
- }
-
- @Test
- public void query_TabSeparated_MatchesSecondWord() throws Exception {
- final String query = "Apple";
- final String packageName = "Bananas\tApples";
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).hasSize(1);
- }
-
- @Test
- public void query_LeadingNumber_MatchesWord() throws Exception {
- final String query = "4";
- final String packageName = "4Bananas";
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).hasSize(1);
- }
-
- @Test
- public void query_FirstWordPrefixOfQuery_NoMatch() throws Exception {
- final String query = "Bananass";
- final String packageName = "Bananas Apples";
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).isEmpty();
- }
-
- @Test
- public void query_QueryLongerThanAppName_NoMatch() throws Exception {
- final String query = "BananasApples";
- final String packageName = "Bananas";
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- assertThat(mCallable.call()).isEmpty();
- }
-
- @Test
- public void query_appExistsInBothProfiles() throws Exception {
- final String query = "carrot";
- final String packageName = "carrot";
- final int user1 = 0;
- final int user2 = 10;
- final int uid = 67672;
- List<UserInfo> infos = new ArrayList<>();
- infos.add(new UserInfo(user1, "user 1", 0));
- infos.add(new UserInfo(user2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
-
- when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), eq(user1)))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(UserHandle.getUid(user1, uid) /* uid */,
- packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
- when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), eq(user2)))
- .thenReturn(Arrays.asList(
- ApplicationTestUtils.buildInfo(UserHandle.getUid(user2, uid) /* uid */,
- packageName, 0 /* flags */,
- 0 /* targetSdkVersion */)));
-
- mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
- mPackageManagerWrapper, query,
- mSiteMapManager);
-
- List<AppSearchResult> searchResults = (List<AppSearchResult>) mCallable.call();
- assertThat(searchResults).hasSize(2);
-
- Set<Integer> uidResults = searchResults.stream().map(result -> result.info.uid).collect(
- Collectors.toSet());
- assertThat(uidResults).containsExactly(
- UserHandle.getUid(user1, uid),
- UserHandle.getUid(user2, uid));
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
deleted file mode 100644
index 1c5a67e..0000000
--- a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
+++ /dev/null
@@ -1,283 +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.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-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.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.search.SearchResult.Builder;
-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.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class IntentSearchViewHolderTest {
-
- private static final String TITLE = "title";
- private static final String SUMMARY = "summary";
- private static final int USER_ID = 10;
- private static final String BADGED_LABEL = "work title";
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private SearchFragment mFragment;
- @Mock
- private PackageManager mPackageManager;
- private FakeFeatureFactory mFeatureFactory;
- private IntentSearchViewHolder mHolder;
- private Drawable mIcon;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mFeatureFactory = FakeFeatureFactory.setupForTest();
-
- final Context context = RuntimeEnvironment.application;
- final View view = LayoutInflater.from(context).inflate(R.layout.search_intent_item, null);
- mHolder = new IntentSearchViewHolder(view);
-
- mIcon = context.getDrawable(R.drawable.ic_search_24dp);
- when(mFragment.getActivity().getPackageManager()).thenReturn(mPackageManager);
- }
-
- @Test
- public void testConstructor_membersNotNull() {
- assertThat(mHolder.titleView).isNotNull();
- assertThat(mHolder.summaryView).isNotNull();
- assertThat(mHolder.iconView).isNotNull();
- assertThat(mHolder.breadcrumbView).isNotNull();
- }
-
- @Test
- public void testBindViewElements_allUpdated() {
- final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
- mHolder.onBind(mFragment, result);
- mHolder.itemView.performClick();
-
- assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
- assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
- assertThat(mHolder.iconView.getDrawable()).isEqualTo(mIcon);
- assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
- assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.GONE);
-
- verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
- }
-
- @Test
- public void testBindViewIcon_nullIcon_imageDrawableIsNull() {
- final SearchResult result = getSearchResult(TITLE, SUMMARY, null);
- mHolder.onBind(mFragment, result);
-
- assertThat(mHolder.iconView.getDrawable()).isNull();
- }
-
- @Test
- public void testBindViewElements_emptySummary_hideSummaryView() {
- final SearchResult result = new Builder()
- .setTitle(TITLE)
- .setRank(1)
- .setPayload(new ResultPayload(null))
- .setIcon(mIcon)
- .setStableId(1)
- .build();
-
- mHolder.onBind(mFragment, result);
- assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
- }
-
- @Test
- public void testBindViewElements_withBreadcrumb_shouldFormatBreadcrumb() {
- final List<String> breadcrumbs = new ArrayList<>();
- breadcrumbs.add("a");
- breadcrumbs.add("b");
- breadcrumbs.add("c");
- final SearchResult result = new Builder()
- .setTitle(TITLE)
- .setRank(1)
- .setPayload(new ResultPayload(null))
- .addBreadcrumbs(breadcrumbs)
- .setIcon(mIcon)
- .setStableId(1)
- .build();
-
- mHolder.onBind(mFragment, result);
- assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.VISIBLE);
- assertThat(mHolder.breadcrumbView.getText()).isEqualTo("a > b > c");
- }
-
- @Test
- public void testBindElements_placeholderSummary_visibilityIsGone() {
- final String nonBreakingSpace = mContext.getString(R.string.summary_placeholder);
- final SearchResult result = new Builder()
- .setTitle(TITLE)
- .setSummary(nonBreakingSpace)
- .setPayload(new ResultPayload(null))
- .setStableId(1)
- .build();
-
- mHolder.onBind(mFragment, result);
-
- assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
- }
-
- @Test
- public void testBindElements_dynamicSummary_visibilityIsGone() {
- final String dynamicSummary = "%s";
- final SearchResult result = new Builder()
- .setTitle(TITLE)
- .setSummary(dynamicSummary)
- .setPayload(new ResultPayload(null))
- .setStableId(1)
- .build();
-
- mHolder.onBind(mFragment, result);
-
- assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
- }
-
- @Test
- public void testBindViewElements_appSearchResult() {
- mHolder = spy(mHolder);
- doReturn(new ColorDrawable(0)).when(mHolder).getBadgedIcon(any(ApplicationInfo.class),
- anyInt());
- when(mPackageManager.getUserBadgedLabel(any(CharSequence.class),
- eq(new UserHandle(USER_ID)))).thenReturn(BADGED_LABEL);
-
- final SearchResult result = getAppSearchResult(
- TITLE, SUMMARY, mIcon, getApplicationInfo(USER_ID, TITLE, mIcon));
- mHolder.onBind(mFragment, result);
- mHolder.itemView.performClick();
-
- assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
- assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
- assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
- assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.GONE);
- assertThat(mHolder.titleView.getContentDescription()).isEqualTo(BADGED_LABEL);
-
- verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
- verify(mFragment.getActivity()).startActivityAsUser(
- any(Intent.class), eq(new UserHandle(USER_ID)));
- }
-
- @Test
- public void testBindViewElements_validSubSettingIntent_shouldLaunch() {
- final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
- when(mPackageManager.queryIntentActivities(result.payload.getIntent(), 0 /* flags */))
- .thenReturn(Arrays.asList(new ResolveInfo()));
-
- mHolder.onBind(mFragment, result);
- mHolder.itemView.performClick();
-
- assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
- assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
- assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
- verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
- verify(mFragment).startActivityForResult(result.payload.getIntent(),
- IntentSearchViewHolder.REQUEST_CODE_NO_OP);
- }
-
- @Test
- public void testBindViewElements_invalidSubSettingIntent_shouldNotLaunchAnything() {
- final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
- when(mPackageManager.queryIntentActivities(result.payload.getIntent(), 0 /* flags */))
- .thenReturn(null);
-
- mHolder.onBind(mFragment, result);
- mHolder.itemView.performClick();
-
- assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
- assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
- assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
- verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
- verify(mFragment, never()).startActivityForResult(result.payload.getIntent(),
- IntentSearchViewHolder.REQUEST_CODE_NO_OP);
- }
-
- private SearchResult getSearchResult(String title, String summary, Drawable icon) {
- Builder builder = new Builder();
- builder.setStableId(Objects.hash(title, summary, icon))
- .setTitle(title)
- .setSummary(summary)
- .setRank(1)
- .setPayload(new ResultPayload(
- new Intent().setComponent(new ComponentName("pkg", "class"))))
- .addBreadcrumbs(new ArrayList<>())
- .setStableId(1)
- .setIcon(icon);
-
- return builder.build();
- }
-
- private SearchResult getAppSearchResult(
- String title, String summary, Drawable icon, ApplicationInfo applicationInfo) {
- AppSearchResult.Builder builder = new AppSearchResult.Builder();
- builder.setTitle(title)
- .setSummary(summary)
- .setRank(1)
- .setPayload(new ResultPayload(
- new Intent().setComponent(new ComponentName("pkg", "class"))))
- .addBreadcrumbs(new ArrayList<>())
- .setIcon(icon);
- builder.setAppInfo(applicationInfo);
- return builder.build();
- }
-
- private ApplicationInfo getApplicationInfo(int userId, CharSequence appLabel, Drawable icon) {
- ApplicationInfo applicationInfo = spy(new ApplicationInfo());
- applicationInfo.uid = UserHandle.getUid(userId, 12345);
- doReturn(icon).when(applicationInfo).loadIcon(any(PackageManager.class));
- doReturn(appLabel).when(applicationInfo).loadLabel(any(PackageManager.class));
- return applicationInfo;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/MockSearchResultLoader.java b/tests/robotests/src/com/android/settings/search/MockSearchResultLoader.java
deleted file mode 100644
index 6af258a..0000000
--- a/tests/robotests/src/com/android/settings/search/MockSearchResultLoader.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.android.settings.search;
-
-import android.content.Context;
-
-import com.android.settings.search.SearchResult;
-import com.android.settings.search.SearchResultLoader;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Mock loader to subvert the requirements of returning data while also driving the Loader
- * lifecycle.
- */
-public class MockSearchResultLoader extends SearchResultLoader {
-
- public MockSearchResultLoader(Context context) {
- super(context, "test");
- }
-
- @Override
- public List<? extends SearchResult> loadInBackground() {
- return new ArrayList<>();
- }
-
- @Override
- protected void onDiscardResult(List<? extends SearchResult> result) {
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
deleted file mode 100644
index 780a8a5d..0000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
+++ /dev/null
@@ -1,79 +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.search;
-
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.DatabaseTestUtils;
-
-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 java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryLoaderTest {
-
- private Context mContext;
- private SQLiteDatabase mDb;
- private SavedQueryLoader mLoader;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
- mLoader = new SavedQueryLoader(mContext);
- setUpDb();
- }
-
- @After
- public void cleanUp() {
- DatabaseTestUtils.clearDb(mContext);
- }
-
- @Test
- public void loadInBackground_shouldReturnSavedQueries() {
- final List<? extends SearchResult> results = mLoader.loadInBackground();
- assertThat(results.size()).isEqualTo(SavedQueryLoader.MAX_PROPOSED_SUGGESTIONS);
- for (SearchResult result : results) {
- assertThat(result.viewType).isEqualTo(ResultPayload.PayloadType.SAVED_QUERY);
- }
- }
-
- private void setUpDb() {
- final long now = System.currentTimeMillis();
- for (int i = 0; i < SavedQueryLoader.MAX_PROPOSED_SUGGESTIONS + 2; i++) {
- ContentValues values = new ContentValues();
- values.put(IndexDatabaseHelper.SavedQueriesColumns.QUERY, String.valueOf(i));
- values.put(IndexDatabaseHelper.SavedQueriesColumns.TIME_STAMP, now);
- mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES, null, values);
- }
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
deleted file mode 100644
index 7421d1a..0000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
+++ /dev/null
@@ -1,41 +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.search;
-
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryPayloadTest {
-
- private SavedQueryPayload mPayload;
-
- @Test
- public void getType_shouldBeSavedQueryType() {
- mPayload = new SavedQueryPayload("Test");
- assertThat(mPayload.getType()).isEqualTo(ResultPayload.PayloadType.SAVED_QUERY);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
deleted file mode 100644
index af8cfe4..0000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
+++ /dev/null
@@ -1,96 +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.search;
-
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.DatabaseTestUtils;
-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;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryRecorderAndRemoverTest {
-
- private Context mContext;
- private SavedQueryRecorder mRecorder;
- private SavedQueryRemover mRemover;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- }
-
- @After
- public void cleanUp() {
- DatabaseTestUtils.clearDb(mContext);
- }
-
- @Test
- public void canSaveAndRemoveQuery() {
- final String query = "test";
- mRecorder = new SavedQueryRecorder(mContext, query);
- mRemover = new SavedQueryRemover(mContext);
-
- // Record a new query and load all queries from DB
- mRecorder.loadInBackground();
- final SavedQueryLoader loader = new SavedQueryLoader(mContext);
- List<? extends SearchResult> results = loader.loadInBackground();
-
- // Should contain the newly recorded query
- assertThat(results.size()).isEqualTo(1);
- assertThat(results.get(0).title).isEqualTo(query);
-
- // Remove the query and load all queries from DB
- mRemover.loadInBackground();
- results = loader.loadInBackground();
-
- // Saved query list should be empty because it's removed.
- assertThat(results).isEmpty();
- }
-
- @Test
- public void canRemoveAllQueriesAtOnce() {
- mRemover = new SavedQueryRemover(mContext);;
-
- // Record a new query and load all queries from DB
- new SavedQueryRecorder(mContext, "Test1").loadInBackground();
- new SavedQueryRecorder(mContext, "Test2").loadInBackground();
- final SavedQueryLoader loader = new SavedQueryLoader(mContext);
- List<? extends SearchResult> results = loader.loadInBackground();
- assertThat(results.size()).isEqualTo(2);
-
- mRemover.loadInBackground();
- results = loader.loadInBackground();
-
- // Saved query list should be empty because it's removed.
- assertThat(results).isEmpty();
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
deleted file mode 100644
index bb8f6d1..0000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
+++ /dev/null
@@ -1,70 +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.search;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-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.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryViewHolderTest {
-
- @Mock
- private SearchFragment mSearchFragment;
- private Context mContext;
- private SavedQueryViewHolder mHolder;
- private View mView;
- private View mTitleView;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mView = LayoutInflater.from(mContext)
- .inflate(R.layout.search_saved_query_item, null);
- mTitleView = mView.findViewById(android.R.id.title);
- mHolder = new SavedQueryViewHolder(mView);
- }
-
- @Test
- public void onBind_shouldBindClickCallback() {
- final SearchResult result = mock(SearchResult.class);
- mHolder.onBind(mSearchFragment, result);
-
- mHolder.itemView.performClick();
-
- verify(mSearchFragment).onSavedQueryClicked(nullable(CharSequence.class));
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index 4349ab4..aa35f9f 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -18,20 +18,15 @@
package com.android.settings.search;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
import static org.robolectric.Shadows.shadowOf;
import android.app.Activity;
import android.content.ComponentName;
import android.content.Intent;
-import android.util.FeatureFlagUtils;
import android.widget.Toolbar;
import com.android.settings.TestConfig;
-import com.android.settings.core.FeatureFlags;
-import com.android.settings.dashboard.SiteMapManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
@@ -65,39 +60,10 @@
}
@Test
- public void getSiteMapManager_shouldCacheInstance() {
- final SiteMapManager manager1 = mProvider.getSiteMapManager();
- final SiteMapManager manager2 = mProvider.getSiteMapManager();
-
- assertThat(manager1).isSameAs(manager2);
- }
-
- @Test
- public void getDatabaseSearchLoader_shouldCleanupQuery() {
- final String query = " space ";
-
- mProvider.getStaticSearchResultTask(mActivity, query);
-
- verify(mProvider).cleanQuery(eq(query));
- }
-
- @Test
- public void getInstalledAppSearchLoader_shouldCleanupQuery() {
- final String query = " space ";
-
- mProvider.getInstalledAppSearchTask(mActivity, query);
-
- verify(mProvider).cleanQuery(eq(query));
- }
-
- @Test
- public void initSearchToolbar_searchV2_shouldInitWithOnClickListener() {
+ public void initSearchToolbar_shouldInitWithOnClickListener() {
mProvider.initSearchToolbar(mActivity, null);
// Should not crash.
- SettingsShadowSystemProperties.set(
- FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.SEARCH_V2,
- "true");
final Toolbar toolbar = new Toolbar(mActivity);
mProvider.initSearchToolbar(mActivity, toolbar);
@@ -109,25 +75,6 @@
.isEqualTo("com.android.settings.action.SETTINGS_SEARCH");
}
- @Test
- public void initSearchToolbar_searchV1_shouldInitWithOnClickListener() {
- mProvider.initSearchToolbar(mActivity, null);
- // Should not crash.
-
- SettingsShadowSystemProperties.set(
- FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.SEARCH_V2,
- "false");
- final Toolbar toolbar = new Toolbar(mActivity);
- mProvider.initSearchToolbar(mActivity, toolbar);
-
- toolbar.performClick();
-
- final Intent launchIntent = shadowOf(mActivity).getNextStartedActivity();
-
- assertThat(launchIntent.getComponent().getClassName())
- .isEqualTo(SearchActivity.class.getName());
- }
-
@Test(expected = IllegalArgumentException.class)
public void verifyLaunchSearchResultPageCaller_nullCaller_shouldCrash() {
mProvider.verifyLaunchSearchResultPageCaller(mActivity, null /* caller */);
diff --git a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
deleted file mode 100644
index f547fe8..0000000
--- a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
+++ /dev/null
@@ -1,413 +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.search;
-
-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;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
-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.app.LoaderManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Pair;
-import android.view.View;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-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.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- })
-public class SearchFragmentTest {
- @Mock
- private SearchResultLoader mSearchResultLoader;
- @Mock
- private SavedQueryLoader mSavedQueryLoader;
- @Mock
- private SavedQueryController mSavedQueryController;
- @Mock
- private SearchResultsAdapter mSearchResultsAdapter;
-
- private FakeFeatureFactory mFeatureFactory;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
-
- mFeatureFactory = FakeFeatureFactory.setupForTest();
- }
-
- @After
- public void tearDown() {
- DatabaseTestUtils.clearDb(RuntimeEnvironment.application);
- }
-
- @Test
- public void screenRotate_shouldPersistQuery() {
- when(mFeatureFactory.searchFeatureProvider
- .getSearchResultLoader(any(Context.class), anyString()))
- .thenReturn(new MockSearchResultLoader(RuntimeEnvironment.application));
- when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
- .thenReturn(mSavedQueryLoader);
-
- final Bundle bundle = new Bundle();
- final String testQuery = "test";
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content);
-
- ReflectionHelpers.setField(fragment, "mShowingSavedQuery", false);
- fragment.mQuery = testQuery;
-
- activityController.saveInstanceState(bundle).pause().stop().destroy();
-
- activityController = Robolectric.buildActivity(SearchActivity.class);
- activityController.setup(bundle);
-
- assertThat(fragment.mQuery).isEqualTo(testQuery);
- }
-
- @Test
- public void screenRotateEmptyString_ShouldNotCrash() {
- when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
- .thenReturn(mSavedQueryLoader);
-
- final Bundle bundle = new Bundle();
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content);
- when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
- .thenReturn(true);
-
- fragment.mQuery = "";
-
- activityController.saveInstanceState(bundle).pause().stop().destroy();
-
- activityController = Robolectric.buildActivity(SearchActivity.class);
- activityController.setup(bundle);
-
- verify(mFeatureFactory.searchFeatureProvider, never())
- .getStaticSearchResultTask(any(Context.class), anyString());
- verify(mFeatureFactory.searchFeatureProvider, never())
- .getInstalledAppSearchTask(any(Context.class), anyString());
- }
-
- @Test
- public void queryTextChange_shouldTriggerLoader() {
- when(mFeatureFactory.searchFeatureProvider
- .getSearchResultLoader(any(Context.class), anyString()))
- .thenReturn(mSearchResultLoader);
- when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
- .thenReturn(mSavedQueryLoader);
-
- final String testQuery = "test";
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content);
- when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
- .thenReturn(true);
-
- fragment.onQueryTextChange(testQuery);
- activityController.get().onBackPressed();
-
- activityController.pause().stop().destroy();
-
- verify(mFeatureFactory.metricsFeatureProvider, never()).action(
- any(Context.class),
- eq(MetricsProto.MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY));
- verify(mFeatureFactory.searchFeatureProvider)
- .getSearchResultLoader(any(Context.class), anyString());
- }
-
- @Test
- public void onSearchResultsDisplayed_noResult_shouldShowNoResultView() {
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = spy((SearchFragment) activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content));
- fragment.onSearchResultsDisplayed(0 /* count */);
-
- assertThat(fragment.mNoResultsView.getVisibility()).isEqualTo(View.VISIBLE);
- verify(mFeatureFactory.metricsFeatureProvider).visible(
- any(Context.class),
- anyInt(),
- eq(MetricsProto.MetricsEvent.SETTINGS_SEARCH_NO_RESULT));
- verify(mFeatureFactory.metricsFeatureProvider).action(
- any(VisibilityLoggerMixin.class),
- eq(MetricsProto.MetricsEvent.ACTION_SEARCH_RESULTS),
- eq(1));
- }
-
- @Test
- public void queryTextChangeToEmpty_shouldLoadSavedQueryAndNotInitializeSearch() {
- when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
- .thenReturn(mSavedQueryLoader);
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = spy((SearchFragment) activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content));
- when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
- .thenReturn(true);
- ReflectionHelpers.setField(fragment, "mSavedQueryController", mSavedQueryController);
- ReflectionHelpers.setField(fragment, "mSearchAdapter", mSearchResultsAdapter);
- fragment.mQuery = "123";
-
- fragment.onQueryTextChange("");
-
- verify(mFeatureFactory.searchFeatureProvider, never())
- .getStaticSearchResultTask(any(Context.class), anyString());
- verify(mFeatureFactory.searchFeatureProvider, never())
- .getInstalledAppSearchTask(any(Context.class), anyString());
- verify(mSavedQueryController).loadSavedQueries();
- }
-
- @Test
- public void updateIndex_TriggerOnCreate() {
- when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
- .thenReturn(mSavedQueryLoader);
-
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content);
- when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
- .thenReturn(true);
-
- fragment.onAttach(null);
- verify(mFeatureFactory.searchFeatureProvider).updateIndexAsync(any(Context.class),
- any(IndexingCallback.class));
- }
-
- @Test
- public void whenNoQuery_HideFeedbackIsCalled() {
- when(mFeatureFactory.searchFeatureProvider
- .getSearchResultLoader(any(Context.class), anyString()))
- .thenReturn(new MockSearchResultLoader(RuntimeEnvironment.application));
- when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
- .thenReturn(mSavedQueryLoader);
-
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content));
- when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
- .thenReturn(true);
- when(fragment.getLoaderManager()).thenReturn(mock(LoaderManager.class));
-
- fragment.onQueryTextChange("");
- Robolectric.flushForegroundThreadScheduler();
-
- verify(mFeatureFactory.searchFeatureProvider).hideFeedbackButton();
- }
-
- @Test
- public void onLoadFinished_ShowsFeedback() {
- when(mFeatureFactory.searchFeatureProvider
- .getSearchResultLoader(any(Context.class), anyString()))
- .thenReturn(new MockSearchResultLoader(RuntimeEnvironment.application));
- when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
- .thenReturn(mSavedQueryLoader);
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content);
- when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
- .thenReturn(true);
-
- fragment.onQueryTextChange("non-empty");
- Robolectric.flushForegroundThreadScheduler();
-
- verify(mFeatureFactory.searchFeatureProvider).showFeedbackButton(any(SearchFragment.class),
- any(View.class));
- }
-
- @Test
- public void preIndexingFinished_isIndexingFinishedFlag_isFalse() {
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content);
-
- when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
- .thenReturn(false);
- }
-
- @Test
- public void onIndexingFinished_notShowingSavedQuery_initLoaders() {
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content));
- final LoaderManager loaderManager = mock(LoaderManager.class);
- when(fragment.getLoaderManager()).thenReturn(loaderManager);
- fragment.mShowingSavedQuery = false;
- fragment.mQuery = null;
-
- fragment.onIndexingFinished();
-
- verify(loaderManager).initLoader(eq(SearchFragment.SearchLoaderId.SEARCH_RESULT),
- eq(null), any(LoaderManager.LoaderCallbacks.class));
- }
-
- @Test
- public void onIndexingFinished_showingSavedQuery_loadsSavedQueries() {
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content));
- fragment.mShowingSavedQuery = true;
- ReflectionHelpers.setField(fragment, "mSavedQueryController", mSavedQueryController);
-
- fragment.onIndexingFinished();
-
- verify(fragment.mSavedQueryController).loadSavedQueries();
- }
-
- @Test
- public void onIndexingFinished_noActivity_shouldNotCrash() {
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content));
- when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
- .thenReturn(true);
- fragment.mQuery = "bright";
- ReflectionHelpers.setField(fragment, "mLoaderManager", null);
- ReflectionHelpers.setField(fragment, "mHost", null);
-
- fragment.onIndexingFinished();
- // no crash
- }
-
- @Test
- public void onSearchResultClicked_shouldLogResultMeta() {
- SearchFragment fragment = new SearchFragment();
- ReflectionHelpers.setField(fragment, "mMetricsFeatureProvider",
- mFeatureFactory.metricsFeatureProvider);
- ReflectionHelpers.setField(fragment, "mSearchFeatureProvider",
- mFeatureFactory.searchFeatureProvider);
- ReflectionHelpers.setField(fragment, "mSearchAdapter", mock(SearchResultsAdapter.class));
- fragment.mSavedQueryController = mock(SavedQueryController.class);
-
- // Should log result name, result count, clicked rank, etc.
- final SearchViewHolder resultViewHolder = mock(SearchViewHolder.class);
- when(resultViewHolder.getClickActionMetricName())
- .thenReturn(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT);
- ResultPayload payLoad = new ResultPayload(
- (new Intent()).putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, "test_setting"));
- SearchResult searchResult = new SearchResult.Builder()
- .setStableId(payLoad.hashCode())
- .setPayload(payLoad)
- .setTitle("setting_title")
- .build();
- fragment.onSearchResultClicked(resultViewHolder, searchResult);
-
- verify(mFeatureFactory.metricsFeatureProvider).action(
- nullable(Context.class),
- eq(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT),
- eq("test_setting"),
- argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_COUNT)),
- argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_RANK)),
- argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_QUERY_LENGTH)));
- verify(mFeatureFactory.searchFeatureProvider).searchResultClicked(nullable(Context.class),
- nullable(String.class), eq(searchResult));
- }
-
- @Test
- public void onResume_shouldCallSearchRankingWarmupIfSmartSearchRankingEnabled() {
- when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any(Context.class)))
- .thenReturn(true);
-
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content);
-
- verify(mFeatureFactory.searchFeatureProvider)
- .searchRankingWarmup(any(Context.class));
- }
-
- @Test
- public void onResume_shouldNotCallSearchRankingWarmupIfSmartSearchRankingDisabled() {
- when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any(Context.class)))
- .thenReturn(false);
-
- ActivityController<SearchActivity> activityController =
- Robolectric.buildActivity(SearchActivity.class);
- activityController.setup();
- SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
- .findFragmentById(R.id.main_content);
-
- verify(mFeatureFactory.searchFeatureProvider, never())
- .searchRankingWarmup(any(Context.class));
- }
-
- private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag) {
- return pair -> pair.first == tag;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
index f84f9a2..d610363 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
@@ -121,7 +121,8 @@
continue;
}
// Must be in SearchProviderRegistry
- if (!SearchIndexableResources.providerValues().contains(clazz)) {
+ SearchFeatureProvider provider = new SearchFeatureProviderImpl();
+ if (!provider.getSearchIndexableResources().getProviderValues().contains(clazz)) {
if (!notInSearchIndexableRegistryGrandfatherList.remove(className)) {
notInSearchProviderRegistry.add(className);
}
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
index eedb324..72dd94c 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
@@ -21,12 +21,14 @@
import static junit.framework.Assert.fail;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import android.database.Cursor;
import android.text.TextUtils;
import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wifi.WifiSettings;
@@ -36,49 +38,56 @@
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
-import java.util.HashSet;
-import java.util.Set;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SearchIndexableResourcesTest {
- Set<Class> sProviderClassCopy;
+ SearchFeatureProviderImpl mSearchProvider;
+ private FakeFeatureFactory mFakeFeatureFactory;
@Before
public void setUp() {
- sProviderClassCopy = new HashSet<>(SearchIndexableResources.sProviders);
+ mSearchProvider = new SearchFeatureProviderImpl();
+ mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
+ mFakeFeatureFactory.searchFeatureProvider = mSearchProvider;
}
@After
public void cleanUp() {
- SearchIndexableResources.sProviders.clear();
- SearchIndexableResources.sProviders.addAll(sProviderClassCopy);
+ mFakeFeatureFactory.searchFeatureProvider = mock(
+ SearchFeatureProvider.class);
}
@Test
public void testAddIndex() {
final Class stringClass = java.lang.String.class;
// Confirms that String.class isn't contained in SearchIndexableResources.
- assertThat(SearchIndexableResources.sProviders).doesNotContain(stringClass);
- final int beforeCount = SearchIndexableResources.providerValues().size();
+ assertThat(mSearchProvider.getSearchIndexableResources().getProviderValues())
+ .doesNotContain(stringClass);
+ final int beforeCount =
+ mSearchProvider.getSearchIndexableResources().getProviderValues().size();
- SearchIndexableResources.addIndex(java.lang.String.class);
+ ( (SearchIndexableResourcesImpl) mSearchProvider.getSearchIndexableResources())
+ .addIndex(java.lang.String.class);
- assertThat(SearchIndexableResources.sProviders).contains(stringClass);
- final int afterCount = SearchIndexableResources.providerValues().size();
+ assertThat(mSearchProvider.getSearchIndexableResources().getProviderValues())
+ .contains(stringClass);
+ final int afterCount =
+ mSearchProvider.getSearchIndexableResources().getProviderValues().size();
assertThat(afterCount).isEqualTo(beforeCount + 1);
}
@Test
public void testIndexHasWifiSettings() {
- assertThat(sProviderClassCopy).contains(WifiSettings.class);
+ assertThat(mSearchProvider.getSearchIndexableResources().getProviderValues())
+ .contains(WifiSettings.class);
}
@Test
public void testNonIndexableKeys_GetsKeyFromProvider() {
- SearchIndexableResources.sProviders.clear();
- SearchIndexableResources.addIndex(FakeIndexProvider.class);
+ mSearchProvider.getSearchIndexableResources().getProviderValues().clear();
+ ( (SearchIndexableResourcesImpl) mSearchProvider.getSearchIndexableResources())
+ .addIndex(FakeIndexProvider.class);
SettingsSearchIndexablesProvider provider = spy(new SettingsSearchIndexablesProvider());
@@ -97,7 +106,7 @@
@Test
public void testAllClassNamesHaveProviders() {
- for (Class clazz: sProviderClassCopy) {
+ for (Class clazz: mSearchProvider.getSearchIndexableResources().getProviderValues()) {
if(DatabaseIndexingUtils.getSearchIndexProvider(clazz) == null) {
fail(clazz.getName() + "is not an index provider");
}
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultAggregatorTest.java b/tests/robotests/src/com/android/settings/search/SearchResultAggregatorTest.java
deleted file mode 100644
index 27fcd6a..0000000
--- a/tests/robotests/src/com/android/settings/search/SearchResultAggregatorTest.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.android.settings.TestConfig;
-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.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SearchResultAggregatorTest {
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
-
- private FakeFeatureFactory mFeatureFactory;
-
- private SearchResultAggregator mAggregator;
-
- @Mock
- private DatabaseResultLoader mStaticTask;
- @Mock
- private InstalledAppResultLoader mAppTask;
- @Mock
- private InputDeviceResultLoader mInputTask;
- @Mock
- private AccessibilityServiceResultLoader mMAccessibilityTask;
- @Mock
- private ExecutorService mService;
-
-
- private String[] DB_TITLES = {"static_one", "static_two"};
- private String[] INPUT_TITLES = {"input_one", "input_two"};
- private String[] ACCESS_TITLES = {"access_one", "access_two"};
- private String[] APP_TITLES = {"app_one", "app_two"};
-
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- mAggregator = spy(SearchResultAggregator.getInstance());
- mFeatureFactory = FakeFeatureFactory.setupForTest();
-
- // Return mock loaders from feature provider
- when(mFeatureFactory.searchFeatureProvider.getStaticSearchResultTask(any(Context.class),
- anyString())).thenReturn(mStaticTask);
- when(mFeatureFactory.searchFeatureProvider.getInstalledAppSearchTask(any(Context.class),
- anyString())).thenReturn(mAppTask);
- when(mFeatureFactory.searchFeatureProvider.getInputDeviceResultTask(any(Context.class),
- anyString())).thenReturn(mInputTask);
- when(mFeatureFactory.searchFeatureProvider.getAccessibilityServiceResultTask(
- any(Context.class),
- anyString())).thenReturn(mMAccessibilityTask);
- when(mFeatureFactory.searchFeatureProvider.getExecutorService()).thenReturn(mService);
-
- // Return fake data from the loaders
- List<? extends SearchResult> dbResults = getDummyDbResults();
- doReturn(dbResults).when(mStaticTask).get(anyLong(), any(TimeUnit.class));
-
- List<? extends SearchResult> appResults = getDummyAppResults();
- doReturn(appResults).when(mAppTask).get(anyLong(), any(TimeUnit.class));
-
- List<? extends SearchResult> inputResults = getDummyInputDeviceResults();
- doReturn(inputResults).when(mInputTask).get(anyLong(), any(TimeUnit.class));
-
- List<? extends SearchResult> accessResults = getDummyAccessibilityResults();
- doReturn(accessResults).when(mMAccessibilityTask).get(anyLong(), any(TimeUnit.class));
- }
-
- @Test
- public void testStaticResults_mergedProperly() {
- when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
- .thenReturn(false);
-
- List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
- assertThat(results).hasSize(8);
- assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
- assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
- assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
- assertThat(results.get(3).title).isEqualTo(ACCESS_TITLES[0]);
- assertThat(results.get(4).title).isEqualTo(INPUT_TITLES[0]);
- assertThat(results.get(5).title).isEqualTo(APP_TITLES[1]);
- assertThat(results.get(6).title).isEqualTo(ACCESS_TITLES[1]);
- assertThat(results.get(7).title).isEqualTo(INPUT_TITLES[1]);
- }
-
- @Test
- public void testStaticRanking_staticThrowsException_dbResultsAreMissing() throws Exception {
- when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
- .thenReturn(false);
- when(mStaticTask.get(anyLong(), any(TimeUnit.class))).thenThrow(new InterruptedException());
-
- List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
- assertThat(results).hasSize(6);
- assertThat(results.get(0).title).isEqualTo(APP_TITLES[0]);
- assertThat(results.get(1).title).isEqualTo(ACCESS_TITLES[0]);
- assertThat(results.get(2).title).isEqualTo(INPUT_TITLES[0]);
- assertThat(results.get(3).title).isEqualTo(APP_TITLES[1]);
- assertThat(results.get(4).title).isEqualTo(ACCESS_TITLES[1]);
- assertThat(results.get(5).title).isEqualTo(INPUT_TITLES[1]);
- }
-
- @Test
- public void testStaticRanking_appsThrowException_appResultsAreMissing() throws Exception {
- when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
- .thenReturn(false);
- when(mAppTask.get(anyLong(), any(TimeUnit.class))).thenThrow(new InterruptedException());
-
- List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
- assertThat(results).hasSize(6);
- assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
- assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
- assertThat(results.get(2).title).isEqualTo(ACCESS_TITLES[0]);
- assertThat(results.get(3).title).isEqualTo(INPUT_TITLES[0]);
- assertThat(results.get(4).title).isEqualTo(ACCESS_TITLES[1]);
- assertThat(results.get(5).title).isEqualTo(INPUT_TITLES[1]);
- }
-
- @Test
- public void testStaticRanking_inputThrowException_inputResultsAreMissing() throws Exception {
- when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
- .thenReturn(false);
- when(mInputTask.get(anyLong(), any(TimeUnit.class))).thenThrow(new InterruptedException());
-
- List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
- assertThat(results).hasSize(6);
- assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
- assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
- assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
- assertThat(results.get(3).title).isEqualTo(ACCESS_TITLES[0]);
- assertThat(results.get(4).title).isEqualTo(APP_TITLES[1]);
- assertThat(results.get(5).title).isEqualTo(ACCESS_TITLES[1]);
- }
-
- @Test
- public void testStaticRanking_accessThrowException_accessResultsAreMissing() throws Exception {
- when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
- .thenReturn(false);
- when(mMAccessibilityTask.get(anyLong(), any(TimeUnit.class))).thenThrow(
- new InterruptedException());
-
- List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
- assertThat(results).hasSize(6);
- assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
- assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
- assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
- assertThat(results.get(3).title).isEqualTo(INPUT_TITLES[0]);
- assertThat(results.get(4).title).isEqualTo(APP_TITLES[1]);
- assertThat(results.get(5).title).isEqualTo(INPUT_TITLES[1]);
- }
-
- @Test
- public void testDynamicRanking_sortsWithDynamicRanking() {
- when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(
- true);
-
- List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
- assertThat(results).hasSize(8);
- assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
- assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
- assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
- assertThat(results.get(3).title).isEqualTo(ACCESS_TITLES[0]);
- assertThat(results.get(4).title).isEqualTo(INPUT_TITLES[0]);
- assertThat(results.get(5).title).isEqualTo(APP_TITLES[1]);
- assertThat(results.get(6).title).isEqualTo(ACCESS_TITLES[1]);
- assertThat(results.get(7).title).isEqualTo(INPUT_TITLES[1]);
- }
-
- private List<? extends SearchResult> getDummyDbResults() {
- List<SearchResult> results = new ArrayList<>();
- ResultPayload payload = new ResultPayload(new Intent());
- SearchResult.Builder builder = new SearchResult.Builder();
- builder.setPayload(payload)
- .setTitle(DB_TITLES[0])
- .setRank(1)
- .setStableId(Objects.hash(DB_TITLES[0], "db"));
- results.add(builder.build());
-
- builder.setTitle(DB_TITLES[1])
- .setRank(2)
- .setStableId(Objects.hash(DB_TITLES[1], "db"));
- results.add(builder.build());
-
- return results;
- }
-
- private List<? extends SearchResult> getDummyAppResults() {
- List<AppSearchResult> results = new ArrayList<>();
- ResultPayload payload = new ResultPayload(new Intent());
- AppSearchResult.Builder builder = new AppSearchResult.Builder();
- builder.setPayload(payload)
- .setTitle(APP_TITLES[0])
- .setRank(1)
- .setStableId(Objects.hash(APP_TITLES[0], "app"));
- results.add(builder.build());
-
- builder.setTitle(APP_TITLES[1])
- .setRank(2)
- .setStableId(Objects.hash(APP_TITLES[1], "app"));
- results.add(builder.build());
-
- return results;
- }
-
- public List<? extends SearchResult> getDummyInputDeviceResults() {
- List<SearchResult> results = new ArrayList<>();
- ResultPayload payload = new ResultPayload(new Intent());
- AppSearchResult.Builder builder = new AppSearchResult.Builder();
- builder.setPayload(payload)
- .setTitle(INPUT_TITLES[0])
- .setRank(1)
- .setStableId(Objects.hash(INPUT_TITLES[0], "app"));
- results.add(builder.build());
-
- builder.setTitle(INPUT_TITLES[1])
- .setRank(2)
- .setStableId(Objects.hash(INPUT_TITLES[1], "app"));
- results.add(builder.build());
-
- return results;
- }
-
- public List<? extends SearchResult> getDummyAccessibilityResults() {
- List<SearchResult> results = new ArrayList<>();
- ResultPayload payload = new ResultPayload(new Intent());
- AppSearchResult.Builder builder = new AppSearchResult.Builder();
- builder.setPayload(payload)
- .setTitle(ACCESS_TITLES[0])
- .setRank(1)
- .setStableId(Objects.hash(ACCESS_TITLES[0], "app"));
- results.add(builder.build());
-
- builder.setTitle(ACCESS_TITLES[1])
- .setRank(2)
- .setStableId(Objects.hash(ACCESS_TITLES[1], "app"));
- results.add(builder.build());
-
- return results;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
deleted file mode 100644
index 4baf8d2..0000000
--- a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
+++ /dev/null
@@ -1,127 +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.search;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Matchers.any;
-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.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import com.android.settings.TestConfig;
-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.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SearchResultsAdapterTest {
-
- @Mock
- private SearchFragment mFragment;
- @Mock
- private SearchFeatureProvider mSearchFeatureProvider;
- @Mock
- private Context mMockContext;
- private SearchResultsAdapter mAdapter;
- private Context mContext;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = Robolectric.buildActivity(Activity.class).get();
- when(mFragment.getContext()).thenReturn(mMockContext);
- when(mMockContext.getApplicationContext()).thenReturn(mContext);
- when(mSearchFeatureProvider.smartSearchRankingTimeoutMs(any(Context.class)))
- .thenReturn(300L);
- mAdapter = new SearchResultsAdapter(mFragment);
- }
-
- @Test
- public void testNoResultsAdded_emptyListReturned() {
- List<SearchResult> updatedResults = mAdapter.getSearchResults();
- assertThat(updatedResults).isEmpty();
- }
-
- @Test
- public void testCreateViewHolder_returnsIntentResult() {
- ViewGroup group = new FrameLayout(mContext);
- SearchViewHolder view = mAdapter.onCreateViewHolder(group,
- ResultPayload.PayloadType.INTENT);
- assertThat(view).isInstanceOf(IntentSearchViewHolder.class);
- }
-
- @Test
- public void testCreateViewHolder_returnsIntentSwitchResult() {
- // TODO (b/62807132) test for InlineResult
- ViewGroup group = new FrameLayout(mContext);
- SearchViewHolder view = mAdapter.onCreateViewHolder(group,
- ResultPayload.PayloadType.INLINE_SWITCH);
- assertThat(view).isInstanceOf(IntentSearchViewHolder.class);
- }
-
- @Test
- public void testPostSearchResults_addsDataAndDisplays() {
- List<SearchResult> results = getDummyDbResults();
-
- mAdapter.postSearchResults(results);
-
- assertThat(mAdapter.getSearchResults()).containsExactlyElementsIn(results);
- verify(mFragment).onSearchResultsDisplayed(anyInt());
- }
-
- private List<SearchResult> getDummyDbResults() {
- List<SearchResult> results = new ArrayList<>();
- ResultPayload payload = new ResultPayload(new Intent());
- SearchResult.Builder builder = new SearchResult.Builder();
- builder.setPayload(payload)
- .setTitle("one")
- .setRank(1)
- .setStableId(Objects.hash("one", "db"));
- results.add(builder.build());
-
- builder.setTitle("two")
- .setRank(3)
- .setStableId(Objects.hash("two", "db"));
- results.add(builder.build());
-
- builder.setTitle("three")
- .setRank(6)
- .setStableId(Objects.hash("three", "db"));
- results.add(builder.build());
-
- return results;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
index efeaed7..cca2794 100644
--- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
@@ -2,6 +2,7 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import android.Manifest;
@@ -14,6 +15,7 @@
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.search.indexing.FakeSettingsFragment;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.After;
@@ -23,9 +25,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import java.util.HashSet;
-import java.util.Set;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsSearchIndexablesProviderTest {
@@ -33,8 +32,8 @@
private final String BASE_AUTHORITY = "com.android.settings";
private SettingsSearchIndexablesProvider mProvider;
-
- Set<Class> sProviderClasses;
+ private SearchFeatureProvider mFeatureProvider;
+ private FakeFeatureFactory mFakeFeatureFactory;
Context mContext;
@Before
@@ -49,15 +48,18 @@
info.readPermission = Manifest.permission.READ_SEARCH_INDEXABLES;
mProvider.attachInfo(mContext, info);
- sProviderClasses = new HashSet<>(SearchIndexableResources.sProviders);
- SearchIndexableResources.sProviders.clear();
- SearchIndexableResources.sProviders.add(FakeSettingsFragment.class);
+ mFeatureProvider = new SearchFeatureProviderImpl();
+ mFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
+ mFeatureProvider.getSearchIndexableResources().getProviderValues()
+ .add(FakeSettingsFragment.class);
+ mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
+ mFakeFeatureFactory.searchFeatureProvider = mFeatureProvider;
}
@After
public void cleanUp() {
- SearchIndexableResources.sProviders.clear();
- SearchIndexableResources.sProviders.addAll(sProviderClasses);
+ mFakeFeatureFactory.searchFeatureProvider = mock(
+ SearchFeatureProvider.class);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/search/StaticSearchResultFutureTaskTest.java b/tests/robotests/src/com/android/settings/search/StaticSearchResultFutureTaskTest.java
deleted file mode 100644
index b1494e4..0000000
--- a/tests/robotests/src/com/android/settings/search/StaticSearchResultFutureTaskTest.java
+++ /dev/null
@@ -1,513 +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.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SQLiteDatabase;
-import android.util.Pair;
-
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.DatabaseResultLoader.StaticSearchResultCallable;
-import com.android.settings.search.indexing.IndexData;
-import com.android.settings.testutils.DatabaseTestUtils;
-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.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class StaticSearchResultFutureTaskTest {
-
- @Mock
- private SiteMapManager mSiteMapManager;
- @Mock
- private ExecutorService mService;
- private Context mContext;
-
- SQLiteDatabase mDb;
-
- FakeFeatureFactory mFeatureFactory;
-
- private final String[] STATIC_TITLES = {"static one", "static two", "static three"};
- private final int[] STABLE_IDS =
- {"id_one".hashCode(), "id_two".hashCode(), "id_three".hashCode()};
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mFeatureFactory = FakeFeatureFactory.setupForTest();
- when(mFeatureFactory.searchFeatureProvider.getExecutorService()).thenReturn(mService);
- when(mFeatureFactory.searchFeatureProvider.getSiteMapManager())
- .thenReturn(mSiteMapManager);
- mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
- setUpDb();
- }
-
- @After
- public void cleanUp() {
- DatabaseTestUtils.clearDb(mContext);
- }
-
- @Test
- public void testMatchTitle() throws Exception {
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "title",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(2);
- verify(mSiteMapManager, times(2)).buildBreadCrumb(eq(mContext), anyString(), anyString());
- }
-
- @Test
- public void testMatchSummary() throws Exception {
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "summary",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(2);
- }
-
- @Test
- public void testMatchKeywords() throws Exception {
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "keywords",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(2);
- }
-
- @Test
- public void testMatchEntries() throws Exception {
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "entries",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(2);
- }
-
- @Test
- public void testSpecialCaseWord_matchesNonPrefix() throws Exception {
- insertSpecialCase("Data usage");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "usage",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(1);
- }
-
- @Test
- public void testSpecialCaseDash_matchesWordNoDash() throws Exception {
- insertSpecialCase("wi-fi calling");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "wifi",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(1);
- }
-
- @Test
- public void testSpecialCaseDash_matchesWordWithDash() throws Exception {
- insertSpecialCase("priorités seulment");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "priorités",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(1);
- }
-
- @Test
- public void testSpecialCaseDash_matchesWordWithoutDash() throws Exception {
- insertSpecialCase("priorités seulment");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "priorites",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(1);
- }
-
- @Test
- public void testSpecialCaseDash_matchesEntireQueryWithoutDash() throws Exception {
- insertSpecialCase("wi-fi calling");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "wifi calling",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(1);
- }
-
- @Test
- public void testSpecialCasePrefix_matchesPrefixOfEntry() throws Exception {
- insertSpecialCase("Photos");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "pho",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(1);
- }
-
- @Test
- public void testSpecialCasePrefix_DoesNotMatchNonPrefixSubstring() throws Exception {
- insertSpecialCase("Photos");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "hot",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(0);
- }
-
- @Test
- public void testSpecialCaseMultiWordPrefix_matchesPrefixOfEntry() throws Exception {
- insertSpecialCase("Apps Notifications");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "Apps",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(1);
- }
-
- @Test
- public void testSpecialCaseMultiWordPrefix_matchesSecondWordPrefixOfEntry() throws Exception {
- insertSpecialCase("Apps Notifications");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "Not",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(1);
- }
-
- @Test
- public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfFirstEntry()
- throws Exception {
- insertSpecialCase("Apps Notifications");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "pp",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(0);
- }
-
- @Test
- public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfSecondEntry()
- throws Exception {
- insertSpecialCase("Apps Notifications");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "tion",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(0);
- }
-
- @Test
- public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfEntry() throws
- Exception {
- insertSpecialCase("Apps & Notifications");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "App",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(1);
- }
-
- @Test
- public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfSecondEntry()
- throws Exception {
- insertSpecialCase("Apps & Notifications");
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "No",
- mSiteMapManager);
-
- assertThat(loader.call()).hasSize(1);
- }
-
- @Test
- public void testResultMatchedByMultipleQueries_duplicatesRemoved() throws Exception {
- String key = "durr";
- insertSameValueAllFieldsCase(key);
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, key, null);
-
- assertThat(loader.call()).hasSize(1);
- }
-
- @Test
- public void testSpecialCaseTwoWords_multipleResults() throws Exception {
- final String caseOne = "Apple pear";
- final String caseTwo = "Banana apple";
- insertSpecialCase(caseOne);
- insertSpecialCase(caseTwo);
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "App", null);
-
- List<? extends SearchResult> results = loader.call();
-
- Set<String> actualTitles = new HashSet<>();
- for (SearchResult result : results) {
- actualTitles.add(result.title.toString());
- }
- assertThat(actualTitles).containsAllOf(caseOne, caseTwo);
- }
-
- @Test
- public void testGetRankingScoreByStableId_sortedDynamically() throws Exception {
- FutureTask<List<Pair<String, Float>>> task = mock(FutureTask.class);
- when(task.get(anyLong(), any(TimeUnit.class))).thenReturn(getDummyRankingScores());
- when(mFeatureFactory.searchFeatureProvider.getRankerTask(any(Context.class),
- anyString())).thenReturn(task);
- when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(
- true);
-
- insertSpecialCase(STATIC_TITLES[0], STABLE_IDS[0]);
- insertSpecialCase(STATIC_TITLES[1], STABLE_IDS[1]);
- insertSpecialCase(STATIC_TITLES[2], STABLE_IDS[2]);
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "Static",
- null);
-
- List<? extends SearchResult> results = loader.call();
-
- assertThat(results.get(0).title).isEqualTo(STATIC_TITLES[2]);
- assertThat(results.get(1).title).isEqualTo(STATIC_TITLES[0]);
- assertThat(results.get(2).title).isEqualTo(STATIC_TITLES[1]);
- }
-
- @Test
- public void testGetRankingScoreByStableId_scoresTimeout_sortedStatically() throws Exception {
- Callable<List<Pair<String, Float>>> callable = mock(Callable.class);
- when(callable.call()).thenThrow(new TimeoutException());
- FutureTask<List<Pair<String, Float>>> task = new FutureTask<>(callable);
- when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(
- true);
- when(mFeatureFactory.searchFeatureProvider.getRankerTask(any(Context.class),
- anyString())).thenReturn(task);
- insertSpecialCase("title", STABLE_IDS[0]);
-
- StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "title", null);
-
- List<? extends SearchResult> results = loader.call();
- assertThat(results.get(0).title).isEqualTo("title");
- assertThat(results.get(1).title).isEqualTo("alpha_title");
- assertThat(results.get(2).title).isEqualTo("bravo_title");
- }
-
- private void insertSpecialCase(String specialCase) {
- insertSpecialCase(specialCase, specialCase.hashCode());
- }
-
- private void insertSpecialCase(String specialCase, int docId) {
- String normalized = IndexData.normalizeHyphen(specialCase);
- normalized = IndexData.normalizeString(normalized);
- final ResultPayload payload = new ResultPayload(new Intent());
-
- ContentValues values = new ContentValues();
- values.put(IndexDatabaseHelper.IndexColumns.DOCID, docId);
- values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, specialCase);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, normalized);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "");
- values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
- "com.android.settings.gestures.GestureSettings");
- values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
- values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
- values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, normalized.hashCode());
- values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
- values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
- values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
-
- mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
- }
-
- private void setUpDb() {
- final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(new Intent()));
-
- ContentValues values = new ContentValues();
- values.put(IndexDatabaseHelper.IndexColumns.DOCID, 1);
- values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "alpha_title");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "alpha title");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "alpha_summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "alpha summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "alpha_summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "alpha summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "alpha entries");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "alpha keywords");
- values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
- "com.android.settings.gestures.GestureSettings");
- values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
- values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
- values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_0");
- values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
- values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
- values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
-
- mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-
- values = new ContentValues();
- values.put(IndexDatabaseHelper.IndexColumns.DOCID, 2);
- values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "bravo_title");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "bravo title");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "bravo_summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "bravo summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "bravo_summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "bravo summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "bravo entries");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "bravo keywords");
- values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
- "com.android.settings.gestures.GestureSettings");
- values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
- values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
- values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_1");
- values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
- values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
- values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
- mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-
- values = new ContentValues();
- values.put(IndexDatabaseHelper.IndexColumns.DOCID, 3);
- values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "charlie_title");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "charlie title");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "charlie_summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "charlie summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "charlie_summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "charlie summary");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "charlie entries");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "charlie keywords");
- values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
- "com.android.settings.gestures.GestureSettings");
- values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
- values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
- values.put(IndexDatabaseHelper.IndexColumns.ENABLED, false);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_2");
- values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
- values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
- values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
-
- mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
- }
-
- private void insertSameValueAllFieldsCase(String key) {
- final ResultPayload payload = new ResultPayload(new Intent());
-
- ContentValues values = new ContentValues();
- values.put(IndexDatabaseHelper.IndexColumns.DOCID, key.hashCode());
- values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
- values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, key);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, key);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, key);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, key);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, key);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, key);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, key);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, key);
- values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME, key);
- values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, key);
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
- values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, key);
- values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
- values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
- values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, key.hashCode());
- values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
- values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
- values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
-
- mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
- }
-
- private List<? extends SearchResult> getDummyDbResults() {
- List<SearchResult> results = new ArrayList<>();
- ResultPayload payload = new ResultPayload(new Intent());
- SearchResult.Builder builder = new SearchResult.Builder();
- builder.setPayload(payload)
- .setTitle(STATIC_TITLES[0])
- .setStableId(STABLE_IDS[0]);
- results.add(builder.build());
-
- builder.setTitle(STATIC_TITLES[1])
- .setStableId(STABLE_IDS[1]);
- results.add(builder.build());
-
- builder.setTitle(STATIC_TITLES[2])
- .setStableId(STABLE_IDS[2]);
- results.add(builder.build());
-
- return results;
- }
-
- private List<Pair<String, Float>> getDummyRankingScores() {
- List<? extends SearchResult> results = getDummyDbResults();
- List<Pair<String, Float>> scores = new ArrayList<>();
- scores.add(new Pair<>(Long.toString(results.get(2).stableId), 0.9f)); // static_three
- scores.add(new Pair<>(Long.toString(results.get(0).stableId), 0.8f)); // static_one
- scores.add(new Pair<>(Long.toString(results.get(1).stableId), 0.2f)); // static_two
- return scores;
- }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
index 2bec503..af7a462 100644
--- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
+++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
@@ -190,8 +190,7 @@
while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
&& type != XmlPullParser.START_TAG) {
}
- while (parser.getName() != xmlType) {
- parser.next();
+ while (parser.getName() != xmlType && parser.next() != XmlPullParser.END_DOCUMENT) {
}
} catch (Exception e) {
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 e79e2d0..e1c77cd 100644
--- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
@@ -16,20 +16,16 @@
package com.android.settings.search.actionbar;
-import static org.mockito.Matchers.nullable;
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.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import com.android.settings.R;
import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
@@ -47,30 +43,15 @@
@Mock
private Menu mMenu;
private TestFragment mHost;
- private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mHost = new TestFragment();
- mFeatureFactory = FakeFeatureFactory.setupForTest();
}
@Test
- public void init_searchV2Disabled_shouldNotAddMenu() {
- when(mFeatureFactory.searchFeatureProvider.isSearchV2Enabled(nullable(Context.class)))
- .thenReturn(false);
-
- SearchMenuController.init(mHost);
- mHost.getLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
-
- verifyZeroInteractions(mMenu);
- }
-
- @Test
- public void init_searchV2Enabled_shouldAddMenu() {
- when(mFeatureFactory.searchFeatureProvider.isSearchV2Enabled(nullable(Context.class)))
- .thenReturn(true);
+ public void init_shouldAddMenu() {
when(mMenu.add(Menu.NONE, Menu.NONE, 0 /* order */, R.string.search_menu))
.thenReturn(mock(MenuItem.class));
diff --git a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java
new file mode 100644
index 0000000..4aaf5f4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.os.UserManager;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+ manifest = TestConfig.MANIFEST_PATH,
+ sdk = TestConfig.SDK_VERSION,
+ shadows = {
+ ShadowUtils.class
+ })
+public class ChangeScreenLockPreferenceControllerTest {
+
+ @Mock
+ private LockPatternUtils mLockPatternUtils;
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private DevicePolicyManager mDevicePolicyManager;
+
+ private Context mContext;
+ private FakeFeatureFactory mFeatureFactory;
+ private ChangeScreenLockPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
+ .thenReturn(mLockPatternUtils);
+ when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+ when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
+ .thenReturn(mDevicePolicyManager);
+ mController = new ChangeScreenLockPreferenceController(mContext, null /* Host */ );
+ }
+
+ @Test
+ public void testDeviceAdministrators_byDefault_shouldBeShown() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void testDeviceAdministrators_ifDisabled_shouldNotBeShown() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
new file mode 100644
index 0000000..7738f86
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.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.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.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.TestConfig;
+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.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LockdownButtonPreferenceControllerTest {
+ @Mock
+ private LockPatternUtils mLockPatternUtils;
+ private SwitchPreference mPreference;
+
+ private Context mContext;
+ private LockdownButtonPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mPreference = new SwitchPreference(mContext);
+
+ mController = spy(new LockdownButtonPreferenceController(mContext));
+ ReflectionHelpers.setField(mController, "mLockPatternUtils", mLockPatternUtils);
+ }
+
+ @Test
+ public void isAvailable_lockSet_shouldReturnTrue() throws Exception {
+ when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_lockUnset_shouldReturnFalse() throws Exception {
+ when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void onPreferenceChange_settingIsUpdated() throws Exception {
+ boolean state = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0;
+ assertThat(mController.onPreferenceChange(mPreference, !state)).isTrue();
+ boolean newState = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0;
+ assertThat(newState).isEqualTo(!state);
+ }
+
+ @Test
+ public void onSettingChange_preferenceIsUpdated() throws Exception {
+ boolean state = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0;
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isEqualTo(state);
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.LOCKDOWN_IN_POWER_MENU, state ? 0 : 1);
+
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isEqualTo(!state);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
index ef3f9cd..ee3f0ec 100644
--- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
@@ -18,6 +18,7 @@
import static com.google.common.truth.Truth.assertThat;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.os.UserManager;
@@ -47,11 +48,13 @@
private ResetCredentialsPreferenceController mResetCredentialsPreferenceController;
private UserCredentialsPreferenceController mUserCredentialsPreferenceController;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mCredentialStoragePreferenceController =
new CredentialStoragePreferenceController(mContext);
mInstallCredentialsPreferenceController =
diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
index 797e7d0..c5177ac 100644
--- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
@@ -18,23 +18,19 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.TestConfig;
-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.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@@ -43,10 +39,6 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ScreenPinningPreferenceControllerTest {
- @Mock
- private PreferenceScreen mScreen;
-
- private FakeFeatureFactory mFeatureFactory;
private Context mContext;
private ScreenPinningPreferenceController mController;
private Preference mPreference;
@@ -55,12 +47,9 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new ScreenPinningPreferenceController(mContext);
mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
- when(mScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mPreference);
}
@After
@@ -70,27 +59,33 @@
}
@Test
- public void isAlwaysAvailable() {
- assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ public void isAvailable_byDefault_isTrue() {
+ assertThat(mController.isAvailable()).isTrue();
}
@Test
- public void displayPreference_isOff_shouldDisableOffSummary() {
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_isFalse() {
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void updateState_isOff_shouldDisableOffSummary() {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.LOCK_TO_APP_ENABLED, 0);
- mController.displayPreference(mScreen);
+ mController.updateState(mPreference);
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.switch_off_text));
}
@Test
- public void displayPreference_isOn_shouldDisableOnSummary() {
+ public void updateState_isOn_shouldDisableOnSummary() {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.LOCK_TO_APP_ENABLED, 1);
- mController.displayPreference(mScreen);
+ mController.updateState(mPreference);
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.switch_on_text));
diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
index 63cf00b..6bcb1d3 100644
--- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
@@ -70,8 +70,14 @@
}
@Test
- public void isAlwaysAvailable() {
- assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ public void isAvailable_byDefault_isTrue() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_isFalse() {
+ assertThat(mController.isAvailable()).isFalse();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java
index dd98372..23d2731 100644
--- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java
@@ -27,6 +27,7 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
@@ -63,6 +64,7 @@
private UserManager mUm;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
private FakeFeatureFactory mFeatureFactory;
private Context mContext;
private VisiblePatternProfilePreferenceController mController;
@@ -82,7 +84,8 @@
.thenReturn(mLockPatternUtils);
when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {FAKE_PROFILE_USER_ID});
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = new VisiblePatternProfilePreferenceController(mContext, mLifecycle);
}
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 671807b..f1a5d9b 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java
@@ -26,6 +26,7 @@
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.os.UserManager;
import android.support.v7.preference.Preference;
@@ -60,6 +61,7 @@
private PreferenceScreen mScreen;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
private FakeFeatureFactory mFeatureFactory;
private Context mContext;
private LockScreenPreferenceController mController;
@@ -78,7 +80,8 @@
when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {FAKE_PROFILE_USER_ID});
mPreference = new Preference(mContext);
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = new LockScreenPreferenceController(mContext, mLifecycle);
}
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 8818602..42d640a 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
@@ -75,8 +75,14 @@
}
@Test
- public void isAlwaysAvailable() {
- assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ public void isAvailable_byDefault_isTrue() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_isFalse() {
+ assertThat(mController.isAvailable()).isFalse();
}
@Test
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 6913c0c..7dd04c6 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
@@ -25,10 +25,12 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atLeastOnce;
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 android.app.Activity;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.ComponentName;
import android.content.Context;
import android.support.v7.preference.Preference;
@@ -37,6 +39,7 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.security.SecuritySettingsV2;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -69,6 +72,7 @@
private SecuritySettingsV2 mFragment;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
private FakeFeatureFactory mFeatureFactory;
private Activity mActivity;
@@ -79,7 +83,8 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mActivity = Robolectric.buildActivity(Activity.class).get();
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mFeatureFactory = FakeFeatureFactory.setupForTest();
when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(any(Context.class)))
.thenReturn(mLockPatternUtils);
@@ -96,6 +101,13 @@
public void testConstants() {
assertThat(mController.isAvailable()).isTrue();
assertThat(mController.getPreferenceKey()).isEqualTo(PREF_KEY_TRUST_AGENT);
+ assertThat(mController).isInstanceOf(PreferenceControllerMixin.class);
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void isAvailable_whenNotVisible_isFalse() {
+ assertThat(mController.isAvailable()).isFalse();
}
@Test
@@ -130,4 +142,24 @@
verify(mCategory, atLeastOnce()).addPreference(any(Preference.class));
}
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void onResume_ifNotAvailable_shouldNotAddNewAgents() {
+ final List<TrustAgentManager.TrustAgentComponentInfo> agents = new ArrayList<>();
+ final TrustAgentManager.TrustAgentComponentInfo agent = mock(
+ TrustAgentManager.TrustAgentComponentInfo.class);
+ agent.title = "Test_title";
+ agent.summary = "test summary";
+ agent.componentName = new ComponentName("pkg", "agent");
+ agent.admin = null;
+ agents.add(agent);
+ when(mTrustAgentManager.getActiveTrustAgents(mActivity, mLockPatternUtils))
+ .thenReturn(agents);
+
+ mController.displayPreference(mScreen);
+ mController.onResume();
+
+ verify(mCategory, never()).addPreference(any(Preference.class));
+ }
}
diff --git a/tests/robotests/src/com/android/settings/slices/FakeContextOnlyPreferenceController.java b/tests/robotests/src/com/android/settings/slices/FakeContextOnlyPreferenceController.java
new file mode 100644
index 0000000..214607b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/FakeContextOnlyPreferenceController.java
@@ -0,0 +1,19 @@
+package com.android.settings.slices;
+
+import android.content.Context;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class FakeContextOnlyPreferenceController extends BasePreferenceController {
+
+ public static final String KEY = "fakeController2";
+
+ public FakeContextOnlyPreferenceController(Context context) {
+ super(context, KEY);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/slices/FakeToggleController.java b/tests/robotests/src/com/android/settings/slices/FakeToggleController.java
new file mode 100644
index 0000000..1b08e35
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/FakeToggleController.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.slices;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+
+public class FakeToggleController extends TogglePreferenceController {
+
+ private String settingKey = "toggle_key";
+
+ private final int ON = 1;
+ private final int OFF = 0;
+
+ public FakeToggleController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public boolean isChecked() {
+ return Settings.System.getInt(mContext.getContentResolver(),
+ settingKey, OFF) == ON;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.System.putInt(mContext.getContentResolver(), settingKey,
+ isChecked ? ON : OFF);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
new file mode 100644
index 0000000..340d04b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.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.slices;
+
+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 android.content.ContentValues;
+import android.content.Context;
+import android.content.ContentResolver;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.DatabaseTestUtils;
+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;
+import org.robolectric.annotation.Config;
+
+import java.util.HashMap;
+
+import androidx.app.slice.Slice;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SettingsSliceProviderTest {
+
+ private final String KEY = "KEY";
+ private final String TITLE = "title";
+ private final String SUMMARY = "summary";
+ private final String SCREEN_TITLE = "screen title";
+ private final String FRAGMENT_NAME = "fragment name";
+ private final int ICON = 1234; // I declare a thumb war
+ private final Uri URI = Uri.parse("content://com.android.settings.slices/test");
+ private final String PREF_CONTROLLER = FakeToggleController.class.getName();
+ private Context mContext;
+ private SettingsSliceProvider mProvider;
+ private SQLiteDatabase mDb;
+
+ @Before
+ public void setUp() {
+ mContext = spy(RuntimeEnvironment.application);
+ mProvider = spy(new SettingsSliceProvider());
+ mProvider.mSliceDataCache = new HashMap<>();
+ mDb = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
+ SlicesDatabaseHelper.getInstance(mContext).setIndexedState();
+ }
+
+ @After
+ public void cleanUp() {
+ DatabaseTestUtils.clearDb(mContext);
+ }
+
+ @Test
+ public void testInitialSliceReturned_emmptySlice() {
+ Uri uri = SettingsSliceProvider.getUri(KEY);
+ Slice slice = mProvider.onBindSlice(uri);
+
+ assertThat(slice.getUri()).isEqualTo(uri);
+ assertThat(slice.getItems()).isEmpty();
+ }
+
+ @Test
+ public void testUriBuilder_returnsValidSliceUri() {
+ Uri uri = SettingsSliceProvider.getUri(KEY);
+
+ assertThat(uri.getScheme()).isEqualTo(ContentResolver.SCHEME_CONTENT);
+ assertThat(uri.getAuthority()).isEqualTo(SettingsSliceProvider.SLICE_AUTHORITY);
+ assertThat(uri.getLastPathSegment()).isEqualTo(KEY);
+ }
+
+ @Test
+ public void testLoadSlice_returnsSliceFromAccessor() {
+ ContentResolver mockResolver = mock(ContentResolver.class);
+ doReturn(mockResolver).when(mContext).getContentResolver();
+ doReturn(mContext).when(mProvider).getContext();
+ mProvider.mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(mContext);
+ insertSpecialCase(KEY);
+ Uri uri = SettingsSliceProvider.getUri(KEY);
+
+ mProvider.loadSlice(uri);
+ SliceData data = mProvider.mSliceDataCache.get(uri);
+
+ assertThat(data.getKey()).isEqualTo(KEY);
+ assertThat(data.getTitle()).isEqualTo(TITLE);
+ }
+
+ @Test
+ public void testLoadSlice_cachedEntryRemovedOnBuild() {
+ doReturn(mContext).when(mProvider).getContext();
+ SliceData data = getDummyData();
+ mProvider.mSliceDataCache.put(data.getUri(), data);
+ mProvider.onBindSlice(data.getUri());
+ insertSpecialCase(data.getKey());
+
+ SliceData cachedData = mProvider.mSliceDataCache.get(data.getUri());
+
+ assertThat(cachedData).isNull();
+ }
+
+ private void insertSpecialCase(String key) {
+ 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.FRAGMENT, "test");
+ values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, "test");
+
+ mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
+ }
+
+ private SliceData getDummyData() {
+ return new SliceData.Builder()
+ .setKey(KEY)
+ .setTitle(TITLE)
+ .setSummary(SUMMARY)
+ .setScreenTitle(SCREEN_TITLE)
+ .setIcon(ICON)
+ .setFragmentName(FRAGMENT_NAME)
+ .setUri(URI)
+ .setPreferenceControllerClassName(PREF_CONTROLLER)
+ .build();
+ }
+}
\ 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
new file mode 100644
index 0000000..f5d5ff0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.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.slices;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SQLiteDatabase;
+
+import com.android.settings.TestConfig;
+import com.android.settings.search.FakeIndexProvider;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProviderImpl;
+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.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SliceBroadcastReceiverTest {
+
+ private final String fakeTitle = "title";
+ private final String fakeSummary = "summary";
+ private final String fakeScreenTitle = "screen_title";
+ private final int fakeIcon = 1234;
+ private final String fakeFragmentClassName = FakeIndexProvider.class.getName();
+ private final String fakeControllerName = FakeToggleController.class.getName();
+
+ private Context mContext;
+ private SQLiteDatabase mDb;
+ private SliceBroadcastReceiver mReceiver;
+ private SearchFeatureProvider mSearchFeatureProvider;
+ private FakeFeatureFactory mFakeFeatureFactory;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mDb = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
+ mReceiver = new SliceBroadcastReceiver();
+ SlicesDatabaseHelper helper = SlicesDatabaseHelper.getInstance(mContext);
+ helper.setIndexedState();
+ mSearchFeatureProvider = new SearchFeatureProviderImpl();
+ mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
+ mFakeFeatureFactory.searchFeatureProvider = mSearchFeatureProvider;
+ }
+
+ @After
+ public void cleanUp() {
+ mFakeFeatureFactory.searchFeatureProvider = mock(SearchFeatureProvider.class);
+ }
+
+ @Test
+ public void testOnReceive_toggleChanged() {
+ String key = "key";
+ mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
+ insertSpecialCase(key);
+ // Turn on toggle setting
+ FakeToggleController fakeToggleController = new FakeToggleController(mContext, key);
+ fakeToggleController.setChecked(true);
+ Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
+ intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
+
+ assertThat(fakeToggleController.isChecked()).isTrue();
+
+ // Toggle setting
+ mReceiver.onReceive(mContext, intent);
+
+ assertThat(fakeToggleController.isChecked()).isFalse();
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testOnReceive_noExtra_illegalSatetException() {
+ Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
+ mReceiver.onReceive(mContext, intent);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testOnReceive_emptyKey_throwsIllegalStateException() {
+ Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
+ intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, (String) null);
+ mReceiver.onReceive(mContext, intent);
+ }
+
+ private void insertSpecialCase(String key) {
+ ContentValues values = new ContentValues();
+ values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
+ values.put(SlicesDatabaseHelper.IndexColumns.TITLE, fakeTitle);
+ values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, fakeSummary);
+ values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, fakeScreenTitle);
+ values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, fakeIcon);
+ values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, fakeFragmentClassName);
+ values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, fakeControllerName);
+
+ mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
new file mode 100644
index 0000000..0923571
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.TestConfig.SDK_VERSION;
+
+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.Uri;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+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.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import androidx.app.slice.Slice;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = SDK_VERSION)
+public class SliceBuilderUtilsTest {
+
+ private final String KEY = "KEY";
+ private final String TITLE = "title";
+ private final String SUMMARY = "summary";
+ private final String SCREEN_TITLE = "screen title";
+ private final String FRAGMENT_NAME = "fragment name";
+ private final int ICON = 1234; // I declare a thumb war
+ private final Uri URI = Uri.parse("content://com.android.settings.slices/test");
+ private final Class PREF_CONTROLLER = FakeToggleController.class;
+ private final Class PREF_CONTROLLER2 = FakeContextOnlyPreferenceController.class;
+
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ }
+
+ @Test
+ public void testBuildSlice_returnsMatchingSlice() {
+ Slice slice = SliceBuilderUtils.buildSlice(mContext, getDummyData());
+
+ assertThat(slice).isNotNull(); // TODO improve test for Slice content
+ }
+
+ @Test
+ public void testGetPreferenceController_buildsMatchingController() {
+ BasePreferenceController controller = SliceBuilderUtils.getPreferenceController(
+ mContext, getDummyData());
+
+ assertThat(controller).isInstanceOf(FakeToggleController.class);
+ }
+
+ @Test
+ public void testGetPreferenceController_contextOnly_buildsMatchingController() {
+ BasePreferenceController controller = SliceBuilderUtils.getPreferenceController(mContext,
+ getDummyData(PREF_CONTROLLER2));
+
+ assertThat(controller).isInstanceOf(FakeContextOnlyPreferenceController.class);
+ }
+
+ @Test
+ public void testDynamicSummary_returnsSliceSummary() {
+ SliceData data = getDummyData();
+ FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
+
+ String summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
+
+ assertThat(summary).isEqualTo(data.getSummary());
+ }
+
+ @Test
+ public void testDynamicSummary_returnsFragmentSummary() {
+ SliceData data = getDummyData((String) null);
+ FakePreferenceController controller = spy(new FakePreferenceController(mContext, KEY));
+ String controllerSummary = "new_Summary";
+ doReturn(controllerSummary).when(controller).getSummary();
+
+ String summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
+
+ assertThat(summary).isEqualTo(controllerSummary);
+ }
+
+ @Test
+ public void testDynamicSummary_returnsSliceScreenTitle() {
+ SliceData data = getDummyData((String) null);
+ FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
+
+ String summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
+
+ assertThat(summary).isEqualTo(data.getScreenTitle());
+ }
+
+ @Test
+ public void testDynamicSummary_placeHolderString_returnsScreenTitle() {
+ SliceData data = getDummyData(mContext.getString(R.string.summary_placeholder));
+ FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
+ String summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
+
+ assertThat(summary).isEqualTo(data.getScreenTitle());
+ }
+
+ @Test
+ public void testDynamicSummary_sliceDataAndFragmentPlaceholder_returnsSliceScreenTitle() {
+ String summaryPlaceholder = mContext.getString(R.string.summary_placeholder);
+ SliceData data = getDummyData(summaryPlaceholder);
+ FakePreferenceController controller = spy(new FakePreferenceController(mContext, KEY));
+ doReturn(summaryPlaceholder).when(controller).getSummary();
+
+ String summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
+
+ assertThat(summary).isEqualTo(data.getScreenTitle());
+ }
+
+ private SliceData getDummyData() {
+ return getDummyData(PREF_CONTROLLER, SUMMARY);
+ }
+
+ private SliceData getDummyData(String summary) {
+ return getDummyData(PREF_CONTROLLER, summary);
+ }
+
+ private SliceData getDummyData(Class prefController) {
+ return getDummyData(prefController, SUMMARY);
+ }
+
+ private SliceData getDummyData(Class prefController, String summary) {
+ return new SliceData.Builder()
+ .setKey(KEY)
+ .setTitle(TITLE)
+ .setSummary(summary)
+ .setScreenTitle(SCREEN_TITLE)
+ .setIcon(ICON)
+ .setFragmentName(FRAGMENT_NAME)
+ .setUri(URI)
+ .setPreferenceControllerClassName(prefController.getName())
+ .build();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
index b5c0b5f..1d0ac41 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
@@ -18,11 +18,15 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+
import android.content.Context;
import com.android.settings.TestConfig;
import com.android.settings.search.FakeIndexProvider;
-import com.android.settings.search.SearchIndexableResources;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProviderImpl;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.After;
@@ -32,9 +36,7 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -49,28 +51,31 @@
Context mContext;
- private Set<Class> mProviderClassesCopy;
-
SliceDataConverter mSliceDataConverter;
+ SearchFeatureProvider mSearchFeatureProvider;
+ private FakeFeatureFactory mFakeFeatureFactory;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- mProviderClassesCopy = new HashSet<>(SearchIndexableResources.providerValues());
mSliceDataConverter = new SliceDataConverter(mContext);
+ mSearchFeatureProvider = new SearchFeatureProviderImpl();
+ mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
+ mFakeFeatureFactory.searchFeatureProvider = mSearchFeatureProvider;
}
@After
public void cleanUp() {
- SearchIndexableResources.providerValues().clear();
- SearchIndexableResources.providerValues().addAll(mProviderClassesCopy);
+ mFakeFeatureFactory.searchFeatureProvider = mock(
+ SearchFeatureProvider.class);
}
@Test
@Config(qualifiers = "mcc999")
public void testFakeProvider_convertsFakeData() {
- SearchIndexableResources.providerValues().clear();
- SearchIndexableResources.providerValues().add(FakeIndexProvider.class);
+ mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
+ mSearchFeatureProvider.getSearchIndexableResources().getProviderValues()
+ .add(FakeIndexProvider.class);
List<SliceData> sliceDataList = mSliceDataConverter.getSliceData();
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
new file mode 100644
index 0000000..106e6fe
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+
+import com.android.settings.TestConfig;
+import com.android.settings.search.FakeIndexProvider;
+import com.android.settings.testutils.DatabaseTestUtils;
+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;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SlicesDatabaseAccessorTest {
+
+ private final String fakeTitle = "title";
+ private final String fakeSummary = "summary";
+ private final String fakeScreenTitle = "screen_title";
+ private final int fakeIcon = 1234;
+ private final String fakeFragmentClassName = FakeIndexProvider.class.getName();
+ private final String fakeControllerName = FakePreferenceController.class.getName();
+
+ private Context mContext;
+ private SQLiteDatabase mDb;
+ private SlicesDatabaseAccessor mAccessor;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mAccessor = spy(new SlicesDatabaseAccessor(mContext));
+ mDb = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
+ SlicesDatabaseHelper.getInstance(mContext).setIndexedState();
+ }
+
+ @After
+ public void cleanUp() {
+ DatabaseTestUtils.clearDb(mContext);
+ }
+
+ @Test
+ public void testGetSliceDataFromKey_validKey_validSliceReturned() {
+ String key = "key";
+ insertSpecialCase(key);
+
+ SliceData data = mAccessor.getSliceDataFromKey(key);
+
+ assertThat(data.getKey()).isEqualTo(key);
+ assertThat(data.getTitle()).isEqualTo(fakeTitle);
+ assertThat(data.getSummary()).isEqualTo(fakeSummary);
+ assertThat(data.getScreenTitle()).isEqualTo(fakeScreenTitle);
+ assertThat(data.getIconResource()).isEqualTo(fakeIcon);
+ assertThat(data.getFragmentClassName()).isEqualTo(fakeFragmentClassName);
+ assertThat(data.getUri()).isNull();
+ assertThat(data.getPreferenceController()).isEqualTo(fakeControllerName);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testGetSliceDataFromKey_invalidKey_errorThrown() {
+ String key = "key";
+
+ mAccessor.getSliceDataFromKey(key);
+ }
+
+ @Test
+ public void testGetSliceFromUri_validUri_validSliceReturned() {
+ String key = "key";
+ insertSpecialCase(key);
+ Uri uri = SettingsSliceProvider.getUri(key);
+
+ SliceData data = mAccessor.getSliceDataFromUri(uri);
+
+ assertThat(data.getKey()).isEqualTo(key);
+ assertThat(data.getTitle()).isEqualTo(fakeTitle);
+ assertThat(data.getSummary()).isEqualTo(fakeSummary);
+ assertThat(data.getScreenTitle()).isEqualTo(fakeScreenTitle);
+ assertThat(data.getIconResource()).isEqualTo(fakeIcon);
+ assertThat(data.getFragmentClassName()).isEqualTo(fakeFragmentClassName);
+ assertThat(data.getUri()).isEqualTo(uri);
+ assertThat(data.getPreferenceController()).isEqualTo(fakeControllerName);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testGetSliceFromUri_invalidUri_errorThrown() {
+ Uri uri = SettingsSliceProvider.getUri("durr");
+
+ mAccessor.getSliceDataFromUri(uri);
+ }
+
+ private void insertSpecialCase(String key) {
+ ContentValues values = new ContentValues();
+ values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
+ values.put(SlicesDatabaseHelper.IndexColumns.TITLE, fakeTitle);
+ values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, fakeSummary);
+ values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, fakeScreenTitle);
+ values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, fakeIcon);
+ values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, fakeFragmentClassName);
+ values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, fakeControllerName);
+
+ mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
index 68c9555..ed4f3ff 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
@@ -79,7 +79,6 @@
String newKey = "newKey";
String newTitle = "newTitle";
SlicesDatabaseHelper.getInstance(mContext).setIndexedState();
- Locale.setDefault(new Locale("ca"));
insertSpecialCase(newKey, newTitle);
// Attempt indexing - should not do anything.
diff --git a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java b/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java
index 11e740a..499a2f7 100644
--- a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java
@@ -18,6 +18,7 @@
import android.content.Context;
+import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
import com.android.settings.search.IndexDatabaseHelper;
import com.android.settings.slices.SlicesDatabaseHelper;
@@ -28,6 +29,7 @@
public static void clearDb(Context context) {
clearSearchDb(context);
clearSlicesDb(context);
+ clearAnomalyDb(context);
}
private static void clearSlicesDb(Context context) {
@@ -45,6 +47,21 @@
}
}
+ private static void clearAnomalyDb(Context context) {
+ AnomalyDatabaseHelper helper = AnomalyDatabaseHelper.getInstance(context);
+ helper.close();
+
+ Field instance;
+ Class clazz = AnomalyDatabaseHelper.class;
+ try {
+ instance = clazz.getDeclaredField("sSingleton");
+ instance.setAccessible(true);
+ instance.set(null, null);
+ } catch (Exception e) {
+ throw new RuntimeException();
+ }
+ }
+
private static void clearSearchDb(Context context) {
IndexDatabaseHelper helper = IndexDatabaseHelper.getInstance(context);
helper.close();
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index fb2b62e..ad72e6b 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -21,10 +21,10 @@
import android.content.Context;
+import com.android.settings.accounts.AccountFeatureProvider;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
import com.android.settings.connecteddevice.SmsMirroringFeatureProvider;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.datausage.DataPlanFeatureProvider;
@@ -39,6 +39,7 @@
import com.android.settings.security.SecurityFeatureProvider;
import com.android.settings.slices.SlicesFeatureProvider;
import com.android.settings.users.UserFeatureProvider;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.mockito.Answers;
@@ -55,7 +56,6 @@
public final LocaleFeatureProvider localeFeatureProvider;
public final ApplicationFeatureProvider applicationFeatureProvider;
public final EnterprisePrivacyFeatureProvider enterprisePrivacyFeatureProvider;
- public final SearchFeatureProvider searchFeatureProvider;
public final SurveyFeatureProvider surveyFeatureProvider;
public final SecurityFeatureProvider securityFeatureProvider;
public final SuggestionFeatureProvider suggestionsFeatureProvider;
@@ -65,6 +65,8 @@
public final DataPlanFeatureProvider dataPlanFeatureProvider;
public final SmsMirroringFeatureProvider smsMirroringFeatureProvider;
public final SlicesFeatureProvider slicesFeatureProvider;
+ public SearchFeatureProvider searchFeatureProvider;
+ public final AccountFeatureProvider mAccountFeatureProvider;
/**
* Call this in {@code @Before} method of the test class to use fake factory.
@@ -104,6 +106,7 @@
dataPlanFeatureProvider = mock(DataPlanFeatureProvider.class);
smsMirroringFeatureProvider = mock(SmsMirroringFeatureProvider.class);
slicesFeatureProvider = mock(SlicesFeatureProvider.class);
+ mAccountFeatureProvider = mock(AccountFeatureProvider.class);
}
@Override
@@ -190,4 +193,9 @@
public SlicesFeatureProvider getSlicesFeatureProvider() {
return slicesFeatureProvider;
}
+
+ @Override
+ public AccountFeatureProvider getAccountFeatureProvider() {
+ return mAccountFeatureProvider;
+ }
}
diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
index 7c374e9..f071f17 100644
--- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
@@ -15,25 +15,17 @@
*/
package com.android.settings.testutils;
-import android.app.Fragment;
-import android.content.Intent;
-
+import java.net.MalformedURLException;
+import java.net.URL;
import org.junit.runners.model.InitializationError;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.manifest.AndroidManifest;
import org.robolectric.res.Fs;
import org.robolectric.res.ResourcePath;
-import org.robolectric.util.ReflectionHelpers;
import java.util.List;
-import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
-import static org.robolectric.Robolectric.getShadowsAdapter;
-
-import com.android.settings.SettingsActivity;
-
/**
* Custom test runner for the testing of BluetoothPairingDialogs. This is needed because the
* default behavior for robolectric is just to grab the resource directory in the target package.
@@ -54,68 +46,49 @@
*/
@Override
protected AndroidManifest getAppManifest(Config config) {
- // Using the manifest file's relative path, we can figure out the application directory.
- final String appRoot = "packages/apps/Settings";
- final String manifestPath = appRoot + "/AndroidManifest.xml";
- final String resDir = appRoot + "/tests/robotests/res";
- final String assetsDir = appRoot + config.assetDir();
+ try {
+ // Using the manifest file's relative path, we can figure out the application directory.
+ final URL appRoot = new URL("file:packages/apps/Settings/");
+ final URL manifestPath = new URL(appRoot, "AndroidManifest.xml");
+ final URL resDir = new URL(appRoot, "tests/robotests/res");
+ final URL assetsDir = new URL(appRoot, "tests/robotests/assets");
- // By adding any resources from libraries we need the AndroidManifest, we can access
- // them from within the parallel universe's resource loader.
- return new AndroidManifest(Fs.fileFromPath(manifestPath), Fs.fileFromPath(resDir),
- Fs.fileFromPath(assetsDir), "com.android.settings") {
- @Override
- public List<ResourcePath> getIncludedResourcePaths() {
- List<ResourcePath> paths = super.getIncludedResourcePaths();
- SettingsRobolectricTestRunner.getIncludedResourcePaths(getPackageName(), paths);
- return paths;
- }
- };
+ // By adding any resources from libraries we need the AndroidManifest, we can access
+ // them from within the parallel universe's resource loader.
+ return new AndroidManifest(Fs.fromURL(manifestPath), Fs.fromURL(resDir),
+ Fs.fromURL(assetsDir), "com.android.settings") {
+ @Override
+ public List<ResourcePath> getIncludedResourcePaths() {
+ final List<ResourcePath> paths = super.getIncludedResourcePaths();
+ addIncludedResourcePaths(paths);
+ return paths;
+ }
+ };
+ } catch (MalformedURLException e) {
+ throw new RuntimeException("SettingsRobolectricTestRunner failure", e);
+ }
}
- public static void getIncludedResourcePaths(String packageName, List<ResourcePath> paths) {
- paths.add(new ResourcePath(
- null,
- Fs.fileFromPath("./packages/apps/Settings/res"),
- null));
- paths.add(new ResourcePath(
- null,
- Fs.fileFromPath("./frameworks/base/packages/SettingsLib/res"),
- null));
- paths.add(new ResourcePath(
- null,
- Fs.fileFromPath("./frameworks/base/core/res/res"),
- null));
- paths.add(new ResourcePath(
- null,
- Fs.fileFromPath("./frameworks/opt/setupwizard/library/main/res"),
- null));
- paths.add(new ResourcePath(
- null,
- Fs.fileFromPath("./frameworks/opt/setupwizard/library/gingerbread/res"),
- null));
- paths.add(new ResourcePath(
- null,
- Fs.fileFromPath("./frameworks/opt/setupwizard/library/recyclerview/res"),
- null));
- paths.add(new ResourcePath(
- null,
- Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
- null));
- paths.add(new ResourcePath(
- null,
- Fs.fileFromPath("./frameworks/support/v7/cardview/res"),
- null));
- }
-
- // A simple utility class to start a Settings fragment with an intent. The code here is almost
- // the same as FragmentTestUtil.startFragment except that it starts an activity with an intent.
- public static void startSettingsFragment(
- Fragment fragment, Class<? extends SettingsActivity> activityClass) {
- Intent intent = new Intent().putExtra(EXTRA_SHOW_FRAGMENT, fragment.getClass().getName());
- SettingsActivity activity = ActivityController.of(
- getShadowsAdapter(), ReflectionHelpers.callConstructor(activityClass), intent)
- .setup().get();
- activity.getFragmentManager().beginTransaction().add(fragment, null).commit();
+ public static void addIncludedResourcePaths(List<ResourcePath> paths) {
+ try {
+ paths.add(new ResourcePath(null,
+ Fs.fromURL(new URL("file:packages/apps/Settings/res")), null));
+ 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/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: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:frameworks/support/v7/appcompat/res")), null));
+ paths.add(new ResourcePath(null,
+ Fs.fromURL(new URL("file:frameworks/support/v7/cardview/res")), null));
+ } catch (MalformedURLException e) {
+ throw new RuntimeException("SettingsRobolectricTestRunner failure", e);
+ }
}
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java
index dcced4e..9caf09f 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java
@@ -19,7 +19,7 @@
import android.content.Context;
-import com.android.settings.core.instrumentation.EventLogWriter;
+import com.android.settingslib.core.instrumentation.EventLogWriter;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowParcel.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowParcel.java
new file mode 100644
index 0000000..6e42fea
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowParcel.java
@@ -0,0 +1,32 @@
+package com.android.settings.testutils.shadow;
+
+import android.os.Parcel;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * This class provides helpers to test logic that reads from parcels.
+ */
+@Implements(Parcel.class)
+public class ShadowParcel {
+
+ public static int sReadIntResult;
+ public static int sWriteIntResult;
+ public static boolean sReadBoolResult;
+
+ @Implementation
+ public int readInt() {
+ return sReadIntResult;
+ }
+
+ @Implementation
+ public void writeInt(int val) {
+ sWriteIntResult = val;
+ }
+
+ @Implementation
+ public boolean readBoolean() {
+ return sReadBoolResult;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java
new file mode 100644
index 0000000..afede1a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.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.testutils.shadow;
+
+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;
+
+@Implements(RestrictedLockUtils.class)
+public class ShadowRestrictedLockUtils {
+ private static boolean isRestricted;
+ private static String[] restrictedPkgs;
+ private static boolean adminSupportDetailsIntentLaunched;
+
+ @Implementation
+ public static RestrictedLockUtils.EnforcedAdmin checkIfMeteredDataRestricted(Context context,
+ String packageName, int userId) {
+ if (isRestricted) {
+ return new EnforcedAdmin();
+ }
+ if (ArrayUtils.contains(restrictedPkgs, packageName)) {
+ return new EnforcedAdmin();
+ }
+ return null;
+ }
+
+ @Implementation
+ public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) {
+ adminSupportDetailsIntentLaunched = true;
+ }
+
+ public static boolean hasAdminSupportDetailsIntentLaunched() {
+ return adminSupportDetailsIntentLaunched;
+ }
+
+ public static void clearAdminSupportDetailsIntentLaunch() {
+ adminSupportDetailsIntentLaunched = false;
+ }
+
+ public static void setRestricted(boolean restricted) {
+ isRestricted = restricted;
+ }
+
+ public static void setRestrictedPkgs(String... pkgs) {
+ restrictedPkgs = pkgs;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
similarity index 92%
rename from tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
index faaf7db..3882d92 100644
--- a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.accounts;
+package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
@@ -22,6 +22,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.content.pm.UserInfo;
import android.os.UserManager;
@@ -31,6 +32,7 @@
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Test;
@@ -51,6 +53,8 @@
@Mock(answer = RETURNS_DEEP_STUBS)
private UserManager mUserManager;
+ private LifecycleOwner mLifecycleOwner;
+ private Lifecycle mLifecycle;
private Context mContext;
private AddUserWhenLockedPreferenceController mController;
@@ -60,7 +64,9 @@
ShadowApplication shadowContext = ShadowApplication.getInstance();
shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
mContext = shadowContext.getApplicationContext();
- mController = new AddUserWhenLockedPreferenceController(mContext, "fake_key");
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
+ mController = new AddUserWhenLockedPreferenceController(mContext, "fake_key", mLifecycle);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java
index 7aa339f..680f080 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.accounts;
+package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java
index 597fbd4..50b4ec3 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.accounts;
+package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java
index a25aa28..19f3732 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 The Android Open Source Project
+ * 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.accounts;
+package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
@@ -28,8 +28,8 @@
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index e44be0e..59a08ae 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -44,10 +44,10 @@
import com.android.settings.TestConfig;
import com.android.settings.applications.defaultapps.DefaultAppInfo;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.RadioButtonPreference;
import com.android.settings.wrapper.UserPackageWrapper;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
index 1cf85fb..fc634d2 100644
--- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
@@ -24,6 +24,7 @@
import android.app.Activity;
import android.content.Context;
+import android.content.pm.PackageManager;
import android.hardware.display.DisplayManager;
import android.media.MediaRouter;
import android.net.wifi.p2p.WifiP2pManager;
@@ -50,6 +51,8 @@
private SummaryLoader mSummaryLoader;
@Mock
private MediaRouter mMediaRouter;
+ @Mock
+ private PackageManager mPackageManager;
private SummaryLoader.SummaryProvider mSummaryProvider;
@@ -58,6 +61,8 @@
MockitoAnnotations.initMocks(this);
when(mActivity.getSystemService(Context.MEDIA_ROUTER_SERVICE))
.thenReturn(mMediaRouter);
+ when(mActivity.getPackageManager()).thenReturn(mPackageManager);
+ when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)).thenReturn(true);
mSummaryProvider = WifiDisplaySettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(
mActivity, mSummaryLoader);
@@ -86,15 +91,15 @@
}
@Test
- public void isAvailable_noService_shouldReturnFalse() {
+ public void isAvailable_nullService_shouldReturnFalse() {
assertThat(WifiDisplaySettings.isAvailable(mActivity))
.isFalse();
}
@Test
- public void isAvailable_throwException_shouldReturnFalse() {
- when(mActivity.getSystemService(Context.WIFI_P2P_SERVICE))
- .thenThrow(new IllegalStateException());
+ public void isAvailable_noWifiDirectFeature_shouldReturnFalse() {
+ when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT))
+ .thenReturn(false);
assertThat(WifiDisplaySettings.isAvailable(mActivity))
.isFalse();
diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
index 0f3eb31..d53af9d 100644
--- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
@@ -29,6 +29,7 @@
import android.app.ActionBar;
import android.app.Activity;
+import android.arch.lifecycle.LifecycleOwner;
import android.support.v7.widget.RecyclerView;
import android.view.View;
@@ -55,6 +56,7 @@
@Mock
private ActionBar mActionBar;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
private View mView;
@Before
@@ -62,7 +64,8 @@
MockitoAnnotations.initMocks(this);
when(mActivity.getActionBar()).thenReturn(mActionBar);
mView = new View(RuntimeEnvironment.application);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java
new file mode 100644
index 0000000..d540a62
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.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.widget;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AppCheckBoxPreferenceTest {
+
+ private Context mContext;
+ private AppCheckBoxPreference mPreference;
+ private AppCheckBoxPreference mAttrPreference;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mPreference = new AppCheckBoxPreference(mContext);
+ mAttrPreference = new AppCheckBoxPreference(mContext, null /* attrs */);
+ }
+
+ @Test
+ public void testGetLayoutResource() {
+ assertThat(mPreference.getLayoutResource()).isEqualTo(R.layout.preference_app);
+ assertThat(mAttrPreference.getLayoutResource()).isEqualTo(R.layout.preference_app);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index daa42b4..06b4d55 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -165,6 +165,57 @@
}
@Test
+ public void bindButton_hasEditRuleNameClickListener_shouldShowButton() {
+ final ResolveInfo info = new ResolveInfo();
+ info.activityInfo = new ActivityInfo();
+ info.activityInfo.packageName = "123";
+ info.activityInfo.name = "321";
+ final View view = mLayoutInflater
+ .inflate(R.layout.settings_entity_header, null /* root */);
+ when(mActivity.getApplicationContext()).thenReturn(mContext);
+
+ mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
+ mController.setEditZenRuleNameListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ // do nothing
+ }
+ });
+ mController.setButtonActions(
+ EntityHeaderController.ActionType.ACTION_DND_RULE_PREFERENCE,
+ EntityHeaderController.ActionType.ACTION_NONE);
+ mController.done(mActivity);
+
+ final ImageButton button1 = view.findViewById(android.R.id.button1);
+ assertThat(button1.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(button1.getDrawable()).isNotNull();
+ assertThat(view.findViewById(android.R.id.button2).getVisibility())
+ .isEqualTo(View.GONE);
+ }
+
+ @Test
+ public void bindButton_noEditRuleNameClickListener_shouldNotShowButton() {
+ final ResolveInfo info = new ResolveInfo();
+ info.activityInfo = new ActivityInfo();
+ info.activityInfo.packageName = "123";
+ info.activityInfo.name = "321";
+ final View view = mLayoutInflater
+ .inflate(R.layout.settings_entity_header, null /* root */);
+ when(mActivity.getApplicationContext()).thenReturn(mContext);
+
+ mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
+ mController.setButtonActions(
+ EntityHeaderController.ActionType.ACTION_DND_RULE_PREFERENCE,
+ EntityHeaderController.ActionType.ACTION_NONE);
+ mController.done(mActivity);
+
+ assertThat(view.findViewById(android.R.id.button1).getVisibility())
+ .isEqualTo(View.GONE);
+ assertThat(view.findViewById(android.R.id.button2).getVisibility())
+ .isEqualTo(View.GONE);
+ }
+
+
+ @Test
public void bindButton_noAppPref_shouldNotShowButton() {
final View appLinks = mLayoutInflater
.inflate(R.layout.settings_entity_header, null /* root */);
diff --git a/tests/robotests/src/com/android/settings/widget/LinearColorBarTest.java b/tests/robotests/src/com/android/settings/widget/LinearColorBarTest.java
new file mode 100644
index 0000000..dc14ae7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/LinearColorBarTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.graphics.Canvas;
+
+import com.android.settings.TestConfig;
+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;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowCanvas;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LinearColorBarTest {
+
+ private static final int HEIGHT = 100;
+ private static final int WIDTH = 100;
+
+ private Context mContext;
+ private LinearColorBar mLinearColorBar;
+ private Canvas mCanvas;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mLinearColorBar = spy(new LinearColorBar(mContext, null /* attrs */));
+ when(mLinearColorBar.getHeight()).thenReturn(HEIGHT);
+ when(mLinearColorBar.getWidth()).thenReturn(WIDTH);
+ mLinearColorBar.setRatios(0.2f, 0.4f, 0.4f);
+ mLinearColorBar.setColors(1, 2, 3);
+ mCanvas = new Canvas();
+ }
+
+ @Test
+ public void draw_ltr_showStartFromLeft() {
+ mLinearColorBar.onDraw(mCanvas);
+
+ final ShadowCanvas shadowCanvas = Shadows.shadowOf(mCanvas);
+ assertThat(shadowCanvas.getRectPaintHistoryCount()).isEqualTo(3);
+
+ // 3 boxes, takes space of 20%, 40%, 40% of the the WIDTH correspondingly.
+ assertThat(shadowCanvas.getDrawnRect(0).left).isWithin(0.01f).of(0);
+ assertThat(shadowCanvas.getDrawnRect(1).left).isWithin(0.01f).of(20);
+ assertThat(shadowCanvas.getDrawnRect(2).left).isWithin(0.01f).of(60);
+ }
+
+ @Test
+ public void draw_rtl_showStartFromRight() {
+ when(mLinearColorBar.isLayoutRtl()).thenReturn(true);
+
+ mLinearColorBar.onDraw(mCanvas);
+
+ final ShadowCanvas shadowCanvas = Shadows.shadowOf(mCanvas);
+ assertThat(shadowCanvas.getRectPaintHistoryCount()).isEqualTo(3);
+
+ // 3 boxes, takes space of 20%, 40%, 40% of the the WIDTH correspondingly.
+ assertThat(shadowCanvas.getDrawnRect(0).right).isWithin(0.01f).of(100);
+ assertThat(shadowCanvas.getDrawnRect(1).right).isWithin(0.01f).of(80);
+ assertThat(shadowCanvas.getDrawnRect(2).right).isWithin(0.01f).of(40);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
index e6530d5..ac3e0b6 100644
--- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
@@ -89,6 +89,23 @@
}
@Test
+ public void setCheckboxEnabled_shouldOnlyUpdateCheckBoxEnabledState() {
+ final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
+ LayoutInflater.from(mContext).inflate(
+ R.layout.preference_widget_master_checkbox, null));
+ final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
+ mPreference.onBindViewHolder(holder);
+
+ mPreference.setCheckBoxEnabled(false);
+ assertThat(mPreference.isEnabled()).isTrue();
+ assertThat(checkBox.isEnabled()).isFalse();
+
+ mPreference.setCheckBoxEnabled(true);
+ assertThat(mPreference.isEnabled()).isTrue();
+ assertThat(checkBox.isEnabled()).isTrue();
+ }
+
+ @Test
public void clickWidgetView_shouldToggleCheckBox() {
final LayoutInflater inflater = LayoutInflater.from(mContext);
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
index c805761..8eb19cd 100644
--- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
@@ -17,10 +17,10 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
-
import static org.robolectric.RuntimeEnvironment.application;
import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
import android.widget.TextView;
import com.android.settings.R;
@@ -38,36 +38,50 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SwitchBarTest {
+ private static final int COLOR_BACKGROUND = 1;
+ private static final int COLOR_BACKGROUND_ACTIVATED = 2;
+
private Context mContext;
private SwitchBar mBar;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- mBar = new SwitchBar(application, Robolectric.buildAttributeSet().build());
+ mBar = new SwitchBar(application, Robolectric.buildAttributeSet()
+ .addAttribute(R.attr.switchBarBackgroundColor, String.valueOf(COLOR_BACKGROUND))
+ .addAttribute(R.attr.switchBarBackgroundActivatedColor,
+ String.valueOf(COLOR_BACKGROUND_ACTIVATED))
+ .build());
}
@Test
- public void testDefaultLabels() {
- int defaultOnText = R.string.switch_on_text;
- int defaultOffText = R.string.switch_off_text;
+ public void cycleChecked_defaultLabel_shouldUpdateTextAndBackground() {
+ final int defaultOnText = R.string.switch_on_text;
+ final int defaultOffText = R.string.switch_off_text;
+
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(((TextView) mBar.findViewById(R.id.switch_text)).getText())
.isEqualTo(mContext.getString(defaultOnText));
}
@Test
- public void testCustomLabels() {
- int onText = R.string.master_clear_progress_text;
- int offText = R.string.manage_space_text;
+ public void cycleChecked_customLabel_shouldUpdateTextAndBackground() {
+ final int onText = R.string.master_clear_progress_text;
+ 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(((TextView) mBar.findViewById(R.id.switch_text)).getText())
.isEqualTo(mContext.getString(onText));
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
index 63f89e6..84549a6 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
@@ -22,9 +22,9 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settings.wrapper.ConnectivityManagerWrapper;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
index cf3cca7..08ee0ef 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.IntentFilter;
@@ -61,12 +62,14 @@
private Preference mMacPreference;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
private WifiInfoPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
when(mContext.getSystemService(WifiManager.class))
.thenReturn(mWifiManager);
when(mScreen.findPreference(anyString()))
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
index 1708e36..82569c7 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
@@ -30,10 +30,10 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
index 7a734e5..e4dfea4 100644
--- a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
@@ -27,6 +27,7 @@
import static org.mockito.Mockito.when;
import android.app.FragmentManager;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -65,12 +66,14 @@
private Preference mWpsPinPref;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
private WpsPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
when(mContext.getSystemService(WifiManager.class))
.thenReturn(mWifiManager);
when(mScreen.findPreference(anyString()))
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 6a36a79..ca2cac0 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -33,6 +33,7 @@
import static org.mockito.Mockito.when;
import android.app.Activity;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -64,7 +65,6 @@
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowBidiFormatter;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManagerWrapper;
@@ -75,6 +75,7 @@
import com.android.settings.widget.EntityHeaderController;
import com.android.settings.wifi.WifiDetailPreference;
import com.android.settings.wrapper.ConnectivityManagerWrapper;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.wifi.AccessPoint;
@@ -154,6 +155,7 @@
private Context mContext;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
private LinkProperties mLinkProperties;
private WifiDetailPreferenceController mController;
@@ -214,7 +216,8 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfig);
when(mockAccessPoint.getLevel()).thenReturn(LEVEL);
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
new file mode 100644
index 0000000..f624bd5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.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 android.support.v7.preference.DropDownPreference;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+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;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiMeteredPreferenceControllerTest {
+ public static final int METERED_OVERRIDE_NONE = 0;
+ public static final int METERED_OVERRIDE_METERED = 1;
+ public static final int METERED_OVERRIDE_NOT_METERED = 2;
+
+ @Mock
+ private WifiConfiguration mWifiConfiguration;
+
+ private WifiMeteredPreferenceController mPreferenceController;
+ private Context mContext;
+ private DropDownPreference mDropDownPreference;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+
+ mPreferenceController = spy(
+ new WifiMeteredPreferenceController(mContext, mWifiConfiguration));
+ mDropDownPreference = new DropDownPreference(mContext);
+ mDropDownPreference.setEntries(R.array.wifi_metered_entries);
+ mDropDownPreference.setEntryValues(R.array.wifi_metered_values);
+ }
+
+ @Test
+ public void testUpdateState_wifiMetered_setCorrectValue() {
+ doReturn(METERED_OVERRIDE_METERED).when(mPreferenceController).getMeteredOverride();
+
+ mPreferenceController.updateState(mDropDownPreference);
+
+ assertThat(mDropDownPreference.getEntry()).isEqualTo("Treat as metered");
+ }
+
+ @Test
+ public void testUpdateState_wifiNotMetered_setCorrectValue() {
+ doReturn(METERED_OVERRIDE_NOT_METERED).when(mPreferenceController).getMeteredOverride();
+
+ mPreferenceController.updateState(mDropDownPreference);
+
+ assertThat(mDropDownPreference.getEntry()).isEqualTo("Treat as unmetered");
+ }
+
+ @Test
+ public void testUpdateState_wifiAuto_setCorrectValue() {
+ doReturn(METERED_OVERRIDE_NONE).when(mPreferenceController).getMeteredOverride();
+
+ mPreferenceController.updateState(mDropDownPreference);
+
+ assertThat(mDropDownPreference.getEntry()).isEqualTo("Use network preference");
+ }
+}
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 e809431..5c141ec 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.arch.lifecycle.LifecycleOwner;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -60,12 +61,14 @@
private Preference mWifiDirectPreference;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
private WifiP2pPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
when(mContext.getSystemService(WifiManager.class))
.thenReturn(mWifiManager);
when(mScreen.findPreference(anyString()))
diff --git a/tests/robotests/src/com/android/settings/TetherServiceTest.java b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
similarity index 72%
rename from tests/robotests/src/com/android/settings/TetherServiceTest.java
rename to tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
index 0275c15..583bd52 100644
--- a/tests/robotests/src/com/android/settings/TetherServiceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
@@ -13,17 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings;
+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;
+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 android.content.Context;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.net.wifi.WifiManager;
+import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import java.util.ArrayList;
@@ -87,4 +93,22 @@
mService.cancelAlarmIfNecessary();
verify(mContext).unregisterReceiver(any(HotspotOffReceiver.class));
}
+
+ @Test
+ public void onDestroy_shouldUnregisterReceiver() {
+ final ArrayList<Integer> tethers = new ArrayList<>();
+ ReflectionHelpers.setField(mService, "mCurrentTethers", tethers);
+ ReflectionHelpers.setField(mService, "mBase", mContext);
+ final SharedPreferences prefs = mock(SharedPreferences .class);
+ final SharedPreferences.Editor editor = mock(SharedPreferences.Editor.class);
+ when(mContext.getSharedPreferences(anyString(), anyInt())).thenReturn(prefs);
+ when(prefs.edit()).thenReturn(editor);
+ when(editor.putString(anyString(), anyString())).thenReturn(editor);
+ final HotspotOffReceiver hotspotOffReceiver = mock(HotspotOffReceiver.class);
+ mService.setHotspotOffReceiver(hotspotOffReceiver);
+
+ mService.onDestroy();
+
+ verify(hotspotOffReceiver).unregister();
+ }
}
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 6832ca8..2a633d9 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
@@ -80,7 +80,7 @@
mController.displayPreference(mScreen);
- assertThat(mListPreference.getEntries().length).isEqualTo(2);
+ assertThat(mListPreference.getEntries().length).isEqualTo(3);
}
@Test
@@ -113,13 +113,18 @@
when(mWifiManager.is5GHzBandSupported()).thenReturn(true);
mController.displayPreference(mScreen);
+
+ // -1 is WifiConfiguration.AP_BAND_ANY, for 'Auto' option.
+ mController.onPreferenceChange(mListPreference, "-1");
+ assertThat(mController.getBandIndex()).isEqualTo(-1);
+
mController.onPreferenceChange(mListPreference, "1");
assertThat(mController.getBandIndex()).isEqualTo(1);
mController.onPreferenceChange(mListPreference, "0");
assertThat(mController.getBandIndex()).isEqualTo(0);
- verify(mListener, times(2)).onTetherConfigUpdated();
+ verify(mListener, times(3)).onTetherConfigUpdated();
}
@Test
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 a40cce6..dca6974 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
@@ -18,14 +18,19 @@
import static android.arch.lifecycle.Lifecycle.Event.ON_START;
import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
+
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;
+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 android.arch.lifecycle.LifecycleOwner;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
@@ -64,6 +69,7 @@
shadows = {
WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class,
WifiTetherPreferenceControllerTest.ShadowWifiTetherSwitchBarController.class,
+ WifiTetherPreferenceControllerTest.ShadowWifiTetherSoftApManager.class
})
public class WifiTetherPreferenceControllerTest {
@@ -78,12 +84,14 @@
private WifiTetherPreferenceController mController;
private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
private MasterSwitchPreference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mLifecycle = new Lifecycle(() -> mLifecycle);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
FakeFeatureFactory.setupForTest();
mPreference = new MasterSwitchPreference(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
@@ -91,8 +99,9 @@
when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
- when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[] {"1", "2"});
- mController = new WifiTetherPreferenceController(mContext, mLifecycle);
+ when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+ mController = new WifiTetherPreferenceController(mContext, mLifecycle,
+ false /* initSoftApManager */);
}
@After
@@ -102,8 +111,9 @@
@Test
public void isAvailable_noTetherRegex_shouldReturnFalse() {
- when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[] {});
- mController = new WifiTetherPreferenceController(mContext, mLifecycle);
+ when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{});
+ mController = new WifiTetherPreferenceController(mContext, mLifecycle,
+ false /* initSoftApManager */);
assertThat(mController.isAvailable()).isFalse();
}
@@ -137,7 +147,6 @@
mController.displayPreference(mScreen);
mLifecycle.handleLifecycleEvent(ON_START);
- assertThat(ShadowWifiTetherSwitchBarController.onStartCalled).isTrue();
verify(mContext).registerReceiver(eq(receiver), any(IntentFilter.class));
verify(pref).setChecked(false);
}
@@ -242,6 +251,19 @@
}
}
+ @Implements(WifiTetherSoftApManager.class)
+ public static final class ShadowWifiTetherSoftApManager {
+ @Implementation
+ public void registerSoftApCallback() {
+ // do nothing
+ }
+
+ @Implementation
+ public void unRegisterSoftApCallback() {
+ // do nothing
+ }
+ }
+
@Implements(WifiTetherSwitchBarController.class)
public static final class ShadowWifiTetherSwitchBarController {
diff --git a/tests/uitests/Android.mk b/tests/uitests/Android.mk
new file mode 100644
index 0000000..d52911d
--- /dev/null
+++ b/tests/uitests/Android.mk
@@ -0,0 +1,41 @@
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := SettingsUITests
+LOCAL_COMPATIBILITY_SUITE := device-tests
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_JAVA_LIBRARIES := \
+ android.test.runner \
+ android.test.base
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-test \
+ app-helpers-core \
+ launcher-helper-lib \
+ metrics-helper-lib \
+ platform-test-annotations \
+ settings-helper \
+ sysui-helper \
+ timeresult-helper-lib \
+ truth-prebuilt \
+ ub-uiautomator \
+
+#LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/tests/uitests/AndroidManifest.xml b/tests/uitests/AndroidManifest.xml
new file mode 100644
index 0000000..06d74c6
--- /dev/null
+++ b/tests/uitests/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.settings.ui">
+
+ <application>
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.READ_LOGS" />
+
+ <instrumentation
+ android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.settings.ui"
+ android:label="Android Settings Functional UI Tests" />
+</manifest>
diff --git a/tests/uitests/AndroidTest.xml b/tests/uitests/AndroidTest.xml
new file mode 100644
index 0000000..fbeea2d
--- /dev/null
+++ b/tests/uitests/AndroidTest.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.
+-->
+<configuration description="Run Android Settings Functional UI Tests.">
+ <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+ <option name="test-file-name" value="SettingsUITests.apk" />
+ </target_preparer>
+
+ <option name="test-suite-tag" value="apct" />
+ <option name="test-tag" value="SettingsUITests" />
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="com.android.settings.ui" />
+ <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+ </test>
+</configuration>
diff --git a/tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.java b/tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.java
new file mode 100644
index 0000000..b92a707
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.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.ui;
+
+import static com.android.settings.ui.testutils.SettingsTestUtils.SETTINGS_PACKAGE;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.os.RemoteException;
+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.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.text.TextUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+
+/** Verifies basic functionality of the About Phone screen */
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class AboutPhoneSettingsTests {
+ private static final int TIMEOUT = 2000;
+
+ // TODO: retrieve using name/ids from com.android.settings package
+ private static final String[] sResourceTexts = {
+ "Phone number",
+ "SIM status",
+ "Model & hardware",
+ "MEID",
+ "Android version"
+ };
+
+ private UiDevice mDevice;
+ private Instrumentation mInstrumentation;
+
+ @Before
+ public void setUp() throws Exception {
+ mInstrumentation = InstrumentationRegistry.getInstrumentation();
+ mDevice = UiDevice.getInstance(mInstrumentation);
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("Failed to freeze device orientaion", e);
+ }
+
+ // make sure we are in a clean state before starting the test
+ mDevice.pressHome();
+ Thread.sleep(TIMEOUT * 2);
+ launchAboutPhoneSettings(Settings.ACTION_DEVICE_INFO_SETTINGS);
+ // TODO: make sure we are always at the top of the app
+ // currently this will fail if the user has navigated into submenus
+ UiObject2 view =
+ mDevice.wait(
+ Until.findObject(By.res(SETTINGS_PACKAGE + ":id/main_content")), TIMEOUT);
+ assertThat(view).isNotNull();
+ view.scroll(Direction.UP, 1.0f);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ // Adding an extra pressBack so we exit About Phone Settings
+ // and finish the test cleanly
+ mDevice.pressBack();
+ mDevice.pressHome(); // finish settings activity
+ mDevice.waitForIdle(TIMEOUT * 2); // give UI time to finish animating
+ }
+
+ @Test
+ public void testAllMenuEntriesExist() throws Exception {
+ searchForItemsAndTakeAction(mDevice, sResourceTexts);
+ }
+
+ private void launchAboutPhoneSettings(String aboutSetting) throws Exception {
+ Intent aboutIntent = new Intent(aboutSetting);
+ aboutIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ InstrumentationRegistry.getTargetContext().startActivity(aboutIntent);
+ }
+
+ /**
+ * Removes items found in the view and optionally takes some action.
+ */
+ private void removeItemsAndTakeAction(UiDevice device, ArrayList<String> itemsLeftToFind)
+ throws Exception {
+ for (Iterator<String> iterator = itemsLeftToFind.iterator(); iterator.hasNext(); ) {
+ String itemText = iterator.next();
+ UiObject2 item = device.wait(Until.findObject(By.text(itemText)), TIMEOUT);
+ if (item != null) {
+ iterator.remove();
+ }
+ }
+ }
+
+ /**
+ * Searches for UI elements in the current view and optionally takes some action.
+ *
+ * <p>Will scroll down the screen until it has found all elements or reached the bottom.
+ * This allows elements to be found and acted on even if they change order.
+ */
+ private void searchForItemsAndTakeAction(UiDevice device, String[] itemsToFind)
+ throws Exception {
+
+ ArrayList<String> itemsLeftToFind = new ArrayList<>(Arrays.asList(itemsToFind));
+ assertWithMessage("There must be at least one item to search for on the screen!")
+ .that(itemsLeftToFind)
+ .isNotEmpty();
+
+ boolean canScrollDown = true;
+ while (canScrollDown && !itemsLeftToFind.isEmpty()) {
+ removeItemsAndTakeAction(device, itemsLeftToFind);
+
+ // when we've finished searching the current view, scroll down
+ UiObject2 view =
+ device.wait(
+ Until.findObject(By.res(SETTINGS_PACKAGE + ":id/main_content")),
+ TIMEOUT * 2);
+ if (view != null) {
+ canScrollDown = view.scroll(Direction.DOWN, 1.0f);
+ } else {
+ canScrollDown = false;
+ }
+ }
+ // check the last items once we have reached the bottom of the view
+ removeItemsAndTakeAction(device, itemsLeftToFind);
+
+ assertWithMessage("The following items were not found on the screen: "
+ + TextUtils.join(", ", itemsLeftToFind))
+ .that(itemsLeftToFind)
+ .isEmpty();
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/AccessibilitySettingsTests.java b/tests/uitests/src/com/android/settings/ui/AccessibilitySettingsTests.java
new file mode 100644
index 0000000..83afa65
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/AccessibilitySettingsTests.java
@@ -0,0 +1,279 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.metricshelper.MetricsAsserts;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.SettingsHelper;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
+
+import android.metrics.MetricsReader;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+public class AccessibilitySettingsTests extends InstrumentationTestCase {
+
+ private static final String SETTINGS_PACKAGE = "com.android.settings";
+ private static final int TIMEOUT = 2000;
+ private UiDevice mDevice;
+ private MetricsReader mMetricsReader;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ mDevice = UiDevice.getInstance(getInstrumentation());
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("failed to freeze device orientaion", e);
+ }
+ mMetricsReader = new MetricsReader();
+ // Clear out old logs
+ mMetricsReader.checkpoint();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ // Need to finish settings activity
+ mDevice.pressBack();
+ mDevice.pressHome();
+ mDevice.waitForIdle();
+ super.tearDown();
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testHighContrastTextOn() throws Exception {
+ verifyAccessibilitySettingOnOrOff("High contrast text",
+ Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, 0, 1);
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testHighContrastTextOff() throws Exception {
+ verifyAccessibilitySettingOnOrOff("High contrast text",
+ Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, 1, 0);
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testPowerButtonEndsCallOn() throws Exception {
+ verifyAccessibilitySettingOnOrOff("Power button ends call",
+ Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, 1, 2);
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testPowerButtonEndsCallOff() throws Exception {
+ verifyAccessibilitySettingOnOrOff("Power button ends call",
+ Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, 2, 1);
+ }
+
+ /* Suppressing these four tests. The settings don't play
+ * nice with Settings.System.putInt or Settings.Secure.putInt.
+ * Need further clarification. Filed bug b/27792029
+ */
+ @Suppress
+ @MediumTest
+ public void testAutoRotateScreenOn() throws Exception {
+ verifyAccessibilitySettingOnOrOff("Auto-rotate screen",
+ Settings.System.ACCELEROMETER_ROTATION, 0, 1);
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAutoRotateScreenOff() throws Exception {
+ verifyAccessibilitySettingOnOrOff("Auto-rotate screen",
+ Settings.System.ACCELEROMETER_ROTATION, 1, 0);
+ }
+
+ @Suppress
+ @MediumTest
+ public void testMonoAudioOn() throws Exception {
+ verifyAccessibilitySettingOnOrOff("Mono audio",
+ Settings.System.MASTER_MONO, 0, 1);
+ }
+
+ @Suppress
+ @MediumTest
+ public void testMonoAudioOff() throws Exception {
+ verifyAccessibilitySettingOnOrOff("Mono audio",
+ Settings.System.MASTER_MONO, 1, 0);
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testLargeMousePointerOn() throws Exception {
+ verifyAccessibilitySettingOnOrOff("Large mouse pointer",
+ Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, 0, 1);
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testLargeMousePointerOff() throws Exception {
+ verifyAccessibilitySettingOnOrOff("Large mouse pointer",
+ Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, 1, 0);
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testColorCorrection() throws Exception {
+ verifySettingToggleAfterScreenLoad("Color correction",
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+ MetricsAsserts.assertHasVisibilityLog("Missing color correction log",
+ mMetricsReader, MetricsEvent.ACCESSIBILITY_TOGGLE_DALTONIZER, true);
+ }
+
+ // Suppressing this test, since UiAutomator + talkback don't play nice
+ @Suppress
+ @MediumTest
+ public void testTalkback() throws Exception {
+ verifySettingToggleAfterScreenLoad("TalkBack",
+ Settings.Secure.ACCESSIBILITY_ENABLED);
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testCaptions() throws Exception {
+ verifySettingToggleAfterScreenLoad("Captions",
+ Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED);
+ MetricsAsserts.assertHasVisibilityLog("Missing captions log",
+ mMetricsReader, MetricsEvent.ACCESSIBILITY_CAPTION_PROPERTIES, true);
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testMagnificationGesture() throws Exception {
+ verifySettingToggleAfterScreenLoad("Magnification", "Magnify with triple-tap",
+ Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED);
+ MetricsAsserts.assertHasVisibilityLog("Missing magnification log",
+ mMetricsReader, MetricsEvent.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION, true);
+ }
+
+ @MediumTest
+ public void testClickAfterPointerStopsMoving() throws Exception {
+ verifySettingToggleAfterScreenLoad("Click after pointer stops moving",
+ Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED);
+ }
+
+ @MediumTest
+ public void testAccessibilitySettingsLoadLog() throws Exception {
+ launchAccessibilitySettings();
+ MetricsAsserts.assertHasVisibilityLog("Missing accessibility settings load log",
+ mMetricsReader, MetricsEvent.ACCESSIBILITY, true);
+ }
+
+ public void launchAccessibilitySettings() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+ Settings.ACTION_ACCESSIBILITY_SETTINGS);
+ }
+
+ private void verifyAccessibilitySettingOnOrOff(String settingText,
+ String settingFlag, int initialFlagValue, int expectedFlagValue)
+ throws Exception {
+ Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+ settingFlag, initialFlagValue);
+ launchAccessibilitySettings();
+ UiObject2 settingsTitle = findItemOnScreen(settingText);
+ settingsTitle.click();
+ Thread.sleep(TIMEOUT);
+ int settingValue = Settings.Secure
+ .getInt(getInstrumentation().getContext().getContentResolver(), settingFlag);
+ assertEquals(settingText + " not correctly set after toggle",
+ expectedFlagValue, settingValue);
+ }
+
+ private void verifySettingToggleAfterScreenLoad(String settingText, String settingFlag)
+ throws Exception {
+ verifySettingToggleAfterScreenLoad(settingText, null, settingFlag);
+ }
+
+ private void verifySettingToggleAfterScreenLoad
+ (String settingText, String subSetting, String settingFlag) throws Exception {
+ // Load accessibility settings
+ launchAccessibilitySettings();
+ Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+ settingFlag, 0);
+ Thread.sleep(TIMEOUT);
+ // Tap on setting required
+ UiObject2 settingTitle = findItemOnScreen(settingText);
+ // Load screen
+ settingTitle.click();
+ Thread.sleep(TIMEOUT);
+ if (subSetting != null) {
+ UiObject2 subSettingObject = findItemOnScreen(subSetting);
+ subSettingObject.click();
+ Thread.sleep(TIMEOUT);
+ }
+ // Toggle value
+ UiObject2 settingToggle = mDevice.wait(Until.findObject(By.text("Off")),
+ TIMEOUT);
+ settingToggle.click();
+ dismissOpenDialog();
+ Thread.sleep(TIMEOUT);
+ // Assert new value
+ int settingValue = Settings.Secure.
+ getInt(getInstrumentation().getContext().getContentResolver(), settingFlag);
+ assertEquals(settingText + " value not set correctly", 1, settingValue);
+ // Toogle value
+ settingToggle.click();
+ dismissOpenDialog();
+ mDevice.pressBack();
+ Thread.sleep(TIMEOUT);
+ // Assert reset to old value
+ settingValue = Settings.Secure.
+ getInt(getInstrumentation().getContext().getContentResolver(), settingFlag);
+ assertEquals(settingText + " value not set correctly", 0, settingValue);
+ }
+
+ private UiObject2 findItemOnScreen(String item) throws Exception {
+ int count = 0;
+ UiObject2 settingsPanel = mDevice.wait(Until.findObject
+ (By.res(SETTINGS_PACKAGE, "list")), TIMEOUT);
+ while (settingsPanel.fling(Direction.UP) && count < 3) {
+ count++;
+ }
+ count = 0;
+ UiObject2 setting = null;
+ while(count < 3 && setting == null) {
+ setting = mDevice.wait(Until.findObject(By.text(item)), TIMEOUT);
+ if (setting == null) {
+ settingsPanel.scroll(Direction.DOWN, 1.0f);
+ }
+ count++;
+ }
+ return setting;
+ }
+
+ private void dismissOpenDialog() throws Exception {
+ UiObject2 okButton = mDevice.wait(Until.findObject
+ (By.res("android:id/button1")), TIMEOUT*2);
+ if (okButton != null) {
+ okButton.click();
+ }
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java b/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java
new file mode 100644
index 0000000..6be49d6
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.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.ui;
+
+import android.content.Intent;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.ActivityHelper;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+
+/** Verifies basic functionality of the About Phone screen */
+public class AppsSettingsTests extends InstrumentationTestCase {
+ private static final boolean LOCAL_LOGV = false;
+ private static final String SETTINGS_PACKAGE = "com.android.settings";
+ private static final String TAG = "AboutPhoneSettingsTest";
+ private static final int TIMEOUT = 2000;
+ private ActivityHelper mActivityHelper = null;
+
+ private UiDevice mDevice;
+
+ private static final String[] sResourceTexts = {
+ "Storage",
+ "Data usage",
+ "Permissions",
+ "App notifications",
+ "Open by default",
+ "Battery",
+ "Memory"
+ };
+
+ @Override
+ public void setUp() throws Exception {
+ if (LOCAL_LOGV) {
+ Log.d(TAG, "-------");
+ }
+ super.setUp();
+ mDevice = UiDevice.getInstance(getInstrumentation());
+ mActivityHelper = ActivityHelper.getInstance();
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("Failed to freeze device orientaion", e);
+ }
+
+ // make sure we are in a clean state before starting the test
+ mDevice.pressHome();
+ Thread.sleep(TIMEOUT * 2);
+ launchAppsSettings();
+ UiObject2 view =
+ mDevice.wait(
+ Until.findObject(By.text("All apps")), TIMEOUT);
+ assertNotNull("Could not find Settings > Apps screen", view);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ mDevice.pressBack();
+ mDevice.pressHome(); // finish settings activity
+ mDevice.waitForIdle(TIMEOUT * 2); // give UI time to finish animating
+ super.tearDown();
+ }
+
+ @MediumTest
+ public void testAppSettingsListForCalculator() {
+ UiObject2 calculator = mDevice.wait(
+ Until.findObject(By.text("Calculator")), TIMEOUT);
+ calculator.click();
+ for (String setting : sResourceTexts) {
+ UiObject2 appSetting =
+ mDevice.wait(
+ Until.findObject(By.text(setting)), TIMEOUT);
+ assertNotNull("Missing setting for Calculator: " + setting, appSetting);
+ appSetting.scroll(Direction.DOWN, 10.0f);
+ }
+ }
+
+ @MediumTest
+ public void testDisablingAndEnablingSystemApp() throws Exception {
+ launchAppsSettings();
+ UiObject2 calculator = mDevice.wait(
+ Until.findObject(By.text("Calculator")), TIMEOUT);
+ calculator.click();
+ mDevice.waitForIdle(TIMEOUT);
+ UiObject2 appInfoList = mDevice.wait(
+ Until.findObject(By.res(SETTINGS_PACKAGE, "list")), TIMEOUT);
+ appInfoList.scroll(Direction.DOWN, 100.0f);
+ UiObject2 disableButton = mDevice.wait(
+ Until.findObject(By.text("DISABLE")), TIMEOUT);
+ disableButton.click();
+ mDevice.waitForIdle(TIMEOUT);
+ // Click on "Disable App" on dialog.
+ mDevice.wait(
+ Until.findObject(By.text("DISABLE APP")), TIMEOUT).click();
+ mDevice.waitForIdle(TIMEOUT);
+ UiObject2 enableButton = mDevice.wait(
+ Until.findObject(By.text("ENABLE")), TIMEOUT);
+ assertNotNull("App not disabled successfully", enableButton);
+ enableButton.click();
+ mDevice.waitForIdle(TIMEOUT);
+ disableButton = mDevice.wait(
+ Until.findObject(By.text("DISABLE")), TIMEOUT);
+ assertNotNull("App not enabled successfully", disableButton);
+ }
+
+ private void launchAppsSettings() throws Exception {
+ Intent appsSettingsIntent = new
+ Intent(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS);
+ mActivityHelper.launchIntent(appsSettingsIntent);
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/BluetoothNetworkSettingsTests.java b/tests/uitests/src/com/android/settings/ui/BluetoothNetworkSettingsTests.java
new file mode 100644
index 0000000..d41be9c
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/BluetoothNetworkSettingsTests.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothManager;
+import android.content.Context;
+import android.content.Intent;
+import android.metrics.MetricsReader;
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.metricshelper.MetricsAsserts;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+public class BluetoothNetworkSettingsTests extends InstrumentationTestCase {
+
+ private static final String SETTINGS_PACKAGE = "com.android.settings";
+ private static final int TIMEOUT = 2000;
+ private static final int LONG_TIMEOUT = 40000;
+ private UiDevice mDevice;
+ private MetricsReader mMetricsReader;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ mDevice = UiDevice.getInstance(getInstrumentation());
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("failed to freeze device orientaion", e);
+ }
+ mMetricsReader = new MetricsReader();
+ // Clear out old logs
+ mMetricsReader.checkpoint();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ mDevice.pressBack();
+ mDevice.pressHome();
+ mDevice.waitForIdle();
+ super.tearDown();
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testBluetoothEnabled() throws Exception {
+ verifyBluetoothOnOrOff(true);
+ MetricsAsserts.assertHasActionLog("missing bluetooth toggle log",
+ mMetricsReader, MetricsEvent.ACTION_BLUETOOTH_TOGGLE);
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testBluetoothDisabled() throws Exception {
+ verifyBluetoothOnOrOff(false);
+ MetricsAsserts.assertHasActionLog("missing bluetooth toggle log",
+ mMetricsReader, MetricsEvent.ACTION_BLUETOOTH_TOGGLE);
+ }
+
+ @MediumTest
+ public void testRenameOption() throws Exception {
+ launchBluetoothSettings();
+ verifyUiObjectClicked(By.text("Device name"), "Rename preference");
+ verifyUiObjectClicked(By.text("CANCEL"), "CANCEL button");
+
+ MetricsAsserts.assertHasActionLog("missing bluetooth rename device log",
+ mMetricsReader, MetricsEvent.ACTION_BLUETOOTH_RENAME);
+ MetricsAsserts.assertHasVisibilityLog("missing bluetooth rename dialog log",
+ mMetricsReader, MetricsEvent.DIALOG_BLUETOOTH_RENAME, true);
+ }
+
+ @MediumTest
+ public void testReceivedFilesOption() throws Exception {
+ launchBluetoothSettings();
+ verifyUiObjectClicked(By.text("Received files"), "Received files preference");
+
+ MetricsAsserts.assertHasActionLog("missing bluetooth received files log",
+ mMetricsReader, MetricsEvent.ACTION_BLUETOOTH_FILES);
+ }
+
+ @MediumTest
+ public void testHelpFeedbackOverflowOption() throws Exception {
+ launchBluetoothSettings();
+
+ // Verify help & feedback
+ assertNotNull("Help & feedback item not found under Bluetooth Settings",
+ mDevice.wait(Until.findObject(By.desc("Help & feedback")), TIMEOUT));
+ }
+
+ public void launchBluetoothSettings() throws Exception {
+ Intent btIntent = new Intent(Settings.ACTION_BLUETOOTH_SETTINGS);
+ btIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ getInstrumentation().getContext().startActivity(btIntent);
+ Thread.sleep(TIMEOUT * 2);
+ }
+
+ /**
+ * Find the {@link UiObject2} by {@code itemSelector} and try to click it if possible.
+ *
+ * If not find, throw assertion error
+ * @param itemSelector used to find the {@link UiObject2}
+ * @param text the description of the {@link UiObject2}
+ */
+ private void verifyUiObjectClicked(BySelector itemSelector, String text) throws Exception {
+ UiObject2 uiObject2 = mDevice.wait(Until.findObject(itemSelector), TIMEOUT);
+ assertNotNull(text + "is not present in bluetooth settings page", uiObject2);
+ uiObject2.click();
+ }
+
+ /**
+ * Toggles the Bluetooth switch and verifies that the change is reflected in Settings
+ *
+ * @param verifyOn set to whether you want the setting turned On or Off
+ */
+ private void verifyBluetoothOnOrOff(boolean verifyOn) throws Exception {
+ String switchText = "ON";
+ BluetoothAdapter bluetoothAdapter = ((BluetoothManager) getInstrumentation().getContext()
+ .getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
+ if (verifyOn) {
+ switchText = "OFF";
+ bluetoothAdapter.disable();
+ } else {
+ bluetoothAdapter.enable();
+ }
+ launchBluetoothSettings();
+ mDevice.wait(Until
+ .findObject(By.res(SETTINGS_PACKAGE, "switch_widget").text(switchText)), TIMEOUT)
+ .click();
+ Thread.sleep(TIMEOUT);
+ String bluetoothValue =
+ Settings.Global.getString(getInstrumentation().getContext().getContentResolver(),
+ Settings.Global.BLUETOOTH_ON);
+ if (verifyOn) {
+ assertEquals("1", bluetoothValue);
+ } else {
+ assertEquals("0", bluetoothValue);
+ }
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java b/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java
new file mode 100644
index 0000000..971d724
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.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.ui;
+
+import android.content.Context;
+import android.content.Intent;
+import android.nfc.NfcAdapter;
+import android.nfc.NfcManager;
+import android.os.RemoteException;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+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.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ConnectedDeviceTests {
+
+ private static final String SETTINGS_PACKAGE = "com.android.settings";
+ private static final int TIMEOUT = 2000;
+ private UiDevice mDevice;
+
+ @Before
+ public void setUp() throws Exception {
+ mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("failed to freeze device orientation", e);
+ }
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ mDevice.pressBack();
+ mDevice.pressHome();
+ }
+
+ // This NFC toggle test is set up this way since there's no way to set
+ // the NFC flag to enabled or disabled without touching UI.
+ // This way, we get coverage for whether or not the toggle button works.
+ @Test
+ public void testNFCToggle() throws Exception {
+ NfcManager manager = (NfcManager) InstrumentationRegistry.getTargetContext()
+ .getSystemService(Context.NFC_SERVICE);
+ NfcAdapter nfcAdapter = manager.getDefaultAdapter();
+ boolean nfcInitiallyEnabled = nfcAdapter.isEnabled();
+ InstrumentationRegistry.getContext().startActivity(new Intent()
+ .setClassName(
+ SETTINGS_PACKAGE,
+ "com.android.settings.Settings$ConnectedDeviceDashboardActivity"));
+ UiObject2 nfcSetting = mDevice.wait(Until.findObject(By.text("NFC")), TIMEOUT);
+ nfcSetting.click();
+ Thread.sleep(TIMEOUT * 2);
+ if (nfcInitiallyEnabled) {
+ assertFalse("NFC wasn't disabled on toggle", nfcAdapter.isEnabled());
+ nfcSetting.click();
+ Thread.sleep(TIMEOUT * 2);
+ assertTrue("NFC wasn't enabled on toggle", nfcAdapter.isEnabled());
+ } else {
+ assertTrue("NFC wasn't enabled on toggle", nfcAdapter.isEnabled());
+ nfcSetting.click();
+ Thread.sleep(TIMEOUT * 2);
+ assertFalse("NFC wasn't disabled on toggle", nfcAdapter.isEnabled());
+ }
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java b/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java
new file mode 100644
index 0000000..725ba5c
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.SettingsHelper;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
+
+public class DataUsageSettingsTests extends InstrumentationTestCase {
+
+ private static final String SETTINGS_PACKAGE = "com.android.settings";
+ private static final int TIMEOUT = 2000;
+ private UiDevice mDevice;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ mDevice = UiDevice.getInstance(getInstrumentation());
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("failed to freeze device orientaion", e);
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ // Need to finish settings activity
+ mDevice.pressBack();
+ mDevice.pressHome();
+ super.tearDown();
+ }
+
+ @MediumTest
+ public void testElementsOnDataUsageScreen() throws Exception {
+ launchDataUsageSettings();
+ assertNotNull("Data usage element not found",
+ mDevice.wait(Until.findObject(By.text("Usage")),
+ TIMEOUT));
+ assertNotNull("Data usage bar not found",
+ mDevice.wait(Until.findObject(By.res(SETTINGS_PACKAGE,
+ "color_bar")), TIMEOUT));
+ assertNotNull("WiFi Data usage element not found",
+ mDevice.wait(Until.findObject(By.text("Wi-Fi data usage")),
+ TIMEOUT));
+ assertNotNull("Network restrictions element not found",
+ mDevice.wait(Until.findObject(By.text("Network restrictions")),
+ TIMEOUT));
+ }
+
+ public void launchDataUsageSettings() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+ Settings.ACTION_SETTINGS);
+ mDevice.wait(Until
+ .findObject(By.text("Network & Internet")), TIMEOUT)
+ .click();
+ Thread.sleep(TIMEOUT * 2);
+ assertNotNull("Network & internet screen not loaded", mDevice.wait(
+ Until.findObject(By.text("Data usage")), TIMEOUT));
+ mDevice.wait(Until
+ .findObject(By.text("Data usage")), TIMEOUT)
+ .click();
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/DisplaySettingsTest.java b/tests/uitests/src/com/android/settings/ui/DisplaySettingsTest.java
new file mode 100644
index 0000000..0b7402d
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/DisplaySettingsTest.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+import android.content.ContentResolver;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+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 android.system.helpers.SettingsHelper;
+import android.system.helpers.SettingsHelper.SettingsType;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
+
+import java.util.regex.Pattern;
+
+public class DisplaySettingsTest extends InstrumentationTestCase {
+
+ private static final String PAGE = Settings.ACTION_DISPLAY_SETTINGS;
+ private static final int TIMEOUT = 2000;
+ private static final FontSetting FONT_SMALL = new FontSetting("Small", 0.85f);
+ private static final FontSetting FONT_NORMAL = new FontSetting("Default", 1.00f);
+ private static final FontSetting FONT_LARGE = new FontSetting("Large", 1.15f);
+ private static final FontSetting FONT_HUGE = new FontSetting("Largest", 1.30f);
+
+ private UiDevice mDevice;
+ private ContentResolver mResolver;
+ private SettingsHelper mHelper;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ mDevice = UiDevice.getInstance(getInstrumentation());
+ mDevice.setOrientationNatural();
+ mResolver = getInstrumentation().getContext().getContentResolver();
+ mHelper = new SettingsHelper();
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ // reset settings we touched that may impact others
+ Settings.System.putFloat(mResolver, Settings.System.FONT_SCALE, 1.00f);
+ mDevice.waitForIdle();
+ super.tearDown();
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testAdaptiveBrightness() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ mHelper.scrollVert(true);
+ Thread.sleep(1000);
+
+ assertTrue(mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE, "Adaptive brightness",
+ Settings.System.SCREEN_BRIGHTNESS_MODE));
+ assertTrue(mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE, "Adaptive brightness",
+ Settings.System.SCREEN_BRIGHTNESS_MODE));
+ }
+
+
+ // blocked on b/27487224
+ @MediumTest
+ @Suppress
+ public void testDaydreamToggle() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ clickMore();
+ Pattern p = Pattern.compile("On|Off");
+ mHelper.clickSetting("Screen saver");
+ Thread.sleep(1000);
+ try {
+ assertTrue(mHelper.verifyToggleSetting(SettingsType.SECURE, PAGE, p,
+ Settings.Secure.SCREENSAVER_ENABLED, false));
+ assertTrue(mHelper.verifyToggleSetting(SettingsType.SECURE, PAGE, p,
+ Settings.Secure.SCREENSAVER_ENABLED, false));
+ } finally {
+ mDevice.pressBack();
+ }
+ }
+
+ @MediumTest
+ public void testAccelRotation() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ mHelper.scrollVert(true);
+ clickMore();
+ Thread.sleep(4000);
+ int currentAccelSetting = Settings.System.getInt(
+ mResolver, Settings.System.ACCELEROMETER_ROTATION);
+ mHelper.clickSetting("Auto-rotate screen");
+ int newAccelSetting = Settings.System.getInt(
+ mResolver, Settings.System.ACCELEROMETER_ROTATION);
+ assertTrue("Accelorometer setting unchanged after toggle", currentAccelSetting != newAccelSetting);
+ mHelper.clickSetting("Auto-rotate screen");
+ int revertedAccelSetting = Settings.System.getInt(
+ mResolver, Settings.System.ACCELEROMETER_ROTATION);
+ assertTrue("Accelorometer setting unchanged after toggle", revertedAccelSetting != newAccelSetting);
+ }
+
+ @MediumTest
+ public void testDaydream() throws Exception {
+ Settings.Secure.putInt(mResolver, Settings.Secure.SCREENSAVER_ENABLED, 1);
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ clickMore();
+ mHelper.scrollVert(false);
+ mDevice.wait(Until.findObject(By.text("Screen saver")), TIMEOUT).click();
+ try {
+ assertTrue(mHelper.verifyRadioSetting(SettingsType.SECURE, PAGE,
+ "Current screen saver", "Clock", Settings.Secure.SCREENSAVER_COMPONENTS,
+ "com.google.android.deskclock/com.android.deskclock.Screensaver"));
+ assertTrue(mHelper.verifyRadioSetting(SettingsType.SECURE, PAGE,
+ "Current screen saver", "Colors", Settings.Secure.SCREENSAVER_COMPONENTS,
+ "com.android.dreams.basic/com.android.dreams.basic.Colors"));
+ assertTrue(mHelper.verifyRadioSetting(SettingsType.SECURE, PAGE,
+ "Current screen saver", "Photos", Settings.Secure.SCREENSAVER_COMPONENTS,
+ "com.google.android.apps.photos/com.google.android.apps.photos.daydream"
+ + ".PhotosDreamService"));
+ } finally {
+ mDevice.pressBack();
+ Thread.sleep(2000);
+ }
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testSleep15Seconds() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ mHelper.scrollVert(true);
+ assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+ "Sleep", "15 seconds", Settings.System.SCREEN_OFF_TIMEOUT, "15000"));
+ }
+
+ @MediumTest
+ public void testSleep30Seconds() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ mHelper.scrollVert(true);
+ assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+ "Sleep", "30 seconds", Settings.System.SCREEN_OFF_TIMEOUT, "30000"));
+ }
+
+ @MediumTest
+ public void testSleep1Minute() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ mHelper.scrollVert(true);
+ assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+ "Sleep", "1 minute", Settings.System.SCREEN_OFF_TIMEOUT, "60000"));
+ }
+
+ @MediumTest
+ public void testSleep2Minutes() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ mHelper.scrollVert(true);
+ assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+ "Sleep", "2 minutes", Settings.System.SCREEN_OFF_TIMEOUT, "120000"));
+ }
+
+ @MediumTest
+ public void testSleep5Minutes() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ mHelper.scrollVert(true);
+ assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+ "Sleep", "5 minutes", Settings.System.SCREEN_OFF_TIMEOUT, "300000"));
+ }
+
+ @MediumTest
+ public void testSleep10Minutes() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ mHelper.scrollVert(true);
+ assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+ "Sleep", "10 minutes", Settings.System.SCREEN_OFF_TIMEOUT, "600000"));
+ }
+
+ @MediumTest
+ public void testSleep30Minutes() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ mHelper.scrollVert(true);
+ assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+ "Sleep", "30 minutes", Settings.System.SCREEN_OFF_TIMEOUT, "1800000"));
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testFontSizeLarge() throws Exception {
+ verifyFontSizeSetting(1.00f, FONT_LARGE);
+ // Leaving the font size at large can make later tests fail, so reset it
+ Settings.System.putFloat(mResolver, Settings.System.FONT_SCALE, 1.00f);
+ // It takes a second for the new font size to be picked up
+ Thread.sleep(2000);
+ }
+
+ @MediumTest
+ public void testFontSizeDefault() throws Exception {
+ verifyFontSizeSetting(1.15f, FONT_NORMAL);
+ }
+
+ @MediumTest
+ public void testFontSizeLargest() throws Exception {
+ verifyFontSizeSetting(1.00f, FONT_HUGE);
+ // Leaving the font size at huge can make later tests fail, so reset it
+ Settings.System.putFloat(mResolver, Settings.System.FONT_SCALE, 1.00f);
+ // It takes a second for the new font size to be picked up
+ Thread.sleep(2000);
+ }
+
+ @MediumTest
+ public void testFontSizeSmall() throws Exception {
+ verifyFontSizeSetting(1.00f, FONT_SMALL);
+ }
+
+ private void verifyFontSizeSetting(float resetValue, FontSetting setting)
+ throws Exception {
+ Settings.System.putFloat(mResolver, Settings.System.FONT_SCALE, resetValue);
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ clickMore();
+ mHelper.clickSetting("Font size");
+ try {
+ mDevice.wait(Until.findObject(By.desc(setting.getName())), TIMEOUT).click();
+ Thread.sleep(1000);
+ float changedValue = Settings.System.getFloat(
+ mResolver, Settings.System.FONT_SCALE);
+ assertEquals(setting.getSize(), changedValue, 0.0001);
+ } finally {
+ // Make sure to back out of the font menu
+ mDevice.pressBack();
+ }
+ }
+
+ private void clickMore() throws InterruptedException {
+ UiObject2 more = mDevice.wait(Until.findObject(By.text("Advanced")), TIMEOUT);
+ if (more != null) {
+ more.click();
+ Thread.sleep(TIMEOUT);
+ }
+ }
+
+ private static class FontSetting {
+ private final String mSizeName;
+ private final float mSizeVal;
+
+ public FontSetting(String sizeName, float sizeVal) {
+ mSizeName = sizeName;
+ mSizeVal = sizeVal;
+ }
+
+ public String getName() {
+ return mSizeName;
+ }
+
+ public float getSize() {
+ return mSizeVal;
+ }
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/HomepageDisplayTests.java b/tests/uitests/src/com/android/settings/ui/HomepageDisplayTests.java
new file mode 100644
index 0000000..3b7b006
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/HomepageDisplayTests.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.ui;
+
+import static com.android.settings.ui.testutils.SettingsTestUtils.SETTINGS_PACKAGE;
+import static com.android.settings.ui.testutils.SettingsTestUtils.TIMEOUT;
+
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.SettingsHelper;
+
+import com.android.settings.ui.testutils.SettingsTestUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class HomepageDisplayTests {
+
+ private static final String[] HOMEPAGE_ITEMS = {
+ "Network & internet",
+ "Connected devices",
+ "Apps & notifications",
+ "Battery",
+ "Display",
+ "Sound",
+ "Storage",
+ "Security & location",
+ "Accounts",
+ "Accessibility",
+ "System",
+ "Support & tips"
+ };
+
+ private UiDevice mDevice;
+
+ @Before
+ public void setUp() throws Exception {
+ mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("failed to freeze device orientaion", e);
+ }
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ // Need to finish settings activity
+ mDevice.pressHome();
+ }
+
+ @Presubmit
+ @Test
+ public void testHomepageCategory() throws Exception {
+ // Launch Settings
+ SettingsHelper.launchSettingsPage(
+ InstrumentationRegistry.getContext(), Settings.ACTION_SETTINGS);
+
+ // Scroll to top
+ final UiObject2 view = mDevice.wait(
+ Until.findObject(By.res(SETTINGS_PACKAGE, "main_content")),
+ TIMEOUT);
+ view.scroll(Direction.UP, 100f);
+
+ // Inspect each item
+ for (String item : HOMEPAGE_ITEMS) {
+ SettingsTestUtils.assertTitleMatch(mDevice, item);
+ }
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java b/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java
new file mode 100644
index 0000000..b4a1baa
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.SettingsHelper;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+
+
+public class LocationSettingsTests extends InstrumentationTestCase {
+
+ private static final String SETTINGS_PACKAGE = "com.android.settings";
+ private static final int TIMEOUT = 2000;
+ private UiDevice mDevice;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ mDevice = UiDevice.getInstance(getInstrumentation());
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("failed to freeze device orientaion", e);
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ mDevice.pressBack();
+ mDevice.pressHome();
+ super.tearDown();
+ }
+
+ @MediumTest
+ public void testLoadingLocationSettings () throws Exception {
+ // Load Security
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+ Settings.ACTION_SECURITY_SETTINGS);
+
+ SettingsHelper helper = new SettingsHelper();
+ helper.scrollVert(true);
+ // Tap on location
+ UiObject2 settingsPanel = mDevice.wait(Until.findObject
+ (By.res(SETTINGS_PACKAGE, "main_content")), TIMEOUT);
+ int count = 0;
+ UiObject2 locationTitle = null;
+ while(count < 6 && locationTitle == null) {
+ locationTitle = mDevice.wait(Until.findObject(By.text("Location")), TIMEOUT);
+ if (locationTitle == null) {
+ settingsPanel.scroll(Direction.DOWN, 1.0f);
+ }
+ count++;
+ }
+ // Verify location settings loads.
+ locationTitle.click();
+ Thread.sleep(TIMEOUT);
+ assertNotNull("Location screen has not loaded correctly",
+ mDevice.wait(Until.findObject(By.text("Location services")), TIMEOUT));
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testLocationSettingOn() throws Exception {
+ verifyLocationSettingsOnOrOff(true);
+ }
+
+ @MediumTest
+ public void testLocationSettingOff() throws Exception {
+ verifyLocationSettingsOnOrOff(false);
+ }
+
+ @MediumTest
+ public void testLocationDeviceOnlyMode() throws Exception {
+ // Changing the value from default before testing the toggle to Device only mode
+ Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+ Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+ dismissAlertDialogs();
+ Thread.sleep(TIMEOUT);
+ verifyLocationSettingsMode(Settings.Secure.LOCATION_MODE_SENSORS_ONLY);
+ }
+
+ @MediumTest
+ public void testLocationBatterySavingMode() throws Exception {
+ Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+ Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_SENSORS_ONLY);
+ Thread.sleep(TIMEOUT);
+ verifyLocationSettingsMode(Settings.Secure.LOCATION_MODE_BATTERY_SAVING);
+ }
+
+ @MediumTest
+ public void testLocationHighAccuracyMode() throws Exception {
+ Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+ Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_SENSORS_ONLY);
+ Thread.sleep(TIMEOUT);
+ verifyLocationSettingsMode(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+ }
+
+ @MediumTest
+ public void testLocationSettingsElements() throws Exception {
+ String[] textElements = {"Location", "Mode", "Recent location requests",
+ "Location services"};
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+ Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ Thread.sleep(TIMEOUT);
+ for (String element : textElements) {
+ assertNotNull(element + " item not found under Location Settings",
+ mDevice.wait(Until.findObject(By.text(element)), TIMEOUT));
+ }
+ }
+
+ @MediumTest
+ public void testLocationSettingsOverflowMenuElements() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+ Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ // Verify help & feedback
+ assertNotNull("Help & feedback item not found under Location Settings",
+ mDevice.wait(Until.findObject(By.desc("Help & feedback")), TIMEOUT));
+ // Verify scanning
+ assertNotNull("Scanning item not found under Location Settings",
+ mDevice.wait(Until.findObject(By.text("Scanning")), TIMEOUT));
+ }
+
+ private void verifyLocationSettingsMode(int mode) throws Exception {
+ int modeIntValue = 1;
+ String textMode = "Device only";
+ if (mode == Settings.Secure.LOCATION_MODE_HIGH_ACCURACY) {
+ modeIntValue = 3;
+ textMode = "High accuracy";
+ }
+ else if (mode == Settings.Secure.LOCATION_MODE_BATTERY_SAVING) {
+ modeIntValue = 2;
+ textMode = "Battery saving";
+ }
+ // Load location settings
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+ Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ // Tap on mode
+ dismissAlertDialogs();
+ // Load location settings
+ mDevice.wait(Until.findObject(By.text("Mode")), TIMEOUT).click();
+ Thread.sleep(TIMEOUT);
+ assertNotNull("Location mode screen not loaded", mDevice.wait(Until.findObject
+ (By.text("Location mode")), TIMEOUT));
+ // Choose said mode
+ mDevice.wait(Until.findObject(By.text(textMode)), TIMEOUT).click();
+ Thread.sleep(TIMEOUT);
+ dismissAlertDialogs();
+ mDevice.wait(Until.findObject(By.desc("Navigate up")), TIMEOUT).click();
+ Thread.sleep(TIMEOUT);
+ if (mode == Settings.Secure.LOCATION_MODE_HIGH_ACCURACY ||
+ mode == Settings.Secure.LOCATION_MODE_BATTERY_SAVING) {
+ dismissAlertDialogs();
+ }
+ // get setting and verify value
+ // Verify change of mode
+ int locationSettingMode =
+ Settings.Secure.getInt(getInstrumentation().getContext().getContentResolver(),
+ Settings.Secure.LOCATION_MODE);
+ assertEquals(mode + " value not set correctly for location.", modeIntValue,
+ locationSettingMode);
+ }
+
+ private void verifyLocationSettingsOnOrOff(boolean verifyOn) throws Exception {
+ // Set location flag
+ if (verifyOn) {
+ Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+ Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+ }
+ else {
+ Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+ Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+ }
+ dismissAlertDialogs();
+ // Load location settings
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+ Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ dismissAlertDialogs();
+ // Toggle UI
+ mDevice.wait(Until.findObject(By.res(SETTINGS_PACKAGE, "switch_widget")), TIMEOUT).click();
+ dismissAlertDialogs();
+ Thread.sleep(TIMEOUT);
+ // Verify change in setting
+ int locationEnabled = Settings.Secure.getInt(getInstrumentation()
+ .getContext().getContentResolver(),
+ Settings.Secure.LOCATION_MODE);
+ if (verifyOn) {
+ assertFalse("Location not enabled correctly", locationEnabled == 0);
+ }
+ else {
+ assertEquals("Location not disabled correctly", 0, locationEnabled);
+ }
+ }
+
+ // This method dismisses both alert dialogs that might popup and
+ // interfere with the test. Since the order in which the dialog
+ // shows up changes in no specific known way, we're checking for
+ // both dialogs in any order for a robust test. Bug b/36233151
+ // filed against Location team for specifications. This is a
+ // workaround in the meantime to ensure coverage.
+ private void dismissAlertDialogs() throws Exception {
+ for (int count = 0; count < 2; count++) {
+ UiObject2 agreeDialog = mDevice.wait(Until.findObject
+ (By.text("Improve location accuracy?")), TIMEOUT);
+ UiObject2 previousChoiceYesButton = mDevice.wait(Until.findObject
+ (By.text("YES")), TIMEOUT);
+ if (agreeDialog != null) {
+ mDevice.wait(Until.findObject
+ (By.text("AGREE")), TIMEOUT).click();
+ Thread.sleep(TIMEOUT);
+ assertNull("Improve location dialog not dismissed",
+ mDevice.wait(Until.findObject
+ (By.text("Improve location accuracy?")), TIMEOUT));
+ }
+ if (previousChoiceYesButton != null) {
+ previousChoiceYesButton.click();
+ // Short sleep to wait for the new screen
+ Thread.sleep(TIMEOUT);
+ }
+ }
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java
new file mode 100644
index 0000000..2523686
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.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.ui;
+
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+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 android.system.helpers.SettingsHelper;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+
+
+public class MoreWirelessSettingsTests extends InstrumentationTestCase {
+
+ private static final String SETTINGS_PACKAGE = "com.android.settings";
+ private static final int TIMEOUT = 2000;
+ private UiDevice mDevice;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ mDevice = UiDevice.getInstance(getInstrumentation());
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("failed to freeze device orientaion", e);
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ mDevice.pressBack();
+ mDevice.pressHome();
+ super.tearDown();
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testAirplaneModeEnabled() throws Exception {
+ verifyAirplaneModeOnOrOff(true);
+ // Toggling this via the wifi network settings page
+ // because of bug b/34858716. Once that is fixed,
+ // we should be able to set this via Settings putString.
+ toggleAirplaneModeSwitch();
+ }
+
+ @Presubmit
+ @MediumTest
+ public void testAirplaneModeDisabled() throws Exception {
+ verifyAirplaneModeOnOrOff(false);
+ }
+
+ @MediumTest
+ public void testTetheringMenuLoad() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+ Settings.ACTION_WIRELESS_SETTINGS);
+ mDevice.wait(Until
+ .findObject(By.text("Hotspot & tethering")), TIMEOUT)
+ .click();
+ Thread.sleep(TIMEOUT);
+ UiObject2 usbTethering = mDevice.wait(Until
+ .findObject(By.text("USB tethering")), TIMEOUT);
+ assertNotNull("Tethering screen did not load correctly", usbTethering);
+ }
+
+ @MediumTest
+ public void testVPNMenuLoad() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+ Settings.ACTION_WIRELESS_SETTINGS);
+ mDevice.wait(Until
+ .findObject(By.text("VPN")), TIMEOUT)
+ .click();
+ Thread.sleep(TIMEOUT);
+ UiObject2 usbTethering = mDevice.wait(Until
+ .findObject(By.res(SETTINGS_PACKAGE, "vpn_create")), TIMEOUT);
+ assertNotNull("VPN screen did not load correctly", usbTethering);
+ }
+
+ private void verifyAirplaneModeOnOrOff(boolean verifyOn) throws Exception {
+ if (verifyOn) {
+ Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_ON, "0");
+ }
+ else {
+ Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_ON, "1");
+ }
+ toggleAirplaneModeSwitch();
+ String airplaneModeValue = Settings.Global
+ .getString(getInstrumentation().getContext().getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_ON);
+ if (verifyOn) {
+ assertEquals("1", airplaneModeValue);
+ }
+ else {
+ assertEquals("0", airplaneModeValue);
+ }
+ }
+
+ private void toggleAirplaneModeSwitch() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+ Settings.ACTION_WIRELESS_SETTINGS);
+ mDevice.wait(Until
+ .findObject(By.text("Airplane mode")), TIMEOUT)
+ .click();
+ Thread.sleep(TIMEOUT);
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java b/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java
new file mode 100644
index 0000000..133332c
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.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.ui;
+
+import android.content.Intent;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.ActivityHelper;
+import android.system.helpers.SettingsHelper;
+import android.widget.ListView;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.util.Log;
+
+/** Verifies that you can get to the notification app listing page from the apps & notifications
+ * page */
+public class NotificationSettingsTests extends InstrumentationTestCase {
+ private static final boolean LOCAL_LOGV = false;
+ private static final String TAG = "NotifiSettingsTests";
+ private static final int TIMEOUT = 2000;
+ private ActivityHelper mActivityHelper = null;
+ private SettingsHelper mSettingsHelper = null;
+
+ private UiDevice mDevice;
+ @Override
+ public void setUp() throws Exception {
+ if (LOCAL_LOGV) {
+ Log.d(TAG, "-------");
+ }
+ super.setUp();
+ mDevice = UiDevice.getInstance(getInstrumentation());
+ mActivityHelper = ActivityHelper.getInstance();
+ mSettingsHelper = SettingsHelper.getInstance();
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("Failed to freeze device orientaion", e);
+ }
+
+ // make sure we are in a clean state before starting the test
+ mDevice.pressHome();
+ Thread.sleep(TIMEOUT * 2);
+ launchAppsSettings();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ mDevice.pressBack();
+ mDevice.pressHome(); // finish settings activity
+ mDevice.waitForIdle(TIMEOUT * 2); // give UI time to finish animating
+ super.tearDown();
+ }
+
+ @MediumTest
+ public void testNotificationsSettingsListForCalculator() {
+ UiObject2 configureNotifications = mDevice.wait(
+ Until.findObject(By.text("Notifications")), TIMEOUT);
+ configureNotifications.click();
+ mDevice.wait(Until.findObject(By.text("Blink light")), TIMEOUT);
+ UiObject2 appNotifications = mDevice.wait(
+ Until.findObject(By.text("On for all apps")), TIMEOUT);
+ appNotifications.click();
+ UiObject2 view =
+ mDevice.wait(
+ Until.findObject(By.text("All apps")), TIMEOUT);
+ assertNotNull("Could not find Settings > Apps screen", view);
+ UiObject2 app = mDevice.wait(Until.findObject(By.text("Calculator")), TIMEOUT);
+ assertNotNull("Could not find Calculator notification settings", app);
+ }
+
+
+ @MediumTest
+ public void testNotificationsSettingsListForPhone() {
+ UiObject2 configureNotifications = mDevice.wait(
+ Until.findObject(By.text("Notifications")), TIMEOUT);
+ configureNotifications.click();
+ mDevice.wait(Until.findObject(By.text("Blink light")), TIMEOUT);
+ UiObject2 appNotifications = mDevice.wait(
+ Until.findObject(By.text("On for all apps")), TIMEOUT);
+ appNotifications.click();
+ UiObject2 view =
+ mDevice.wait(
+ Until.findObject(By.text("All apps")), TIMEOUT);
+ assertNotNull("Could not find Settings > Apps screen", view);
+
+ final BySelector preferenceListSelector = By.clazz(ListView.class).res("android:id/list");
+ UiObject2 apps = mDevice.wait(Until.findObject(preferenceListSelector), TIMEOUT);
+
+ UiObject2 phone = scrollTo(mDevice, apps, By.text("Phone"), Direction.DOWN);
+ assertNotNull("Could not find Phone notification settings", phone);
+ phone.click();
+ UiObject2 incomingCalls = mDevice.wait(Until.findObject(By.text("Incoming calls")), TIMEOUT);
+ assertNotNull("Could not find incoming calls channel", incomingCalls);
+ incomingCalls.click();
+
+ // here's the meat of this test: make sure that you cannot change
+ // most settings for this channel
+
+ UiObject2 importance = mDevice.wait(Until.findObject(By.text("Importance")), TIMEOUT);
+ assertNotNull("Could not find importance toggle", importance);
+ assertFalse(importance.isEnabled());
+ assertFalse(mDevice.wait(Until.findObject(By.text("Sound")), TIMEOUT).isEnabled());;
+ assertFalse(mDevice.wait(Until.findObject(By.text("Vibrate")), TIMEOUT).isEnabled());
+ assertFalse(mDevice.wait(Until.findObject(By.text("Override Do Not Disturb")), TIMEOUT).isEnabled());
+
+
+
+
+
+
+ }
+
+ private UiObject2 scrollTo(UiDevice device, UiObject2 scrollable,
+ BySelector target, Direction direction) {
+ while (!device.hasObject(target) && scrollable.scroll(direction, 1.0f)) {
+ // continue
+ }
+ if (!device.hasObject(target)) {
+ // Scroll once more if not found; in some cases UiObject2.scroll can return false when
+ // the last item is not fully visible yet for list views.
+ scrollable.scroll(direction, 1.0f);
+ }
+ return device.findObject(target);
+ }
+
+
+ private void launchAppsSettings() throws Exception {
+ Intent appsSettingsIntent = new Intent(Settings.ACTION_SETTINGS);
+ mActivityHelper.launchIntent(appsSettingsIntent);
+ mSettingsHelper.flingSettingsToStart();
+ UiObject2 view = mDevice.wait(
+ Until.findObject(By.text("Apps & notifications")), TIMEOUT);
+ view.click();
+ UiObject2 title = mDevice.wait(
+ Until.findObject(By.text("Apps & notifications")), TIMEOUT);
+ assertNotNull("Could not find Settings > Apps & notifications screen", title);
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/SecuritySettingsLaunchTest.java b/tests/uitests/src/com/android/settings/ui/SecuritySettingsLaunchTest.java
new file mode 100644
index 0000000..b730690
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/SecuritySettingsLaunchTest.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.ui;
+
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiDevice;
+import android.system.helpers.SettingsHelper;
+
+import com.android.settings.ui.testutils.SettingsTestUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SecuritySettingsLaunchTest {
+
+ // Items we really want to always show
+ private static final String[] CATEGORIES = new String[]{
+ "Security status",
+ "Device security",
+ "Privacy",
+ };
+
+ private UiDevice mDevice;
+ private SettingsHelper mHelper;
+
+ @Before
+ public void setUp() throws Exception {
+ mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+ mHelper = SettingsHelper.getInstance();
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("failed to freeze device orientaion", e);
+ }
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ // Go back to home for next test.
+ mDevice.pressHome();
+ }
+
+ @Test
+ public void launchSecuritySettings() throws Exception {
+ // Launch Settings
+ SettingsHelper.launchSettingsPage(
+ InstrumentationRegistry.getContext(), Settings.ACTION_SECURITY_SETTINGS);
+ mHelper.scrollVert(false);
+ for (String category : CATEGORIES) {
+ SettingsTestUtils.assertTitleMatch(mDevice, category);
+ }
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java
new file mode 100644
index 0000000..0aec505
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java
@@ -0,0 +1,334 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.provider.Settings;
+import android.service.notification.ZenModeConfig;
+import android.support.test.uiautomator.UiObject2;
+import android.system.helpers.SettingsHelper;
+import android.system.helpers.SettingsHelper.SettingsType;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
+
+import java.util.HashMap;
+
+public class SoundSettingsTest extends InstrumentationTestCase {
+ private static final String PAGE = Settings.ACTION_SOUND_SETTINGS;
+ private static final int TIMEOUT = 2000;
+
+ private UiDevice mDevice;
+ private ContentResolver mResolver;
+ private SettingsHelper mHelper;
+
+
+ private HashMap ringtoneSounds = new HashMap<String, String>() {{
+ put("angler","Dione");
+ put("bullhead","Dione");
+ put("marlin","Spaceship");
+ put("sailfish","Spaceship");
+ put("walleye","Copycat");
+ put("taimen","Copycat");
+ }};
+
+ private HashMap ringtoneCodes = new HashMap<String, String>() {{
+ put("angler","38");
+ put("bullhead","38");
+ put("marlin","37");
+ put("sailfish","37");
+ put("walleye","26");
+ put("taimen","26");
+ }};
+
+ private HashMap alarmSounds = new HashMap<String, String>() {{
+ put("angler","Awaken");
+ put("bullhead","Awaken");
+ put("marlin","Bounce");
+ put("sailfish","Bounce");
+ put("walleye","Cuckoo clock");
+ put("taimen","Cuckoo clock");
+ }};
+
+ private HashMap alarmCodes = new HashMap<String, String>() {{
+ put("angler","6");
+ put("bullhead","6");
+ put("marlin","49");
+ put("sailfish","49");
+ put("walleye","15");
+ put("taimen","15");
+ }};
+
+ private HashMap notificationSounds = new HashMap<String, String>() {{
+ put("angler","Ceres");
+ put("bullhead","Ceres");
+ put("marlin","Trill");
+ put("sailfish","Trill");
+ put("walleye","Pipes");
+ put("taimen","Pipes");
+ }};
+
+
+ private HashMap notificationCodes = new HashMap<String, String>() {{
+ put("angler","26");
+ put("bullhead","26");
+ put("marlin","57");
+ put("sailfish","57");
+ put("walleye","69");
+ put("taimen","69");
+ }};
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ mDevice = UiDevice.getInstance(getInstrumentation());
+ mDevice.setOrientationNatural();
+ mResolver = getInstrumentation().getContext().getContentResolver();
+ mHelper = new SettingsHelper();
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ mDevice.pressBack();
+ mDevice.pressHome();
+ mDevice.waitForIdle();
+ mDevice.unfreezeRotation();
+ super.tearDown();
+ }
+
+ @MediumTest
+ public void testCallVibrate() throws Exception {
+ assertTrue(mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE,
+ "Also vibrate for calls", Settings.System.VIBRATE_WHEN_RINGING));
+ assertTrue(mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE,
+ "Also vibrate for calls", Settings.System.VIBRATE_WHEN_RINGING));
+ }
+
+ @MediumTest
+ public void testOtherSoundsDialPadTones() throws Exception {
+ loadOtherSoundsPage();
+ assertTrue("Dial pad tones not toggled", mHelper.verifyToggleSetting(
+ SettingsType.SYSTEM, PAGE, "Dial pad tones",
+ Settings.System.DTMF_TONE_WHEN_DIALING));
+ }
+
+ @MediumTest
+ public void testOtherSoundsScreenLocking() throws Exception {
+ loadOtherSoundsPage();
+ assertTrue("Screen locking sounds not toggled",
+ mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE,
+ "Screen locking sounds", Settings.System.LOCKSCREEN_SOUNDS_ENABLED));
+ }
+
+ @MediumTest
+ public void testOtherSoundsCharging() throws Exception {
+ loadOtherSoundsPage();
+ assertTrue("Charging sounds not toggled",
+ mHelper.verifyToggleSetting(SettingsType.GLOBAL, PAGE,
+ "Charging sounds", Settings.Global.CHARGING_SOUNDS_ENABLED));
+ }
+
+ @MediumTest
+ public void testOtherSoundsTouch() throws Exception {
+ loadOtherSoundsPage();
+ assertTrue("Touch sounds not toggled",
+ mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE,
+ "Touch sounds", Settings.System.SOUND_EFFECTS_ENABLED));
+ }
+
+ @MediumTest
+ public void testOtherSoundsVibrateOnTap() throws Exception {
+ loadOtherSoundsPage();
+ assertTrue("Vibrate on tap not toggled",
+ mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE,
+ "Vibrate on tap", Settings.System.HAPTIC_FEEDBACK_ENABLED));
+ }
+
+ private void loadOtherSoundsPage() throws Exception {
+ launchSoundSettings();
+ mHelper.scrollVert(false);
+ Thread.sleep(1000);
+ }
+
+ private void launchSoundSettings() throws Exception {
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+ mHelper.scrollVert(false);
+ clickMore();
+ Thread.sleep(1000);
+ mHelper.scrollVert(true);
+ Thread.sleep(1000);
+ }
+
+ /*
+ * Rather than verifying every ringtone, verify the ones least likely to change
+ * (None and Hangouts) and an arbitrary one from the ringtone pool.
+ */
+ @MediumTest
+ public void testPhoneRingtoneNone() throws Exception {
+ launchSoundSettings();
+ mHelper.clickSetting("Phone ringtone");
+ verifyRingtone(new RingtoneSetting("None", "null"),
+ Settings.System.RINGTONE);
+ }
+
+ @MediumTest
+ @Suppress
+ public void testPhoneRingtoneHangouts() throws Exception {
+ launchSoundSettings();
+ mHelper.clickSetting("Phone ringtone");
+ verifyRingtone(new RingtoneSetting("Hangouts Call", "31"), Settings.System.RINGTONE);
+ }
+
+ @MediumTest
+ public void testPhoneRingtone() throws Exception {
+ launchSoundSettings();
+ mHelper.clickSetting("Phone ringtone");
+ String ringtone = ringtoneSounds.get(mDevice.getProductName()).toString();
+ String ringtoneSettingValue = ringtoneCodes.get(mDevice.getProductName()).toString();
+ verifyRingtone(new RingtoneSetting(ringtone, ringtoneSettingValue),
+ Settings.System.RINGTONE);
+ }
+
+ @MediumTest
+ public void testNotificationRingtoneNone() throws Exception {
+ launchSoundSettings();
+ mHelper.clickSetting("Default notification sound");
+ verifyRingtone(new RingtoneSetting("None", "null"),
+ Settings.System.NOTIFICATION_SOUND);
+ }
+
+ @MediumTest
+ @Suppress
+ public void testNotificationRingtoneHangouts() throws Exception {
+ launchSoundSettings();
+ mHelper.clickSetting("Default notification sound");
+ verifyRingtone(new RingtoneSetting("Hangouts Message", "30"),
+ Settings.System.NOTIFICATION_SOUND);
+ }
+
+ @MediumTest
+ public void testNotificationRingtone() throws Exception {
+ launchSoundSettings();
+ mHelper.clickSetting("Default notification sound");
+ String notificationRingtone = notificationSounds.get(mDevice.getProductName()).toString();
+ String notificationSettingValue = notificationCodes.get(mDevice.getProductName()).toString();
+ verifyRingtone(new RingtoneSetting(notificationRingtone, notificationSettingValue),
+ Settings.System.NOTIFICATION_SOUND);
+ }
+
+ @MediumTest
+ public void testAlarmRingtoneNone() throws Exception {
+ launchSoundSettings();
+ mHelper.clickSetting("Default alarm sound");
+ verifyRingtone(new RingtoneSetting("None", "null"),
+ Settings.System.ALARM_ALERT);
+ }
+
+ @MediumTest
+ public void testAlarmRingtone() throws Exception {
+ launchSoundSettings();
+ String alarmRingtone = alarmSounds.get(mDevice.getProductName()).toString();
+ String alarmSettingValue = alarmCodes.get(mDevice.getProductName()).toString();
+ mHelper.clickSetting("Default alarm sound");
+ verifyRingtone(new RingtoneSetting(alarmRingtone, alarmSettingValue),
+ Settings.System.ALARM_ALERT);
+ }
+
+ /*
+ * This method verifies that setting a custom ringtone changes the
+ * ringtone code setting on the system. Each ringtone sound corresponds
+ * to an arbitrary code. To see which ringtone code this is on your device, run
+ * adb shell settings get system ringtone
+ * The number you see at the end of the file path is the one you need.
+ * To see alarms and notifications ringtone codes, run the following:
+ * adb shell settings get system alarm_alert
+ * adb shell settings get system notification_sound
+ * @param r Ringtone setting - the name of the ringtone as displayed on device
+ * @param settingName - the code of the ringtone as explained above
+ * @param dir - the direction in which to scroll
+ */
+ private void verifyRingtone(RingtoneSetting r, String settingName) throws Exception {
+ findRingtoneInList(r.getName()).click();
+ if (mDevice.getProductName().equals("walleye") || mDevice.getProductName().equals("taimen")) {
+ mDevice.wait(Until.findObject(By.text("SAVE")), TIMEOUT).click();
+ }
+ else {
+ mDevice.wait(Until.findObject(By.text("OK")), TIMEOUT).click();
+ }
+ SystemClock.sleep(1000);
+ if (r.getVal().equals("null")) {
+ assertEquals(null,
+ Settings.System.getString(mResolver, settingName));
+ } else if (r.getName().contains("Hangouts")) {
+ assertEquals("content://media/external/audio/media/" + r.getVal(),
+ Settings.System.getString(mResolver, settingName));
+ } else {
+ assertEquals("content://media/internal/audio/media/" + r.getVal(),
+ Settings.System.getString(mResolver, settingName));
+ }
+ }
+
+ private enum ScrollDir {
+ UP,
+ DOWN,
+ NOSCROLL
+ }
+
+ class RingtoneSetting {
+ private final String mName;
+ private final String mMediaVal;
+ public RingtoneSetting(String name, String fname) {
+ mName = name;
+ mMediaVal = fname;
+ }
+ public String getName() {
+ return mName;
+ }
+ public String getVal() {
+ return mMediaVal;
+ }
+ }
+
+ private void clickMore() throws InterruptedException {
+ UiObject2 more = mDevice.wait(Until.findObject(By.text("Advanced")), TIMEOUT);
+ if (more != null) {
+ more.click();
+ Thread.sleep(TIMEOUT);
+ }
+ }
+
+ private UiObject2 findRingtoneInList(String ringtone) throws Exception {
+ mHelper.scrollVert(false);
+ SystemClock.sleep(1000);
+ UiObject2 ringToneObject = mDevice.wait(Until.findObject(By.text(ringtone)), TIMEOUT);
+ int count = 0;
+ while (ringToneObject == null && count < 5) {
+ mHelper.scrollVert(true);
+ SystemClock.sleep(1000);
+ ringToneObject = mDevice.wait(Until.findObject(By.text(ringtone)), TIMEOUT);
+ count++;
+ }
+ return ringToneObject;
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java b/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java
new file mode 100644
index 0000000..3dca424
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.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.ui;
+
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+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 android.system.helpers.SettingsHelper;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static junit.framework.Assert.assertTrue;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SyncSettingsTest {
+ private static final int TIMEOUT = 2000;
+
+ private UiDevice mDevice;
+
+ @Before
+ public void setUp() throws Exception {
+ mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("failed to freeze device orientaion", e);
+ }
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ // Need to finish settings activity
+ mDevice.pressHome();
+ }
+
+ @Test
+ public void syncPageShouldHaveAddAccountButton() throws Exception {
+ // Launch Settings
+ SettingsHelper.launchSettingsPage(
+ InstrumentationRegistry.getContext(), Settings.ACTION_SYNC_SETTINGS);
+ UiObject2 addAccount = mDevice.wait(
+ Until.findObject(By.text("Add account")), TIMEOUT);
+ assertTrue(addAccount != null);
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsAdditionalTests.java b/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsAdditionalTests.java
new file mode 100644
index 0000000..4ed2a1d
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsAdditionalTests.java
@@ -0,0 +1,766 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.StaleObjectException;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.CommandsHelper;
+import android.system.helpers.SettingsHelper;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
+import android.util.Log;
+
+/**
+ * Additional tests for Wifi Settings.
+ */
+public class WirelessNetworkSettingsAdditionalTests extends InstrumentationTestCase {
+ // These back button presses are performed in tearDown() to exit Wifi
+ // Settings sub-menus that a test might finish in. This number should be
+ // high enough to account for the deepest sub-menu a test might enter.
+ private static final int NUM_BACK_BUTTON_PRESSES = 5;
+ private static final int TIMEOUT = 2000;
+ private static final int SLEEP_TIME = 500;
+ private static final String AIRPLANE_MODE_BROADCAST =
+ "am broadcast -a android.intent.action.AIRPLANE_MODE";
+ private static final String TAG="WirelessNetworkSettingsTests";
+
+ // Note: The values of these variables might affect flakiness in tests that involve
+ // scrolling. Adjust where necessary.
+ private static final float SCROLL_UP_PERCENT = 10.0f;
+ private static final float SCROLL_DOWN_PERCENT = 0.5f;
+ private static final int MAX_SCROLL_ATTEMPTS = 10;
+ private static final int MAX_ADD_NETWORK_BUTTON_ATTEMPTS = 3;
+ private static final int SCROLL_SPEED = 2000;
+
+ private static final String TEST_SSID = "testSsid";
+ private static final String TEST_PW_GE_8_CHAR = "testPasswordGreaterThan8Char";
+ private static final String TEST_PW_LT_8_CHAR = "lt8Char";
+ private static final String TEST_DOMAIN = "testDomain.com";
+
+ private static final String SETTINGS_PACKAGE = "com.android.settings";
+
+ private static final String CHECKBOX_CLASS = "android.widget.CheckBox";
+ private static final String SPINNER_CLASS = "android.widget.Spinner";
+ private static final String EDIT_TEXT_CLASS = "android.widget.EditText";
+ private static final String SCROLLVIEW_CLASS = "android.widget.ScrollView";
+ private static final String LISTVIEW_CLASS = "android.widget.ListView";
+
+ private static final String ADD_NETWORK_MENU_CANCEL_BUTTON_TEXT = "CANCEL";
+ private static final String ADD_NETWORK_MENU_SAVE_BUTTON_TEXT = "SAVE";
+ private static final String ADD_NETWORK_PREFERENCE_TEXT = "Add network";
+ private static final String CONFIGURE_WIFI_PREFERENCE_TEXT = "Wi‑Fi preferences";
+ private static final String CONFIGURE_WIFI_ADVANCED_PREFERENCE_TEXT = "Advanced";
+ private static final String CACERT_MENU_PLEASE_SELECT_TEXT = "Please select";
+ private static final String CACERT_MENU_USE_SYSTEM_CERTS_TEXT = "Use system certificates";
+ private static final String CACERT_MENU_DO_NOT_VALIDATE_TEXT = "Do not validate";
+ private static final String USERCERT_MENU_PLEASE_SELECT_TEXT = "Please select";
+ private static final String USERCERT_MENU_DO_NOT_PROVIDE_TEXT = "Do not provide";
+ private static final String SECURITY_OPTION_NONE_TEXT = "None";
+ private static final String SECURITY_OPTION_WEP_TEXT = "WEP";
+ private static final String SECURITY_OPTION_PSK_TEXT = "WPA/WPA2 PSK";
+ private static final String SECURITY_OPTION_EAP_TEXT = "802.1x EAP";
+ private static final String EAP_METHOD_PEAP_TEXT = "PEAP";
+ private static final String EAP_METHOD_TLS_TEXT = "TLS";
+ private static final String EAP_METHOD_TTLS_TEXT = "TTLS";
+ private static final String EAP_METHOD_PWD_TEXT = "PWD";
+ private static final String EAP_METHOD_SIM_TEXT = "SIM";
+ private static final String EAP_METHOD_AKA_TEXT = "AKA";
+ private static final String EAP_METHOD_AKA_PRIME_TEXT = "AKA'";
+ private static final String PHASE2_MENU_NONE_TEXT = "None";
+ private static final String PHASE2_MENU_MSCHAPV2_TEXT = "MSCHAPV2";
+ private static final String PHASE2_MENU_GTC_TEXT = "GTC";
+
+ private static final String ADD_NETWORK_MENU_ADV_TOGGLE_RES_ID = "wifi_advanced_togglebox";
+ private static final String ADD_NETWORK_MENU_IP_SETTINGS_RES_ID = "ip_settings";
+ private static final String ADD_NETWORK_MENU_PROXY_SETTINGS_RES_ID = "proxy_settings";
+ private static final String ADD_NETWORK_MENU_SECURITY_OPTION_RES_ID = "security";
+ private static final String ADD_NETWORK_MENU_EAP_METHOD_RES_ID = "method";
+ private static final String ADD_NETWORK_MENU_SSID_RES_ID = "ssid";
+ private static final String ADD_NETWORK_MENU_PHASE2_RES_ID = "phase2";
+ private static final String ADD_NETWORK_MENU_CACERT_RES_ID = "ca_cert";
+ private static final String ADD_NETWORK_MENU_USERCERT_RES_ID = "user_cert";
+ private static final String ADD_NETWORK_MENU_NO_DOMAIN_WARNING_RES_ID = "no_domain_warning";
+ private static final String ADD_NETWORK_MENU_NO_CACERT_WARNING_RES_ID = "no_ca_cert_warning";
+ private static final String ADD_NETWORK_MENU_DOMAIN_LAYOUT_RES_ID = "l_domain";
+ private static final String ADD_NETWORK_MENU_DOMAIN_RES_ID = "domain";
+ private static final String ADD_NETWORK_MENU_IDENTITY_LAYOUT_RES_ID = "l_identity";
+ private static final String ADD_NETWORK_MENU_ANONYMOUS_LAYOUT_RES_ID = "l_anonymous";
+ private static final String ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID = "password_layout";
+ private static final String ADD_NETWORK_MENU_SHOW_PASSWORD_LAYOUT_RES_ID =
+ "show_password_layout";
+ private static final String ADD_NETWORK_MENU_PASSWORD_RES_ID = "password";
+
+ private static final BySelector ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR =
+ By.scrollable(true).clazz(SCROLLVIEW_CLASS);
+ private static final BySelector SPINNER_OPTIONS_SCROLLABLE_BY_SELECTOR =
+ By.scrollable(true).clazz(LISTVIEW_CLASS);
+
+ private UiDevice mDevice;
+ private CommandsHelper mCommandsHelper;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ mDevice = UiDevice.getInstance(getInstrumentation());
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("failed to freeze device orientation", e);
+ }
+ // Ensure airplane mode is OFF so that wifi can be enabled using WiFiManager.
+ Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_ON, "0");
+ Log.d(TAG, "sending airplane mode broadcast to device");
+ mCommandsHelper = CommandsHelper.getInstance();
+ mCommandsHelper.executeShellCommand(AIRPLANE_MODE_BROADCAST);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ // Exit all settings sub-menus.
+ for (int i = 0; i < NUM_BACK_BUTTON_PRESSES; ++i) {
+ mDevice.pressBack();
+ }
+ mDevice.pressHome();
+ super.tearDown();
+ }
+
+ @MediumTest
+ public void testWifiMenuLoadConfigure() throws Exception {
+ loadWiFiConfigureMenu();
+ Thread.sleep(SLEEP_TIME);
+ UiObject2 configureWiFiHeading = mDevice.wait(Until.findObject
+ (By.text(CONFIGURE_WIFI_PREFERENCE_TEXT)), TIMEOUT);
+ assertNotNull("Configure WiFi menu has not loaded correctly", configureWiFiHeading);
+ }
+
+ @MediumTest
+ public void testNetworkNotificationsOn() throws Exception {
+ verifyNetworkNotificationsOnOrOff(true);
+ }
+
+ @MediumTest
+ public void testNetworkNotificationsOff() throws Exception {
+ verifyNetworkNotificationsOnOrOff(false);
+ }
+
+ @MediumTest
+ public void testAddNetworkMenu_Default() throws Exception {
+ loadAddNetworkMenu();
+
+ // Submit button should be disabled by default, while cancel button should be enabled.
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+ assertTrue(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_CANCEL_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ // Check that the SSID field is defaults to the hint.
+ assertEquals("Enter the SSID", mDevice.wait(Until.findObject(By
+ .res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SSID_RES_ID)
+ .clazz(EDIT_TEXT_CLASS)), TIMEOUT*2)
+ .getText());
+
+ // Check Security defaults to None.
+ assertEquals("None", mDevice.wait(Until.findObject(By
+ .res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SECURITY_OPTION_RES_ID)
+ .clazz(SPINNER_CLASS)), TIMEOUT)
+ .getChildren().get(0).getText());
+
+ // Check advanced options are collapsed by default.
+ assertFalse(mDevice.wait(Until.findObject(By
+ .res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_ADV_TOGGLE_RES_ID)
+ .clazz(CHECKBOX_CLASS)), TIMEOUT).isChecked());
+
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetworkMenu_Proxy() throws Exception {
+ loadAddNetworkMenu();
+
+ // Toggle advanced options.
+ mDevice.wait(Until.findObject(By
+ .res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_ADV_TOGGLE_RES_ID)
+ .clazz(CHECKBOX_CLASS)), TIMEOUT).click();
+
+ // Verify Proxy defaults to None.
+ BySelector proxySettingsBySelector =
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PROXY_SETTINGS_RES_ID)
+ .clazz(SPINNER_CLASS);
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, proxySettingsBySelector);
+ assertEquals("None", mDevice.wait(Until.findObject(proxySettingsBySelector), TIMEOUT)
+ .getChildren().get(0).getText());
+
+ // Verify that Proxy Manual fields appear.
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, proxySettingsBySelector);
+ mDevice.wait(Until.findObject(proxySettingsBySelector), TIMEOUT).click();
+ mDevice.wait(Until.findObject(By.text("Manual")), TIMEOUT).click();
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, "proxy_warning_limited_support"));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, "proxy_hostname"));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, "proxy_exclusionlist"));
+
+ // Verify that Proxy Auto-Config options appear.
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, proxySettingsBySelector);
+ mDevice.wait(Until.findObject(proxySettingsBySelector), TIMEOUT).click();
+ mDevice.wait(Until.findObject(By.text("Proxy Auto-Config")), TIMEOUT).click();
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, "proxy_pac"));
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetworkMenu_IpSettings() throws Exception {
+ loadAddNetworkMenu();
+
+ // Toggle advanced options.
+ mDevice.wait(Until.findObject(By
+ .res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_ADV_TOGGLE_RES_ID)
+ .clazz(CHECKBOX_CLASS)), TIMEOUT).click();
+
+ // Verify IP settings defaults to DHCP.
+ BySelector ipSettingsBySelector =
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_IP_SETTINGS_RES_ID).clazz(SPINNER_CLASS);
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, ipSettingsBySelector);
+ assertEquals("DHCP", mDevice.wait(Until.findObject(ipSettingsBySelector), TIMEOUT)
+ .getChildren().get(0).getText());
+
+ // Verify that Static IP settings options appear.
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, ipSettingsBySelector).click();
+ mDevice.wait(Until.findObject(By.text("Static")), TIMEOUT).click();
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, "ipaddress"));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, "gateway"));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, "network_prefix_length"));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, "dns1"));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, "dns2"));
+ }
+
+ @Suppress
+ @MediumTest
+ public void testPhase2Settings() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+
+ BySelector phase2SettingsBySelector =
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PHASE2_RES_ID).clazz(SPINNER_CLASS);
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, phase2SettingsBySelector);
+ assertEquals(PHASE2_MENU_NONE_TEXT, mDevice.wait(Until
+ .findObject(phase2SettingsBySelector), TIMEOUT).getChildren().get(0).getText());
+ mDevice.wait(Until.findObject(phase2SettingsBySelector), TIMEOUT).click();
+ Thread.sleep(SLEEP_TIME);
+
+ // Verify Phase 2 authentication spinner options.
+ assertNotNull(mDevice.wait(Until.findObject(By.text(PHASE2_MENU_NONE_TEXT)), TIMEOUT));
+ assertNotNull(mDevice.wait(Until.findObject(By.text(PHASE2_MENU_MSCHAPV2_TEXT)), TIMEOUT));
+ assertNotNull(mDevice.wait(Until.findObject(By.text(PHASE2_MENU_GTC_TEXT)), TIMEOUT));
+ }
+
+ @Suppress
+ @MediumTest
+ public void testCaCertSettings() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+
+ BySelector caCertSettingsBySelector =
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_CACERT_RES_ID).clazz(SPINNER_CLASS);
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, caCertSettingsBySelector);
+ assertEquals(CACERT_MENU_PLEASE_SELECT_TEXT, mDevice.wait(Until
+ .findObject(caCertSettingsBySelector), TIMEOUT).getChildren().get(0).getText());
+ mDevice.wait(Until.findObject(caCertSettingsBySelector), TIMEOUT).click();
+ Thread.sleep(SLEEP_TIME);
+
+ // Verify CA certificate spinner options.
+ assertNotNull(mDevice.wait(Until.findObject(
+ By.text(CACERT_MENU_PLEASE_SELECT_TEXT)), TIMEOUT));
+ assertNotNull(mDevice.wait(Until.findObject(
+ By.text(CACERT_MENU_USE_SYSTEM_CERTS_TEXT)), TIMEOUT));
+ assertNotNull(mDevice.wait(Until.findObject(
+ By.text(CACERT_MENU_DO_NOT_VALIDATE_TEXT)), TIMEOUT));
+
+ // Verify that a domain field and warning appear when the user selects the
+ // "Use system certificates" option.
+ mDevice.wait(Until.findObject(By.text(CACERT_MENU_USE_SYSTEM_CERTS_TEXT)), TIMEOUT).click();
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_DOMAIN_LAYOUT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_NO_DOMAIN_WARNING_RES_ID));
+
+ // Verify that a warning appears when the user chooses the "Do Not Validate" option.
+ mDevice.wait(Until.findObject(caCertSettingsBySelector), TIMEOUT).click();
+ mDevice.wait(Until.findObject(By.text(CACERT_MENU_DO_NOT_VALIDATE_TEXT)), TIMEOUT).click();
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_NO_CACERT_WARNING_RES_ID));
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetwork_NoSecurity() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_NONE_TEXT);
+
+ // Entering an SSID is enough to enable the submit button. // TODO THIS GUY
+ enterSSID(TEST_SSID);
+ assertTrue(mDevice.wait(Until
+ .findObject(By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetwork_WEP() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_WEP_TEXT);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ // Verify that WEP fields appear.
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SHOW_PASSWORD_LAYOUT_RES_ID));
+
+ // Entering an SSID alone does not enable the submit button.
+ enterSSID(TEST_SSID);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ // Submit button is only enabled after a password is entered.
+ enterPassword(TEST_PW_GE_8_CHAR);
+ assertTrue(mDevice.wait(Until
+ .findObject(By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetwork_PSK() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_PSK_TEXT);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ // Verify that PSK fields appear.
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SHOW_PASSWORD_LAYOUT_RES_ID));
+
+ // Entering an SSID alone does not enable the submit button.
+ enterSSID(TEST_SSID);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ // Entering an password that is too short does not enable submit button.
+ enterPassword(TEST_PW_LT_8_CHAR);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ // Submit button is only enabled after a password of valid length is entered.
+ enterPassword(TEST_PW_GE_8_CHAR);
+ assertTrue(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetwork_EAP_PEAP() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ selectEAPMethod(EAP_METHOD_PEAP_TEXT);
+
+ // Verify that EAP-PEAP fields appear.
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PHASE2_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_CACERT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_IDENTITY_LAYOUT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_ANONYMOUS_LAYOUT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SHOW_PASSWORD_LAYOUT_RES_ID));
+
+ // Entering an SSID alone does not enable the submit button.
+ enterSSID(TEST_SSID);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ verifyCaCertificateSubmitConditions();
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetwork_EAP_TLS() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ selectEAPMethod(EAP_METHOD_TLS_TEXT);
+
+ // Verify that EAP-TLS fields appear.
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_CACERT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_USERCERT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_IDENTITY_LAYOUT_RES_ID));
+
+ // Entering an SSID alone does not enable the submit button.
+ enterSSID(TEST_SSID);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ // Selecting the User certificate "Do not provide" option alone does not enable the submit
+ // button.
+ selectUserCertificateOption(USERCERT_MENU_DO_NOT_PROVIDE_TEXT);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ verifyCaCertificateSubmitConditions();
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetwork_EAP_TTLS() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ selectEAPMethod(EAP_METHOD_TTLS_TEXT);
+
+ // Verify that EAP-TLS fields appear.
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PHASE2_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_CACERT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_IDENTITY_LAYOUT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_ANONYMOUS_LAYOUT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID));
+
+ // Entering an SSID alone does not enable the submit button.
+ enterSSID(TEST_SSID);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ verifyCaCertificateSubmitConditions();
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetwork_EAP_PWD() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ selectEAPMethod(EAP_METHOD_PWD_TEXT);
+
+ // Verify that EAP-TLS fields appear.
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_IDENTITY_LAYOUT_RES_ID));
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID));
+
+ // Entering an SSID alone enables the submit button.
+ enterSSID(TEST_SSID);
+ assertTrue(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetwork_EAP_SIM() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ selectEAPMethod(EAP_METHOD_SIM_TEXT);
+
+ // Entering an SSID alone enables the submit button.
+ enterSSID(TEST_SSID);
+ assertTrue(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetwork_EAP_AKA() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ selectEAPMethod(EAP_METHOD_AKA_TEXT);
+
+ // Entering an SSID alone enables the submit button.
+ enterSSID(TEST_SSID);
+ assertTrue(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+ }
+
+ @Suppress
+ @MediumTest
+ public void testAddNetwork_EAP_AKA_PRIME() throws Exception {
+ loadAddNetworkMenu();
+ selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ selectEAPMethod(EAP_METHOD_AKA_PRIME_TEXT);
+
+ // Entering an SSID alone enables the submit button.
+ enterSSID(TEST_SSID);
+ assertTrue(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+ }
+
+ private void verifyKeepWiFiOnDuringSleep(String settingToBeVerified, int settingValue)
+ throws Exception {
+ loadWiFiConfigureMenu();
+ mDevice.wait(Until.findObject(By.text("Keep Wi‑Fi on during sleep")), TIMEOUT)
+ .click();
+ mDevice.wait(Until.findObject(By.clazz("android.widget.CheckedTextView")
+ .text(settingToBeVerified)), TIMEOUT).click();
+ Thread.sleep(SLEEP_TIME);
+ int keepWiFiOnSetting =
+ Settings.Global.getInt(getInstrumentation().getContext().getContentResolver(),
+ Settings.Global.WIFI_SLEEP_POLICY);
+ assertEquals(settingValue, keepWiFiOnSetting);
+ }
+
+ private void verifyNetworkNotificationsOnOrOff(boolean verifyOn)
+ throws Exception {
+ // Enable network recommendations to enable the toggle switch for Network
+ // notifications
+ Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+ Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, "1");
+ if (verifyOn) {
+ Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+ Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, "0");
+ }
+ else {
+ Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+ Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, "1");
+ }
+ loadWiFiConfigureMenu();
+ mDevice.wait(Until.findObject(By.text("Open network notification")), TIMEOUT)
+ .click();
+ Thread.sleep(SLEEP_TIME);
+ String wifiNotificationValue =
+ Settings.Global.getString(getInstrumentation().getContext().getContentResolver(),
+ Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON);
+ if (verifyOn) {
+ assertEquals("1", wifiNotificationValue);
+ }
+ else {
+ assertEquals("0", wifiNotificationValue);
+ }
+ }
+
+ private void verifyWiFiOnOrOff(boolean verifyOn) throws Exception {
+ String switchText = "On";
+ if (verifyOn) {
+ switchText = "Off";
+ }
+ loadWiFiSettingsPage(!verifyOn);
+ mDevice.wait(Until
+ .findObject(By.res(SETTINGS_PACKAGE, "switch_bar").text(switchText)), TIMEOUT)
+ .click();
+ Thread.sleep(SLEEP_TIME);
+ String wifiValue =
+ Settings.Global.getString(getInstrumentation().getContext().getContentResolver(),
+ Settings.Global.WIFI_ON);
+ if (verifyOn) {
+ // 1 is Enabled, 2 is Enabled while airplane mode is ON.
+ assertTrue(wifiValue.equals("1") || wifiValue.equals("2"));
+ }
+ else {
+ assertEquals("0", wifiValue);
+ }
+ }
+
+ private void verifyCaCertificateSubmitConditions() throws Exception {
+ // Selecting the CA certificate "Do not validate" option enables the submit button.
+ selectCaCertificateOption(CACERT_MENU_DO_NOT_VALIDATE_TEXT);
+ assertTrue(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ // However, selecting the CA certificate "Use system certificates option" is not enough to
+ // enable the submit button.
+ selectCaCertificateOption(CACERT_MENU_USE_SYSTEM_CERTS_TEXT);
+ assertFalse(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+ // Submit button is only enabled after a domain is entered as well.
+ enterDomain(TEST_DOMAIN);
+ assertTrue(mDevice.wait(Until.findObject(
+ By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+ }
+
+ private void loadWiFiSettingsPage(boolean wifiEnabled) throws Exception {
+ WifiManager wifiManager = (WifiManager)getInstrumentation().getContext()
+ .getSystemService(Context.WIFI_SERVICE);
+ wifiManager.setWifiEnabled(wifiEnabled);
+ SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+ Settings.ACTION_WIFI_SETTINGS);
+ }
+
+ private void loadWiFiConfigureMenu() throws Exception {
+ loadWiFiSettingsPage(false);
+ Thread.sleep(TIMEOUT);
+ mDevice.wait(Until.findObject(By.text(CONFIGURE_WIFI_PREFERENCE_TEXT)), TIMEOUT).click();
+ mDevice.wait(Until.findObject(
+ By.text(CONFIGURE_WIFI_ADVANCED_PREFERENCE_TEXT)), TIMEOUT).click();
+ }
+
+ private void loadAddNetworkMenu() throws Exception {
+ loadWiFiSettingsPage(true);
+ for (int attempts = 0; attempts < MAX_ADD_NETWORK_BUTTON_ATTEMPTS; ++attempts) {
+ try {
+ findOrScrollToObject(By.scrollable(true), By.text(ADD_NETWORK_PREFERENCE_TEXT))
+ .click();
+ } catch (StaleObjectException e) {
+ // The network list might have been updated between when the Add network button was
+ // found, and when it UI automator attempted to click on it. Retry.
+ continue;
+ }
+ // If we get here, we successfully clicked on the Add network button, so we are done.
+ Thread.sleep(SLEEP_TIME*5);
+ return;
+ }
+
+ fail("Failed to load Add Network Menu after " + MAX_ADD_NETWORK_BUTTON_ATTEMPTS
+ + " retries");
+ }
+
+ private void selectSecurityOption(String securityOption) throws Exception {
+ // We might not need to scroll to the security options if not enough add network menu
+ // options are visible.
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SECURITY_OPTION_RES_ID)
+ .clazz(SPINNER_CLASS)).click();
+ Thread.sleep(SLEEP_TIME);
+ mDevice.wait(Until.findObject(By.text(securityOption)), TIMEOUT).click();
+ }
+
+ private void selectEAPMethod(String eapMethod) throws Exception {
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_EAP_METHOD_RES_ID).clazz(SPINNER_CLASS))
+ .click();
+ Thread.sleep(SLEEP_TIME);
+ findOrScrollToObject(SPINNER_OPTIONS_SCROLLABLE_BY_SELECTOR, By.text(eapMethod)).click();
+ }
+
+ private void selectUserCertificateOption(String userCertificateOption) throws Exception {
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_USERCERT_RES_ID).clazz(SPINNER_CLASS))
+ .click();
+ mDevice.wait(Until.findObject(By.text(userCertificateOption)), TIMEOUT).click();
+ }
+
+ private void selectCaCertificateOption(String caCertificateOption) throws Exception {
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_CACERT_RES_ID).clazz(SPINNER_CLASS))
+ .click();
+ mDevice.wait(Until.findObject(By.text(caCertificateOption)), TIMEOUT).click();
+ }
+
+ private void enterSSID(String ssid) throws Exception {
+ // We might not need to scroll to the SSID option if not enough add network menu options
+ // are visible.
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SSID_RES_ID).clazz(EDIT_TEXT_CLASS))
+ .setText(ssid);
+ }
+
+ private void enterPassword(String password) throws Exception {
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_RES_ID).clazz(EDIT_TEXT_CLASS))
+ .setText(password);
+ }
+
+ private void enterDomain(String domain) throws Exception {
+ findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+ By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_DOMAIN_RES_ID)).setText(domain);
+ }
+
+ // Use this if the UI object might or might not need to be scrolled to.
+ private UiObject2 findOrScrollToObject(BySelector scrollableSelector, BySelector objectSelector)
+ throws Exception {
+ UiObject2 object = mDevice.wait(Until.findObject(objectSelector), TIMEOUT);
+ if (object == null) {
+ object = scrollToObject(scrollableSelector, objectSelector);
+ }
+ return object;
+ }
+
+ private UiObject2 scrollToObject(BySelector scrollableSelector, BySelector objectSelector)
+ throws Exception {
+ UiObject2 scrollable = mDevice.wait(Until.findObject(scrollableSelector), TIMEOUT);
+ if (scrollable == null) {
+ fail("Could not find scrollable UI object identified by " + scrollableSelector);
+ }
+ UiObject2 found = null;
+ // Scroll all the way up first, then all the way down.
+ while (true) {
+ // Optimization: terminate if we find the object while scrolling up to reset, so
+ // we save the time spent scrolling down again.
+ boolean canScrollAgain = scrollable.scroll(Direction.UP, SCROLL_UP_PERCENT,
+ SCROLL_SPEED);
+ found = mDevice.findObject(objectSelector);
+ if (found != null) return found;
+ if (!canScrollAgain) break;
+ }
+ for (int attempts = 0; found == null && attempts < MAX_SCROLL_ATTEMPTS; ++attempts) {
+ // Return value of UiObject2.scroll() is not reliable, so do not use it in loop
+ // condition, in case it causes this loop to terminate prematurely.
+ scrollable.scroll(Direction.DOWN, SCROLL_DOWN_PERCENT, SCROLL_SPEED);
+ found = mDevice.findObject(objectSelector);
+ }
+ if (found == null) {
+ fail("Could not scroll to UI object identified by " + objectSelector);
+ }
+ return found;
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java b/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java
new file mode 100644
index 0000000..64fa5fd
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.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.ui;
+
+import static com.android.settings.ui.testutils.SettingsTestUtils.SETTINGS_PACKAGE;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.CommandsHelper;
+import android.system.helpers.SettingsHelper;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.util.Log;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Core tests for Wifi Settings.
+ */
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class WirelessNetworkSettingsTests {
+ // These back button presses are performed in tearDown() to exit Wifi
+ // Settings sub-menus that a test might finish in. This number should be
+ // high enough to account for the deepest sub-menu a test might enter.
+ private static final int NUM_BACK_BUTTON_PRESSES = 5;
+ private static final int TIMEOUT = 20000;
+ private static final int SLEEP_TIME = 500;
+ private static final String AIRPLANE_MODE_BROADCAST =
+ "am broadcast -a android.intent.action.AIRPLANE_MODE";
+ private static final String TAG = "WirelessNetworkTests";
+
+
+ private UiDevice mDevice;
+ private CommandsHelper mCommandsHelper;
+
+ @Before
+ public void setUp() throws Exception {
+
+ mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+ try {
+ mDevice.setOrientationNatural();
+ } catch (RemoteException e) {
+ throw new RuntimeException("failed to freeze device orientation", e);
+ }
+ // Ensure airplane mode is OFF so that wifi can be enabled using WiFiManager.
+ Settings.Global.putString(InstrumentationRegistry.getTargetContext().getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_ON, "0");
+
+ Log.d(TAG, "sending airplane mode broadcast to device");
+ mCommandsHelper = CommandsHelper.getInstance(InstrumentationRegistry.getInstrumentation());
+ mCommandsHelper.executeShellCommand(AIRPLANE_MODE_BROADCAST);
+ }
+
+ @After
+ public void tearDown() {
+ // Exit all settings sub-menus.
+ for (int i = 0; i < NUM_BACK_BUTTON_PRESSES; ++i) {
+ mDevice.pressBack();
+ }
+ mDevice.pressHome();
+ }
+
+ @Presubmit
+ @Test
+ public void testWiFiEnabled() throws Exception {
+ verifyWiFiOnOrOff(true);
+ }
+
+ @Presubmit
+ @Test
+ public void testWiFiDisabled() throws Exception {
+ verifyWiFiOnOrOff(false);
+ }
+
+ private void verifyWiFiOnOrOff(boolean verifyOn) throws Exception {
+ loadWiFiSettingsPage(!verifyOn);
+ mDevice.wait(Until.findObject(By.res(SETTINGS_PACKAGE, "switch_widget")), TIMEOUT)
+ .click();
+ Thread.sleep(SLEEP_TIME);
+ final String wifiValue = Settings.Global.getString(
+ InstrumentationRegistry.getTargetContext().getContentResolver(),
+ Settings.Global.WIFI_ON);
+ if (verifyOn) {
+ // 1 is Enabled, 2 is Enabled while airplane mode is ON.
+ assertThat(wifiValue).isAnyOf("1", "2");
+ } else {
+ assertThat(wifiValue).isEqualTo("0");
+ }
+ }
+
+ private void loadWiFiSettingsPage(boolean wifiEnabled) throws Exception {
+ WifiManager wifiManager = (WifiManager) InstrumentationRegistry.getTargetContext()
+ .getSystemService(Context.WIFI_SERVICE);
+ wifiManager.setWifiEnabled(wifiEnabled);
+ SettingsHelper.launchSettingsPage(InstrumentationRegistry.getTargetContext(),
+ Settings.ACTION_WIFI_SETTINGS);
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/testutils/SettingsTestUtils.java b/tests/uitests/src/com/android/settings/ui/testutils/SettingsTestUtils.java
new file mode 100644
index 0000000..9b1be14
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/testutils/SettingsTestUtils.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.ui.testutils;
+
+import static org.junit.Assert.assertNotNull;
+
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+
+public class SettingsTestUtils {
+
+ public static final String SETTINGS_PACKAGE = "com.android.settings";
+ public static final int TIMEOUT = 2000;
+
+ private void scrollToTop(UiDevice device) throws Exception {
+ int count = 5;
+ UiObject2 view = null;
+ while (count >= 0) {
+ view = device.wait(
+ Until.findObject(By.res(SETTINGS_PACKAGE, "main_content")),
+ TIMEOUT);
+ view.scroll(Direction.UP, 1.0f);
+ count--;
+ }
+ }
+
+ public static void assertTitleMatch(UiDevice device, String title) {
+ int maxAttempt = 5;
+ UiObject2 item = null;
+ UiObject2 view = null;
+ while (maxAttempt-- > 0) {
+ item = device.wait(Until.findObject(By.res("android:id/title").text(title)), TIMEOUT);
+ if (item == null) {
+ view = device.wait(
+ Until.findObject(By.res(SETTINGS_PACKAGE, "main_content")),
+ TIMEOUT);
+ view.scroll(Direction.DOWN, 1.0f);
+ } else {
+ return;
+ }
+ }
+ assertNotNull(String.format("%s in Setting has not been loaded correctly", title), item);
+ }
+}
diff --git a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java b/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java
index d89d4a3..17a1889 100644
--- a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java
+++ b/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java
@@ -15,6 +15,9 @@
*/
package com.android.settings.applications;
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
import android.app.AppOpsManager;
import android.content.Context;
import android.content.Intent;
@@ -95,7 +98,9 @@
* Creates an intent for showing the permission settings for all apps.
*/
private Intent createManageAllAppsIntent() {
- return new Intent(mActivityAction);
+ final Intent intent = new Intent(mActivityAction);
+ intent.addFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK);
+ return intent;
}
/**
diff --git a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
index 86e8dc1..b16c700 100644
--- a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
+++ b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
@@ -26,6 +26,7 @@
import android.support.test.runner.AndroidJUnit4;
import android.util.ArraySet;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableResources;
@@ -54,7 +55,10 @@
public void controllersInSearchShouldImplementPreferenceControllerMixin() {
final Set<String> errorClasses = new ArraySet<>();
- for (Class clazz : SearchIndexableResources.providerValues()) {
+ final SearchIndexableResources resources =
+ FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
+ .getSearchIndexableResources();
+ for (Class<?> clazz : resources.getProviderValues()) {
final Indexable.SearchIndexProvider provider =
DatabaseIndexingUtils.getSearchIndexProvider(clazz);
diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
index 36865a4..3daecce 100644
--- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
+++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
@@ -31,6 +31,7 @@
import android.util.Log;
import android.util.Xml;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
@@ -73,7 +74,24 @@
"toggle_bluetooth",
"toggle_nfc",
"android_beam_settings",
- "sms_mirroring"
+ "sms_mirroring",
+ // Dup keys from About Phone v2 experiment.
+ "ims_reg_state",
+ "bt_address",
+ "device_model",
+ "firmware_version",
+ "regulatory_info",
+ "manual",
+ "legal_container",
+ "device_feedback",
+ "fcc_equipment_id",
+ "sim_status",
+ "build_number",
+ "phone_number",
+ "imei_info",
+ "wifi_ip_address",
+ "wifi_mac_address",
+ "safety_info"
);
private Context mContext;
@@ -100,7 +118,10 @@
final Set<String> uniqueKeys = new HashSet<>();
final Set<String> nullKeyClasses = new HashSet<>();
final Set<String> duplicatedKeys = new HashSet<>();
- for (Class<?> clazz : SearchIndexableResources.providerValues()) {
+ final SearchIndexableResources resources =
+ FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
+ .getSearchIndexableResources();
+ for (Class<?> clazz : resources.getProviderValues()) {
verifyPreferenceKeys(uniqueKeys, duplicatedKeys, nullKeyClasses, clazz);
}
diff --git a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
index ad00bd7..6d6f06c 100644
--- a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
+++ b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
@@ -32,6 +32,7 @@
import android.util.Log;
import android.util.Xml;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableResources;
@@ -63,7 +64,10 @@
UserManager.DISALLOW_FACTORY_RESET,
UserManager.DISALLOW_CONFIG_TETHERING,
UserManager.DISALLOW_CONFIG_VPN,
- UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS
+ UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
+ UserManager.DISALLOW_AIRPLANE_MODE,
+ UserManager.DISALLOW_CONFIG_BRIGHTNESS,
+ UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT
);
@Before
@@ -77,7 +81,10 @@
@Test
public void userRestrictionAttributeShouldBeValid()
throws IOException, XmlPullParserException, Resources.NotFoundException {
- for (Class<?> clazz : SearchIndexableResources.providerValues()) {
+ final SearchIndexableResources resources =
+ FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
+ .getSearchIndexableResources();
+ for (Class<?> clazz : resources.getProviderValues()) {
verifyUserRestriction(clazz);
}
}
diff --git a/tests/unit/src/com/android/settings/notification/ChannelGroupNotificationSettingsTest.java b/tests/unit/src/com/android/settings/notification/ChannelGroupNotificationSettingsTest.java
deleted file mode 100644
index ce2c408..0000000
--- a/tests/unit/src/com/android/settings/notification/ChannelGroupNotificationSettingsTest.java
+++ /dev/null
@@ -1,133 +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 static android.app.NotificationManager.IMPORTANCE_HIGH;
-import static android.app.NotificationManager.IMPORTANCE_MIN;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import static org.hamcrest.Matchers.allOf;
-import static org.junit.Assert.fail;
-
-import android.app.INotificationManager;
-import android.app.Instrumentation;
-import android.app.NotificationChannel;
-import android.app.NotificationChannelGroup;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Process;
-import android.os.ServiceManager;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class ChannelGroupNotificationSettingsTest {
-
- private Context mTargetContext;
- private Instrumentation mInstrumentation;
- private NotificationManager mNm;
-
- @Before
- public void setUp() {
- mInstrumentation = InstrumentationRegistry.getInstrumentation();
- mTargetContext = mInstrumentation.getTargetContext();
- mNm = (NotificationManager) mTargetContext.getSystemService(Context.NOTIFICATION_SERVICE);
- }
-
- @Test
- public void launchNotificationSetting_displaysChannels() {
- NotificationChannelGroup group =
- new NotificationChannelGroup(this.getClass().getName(), this.getClass().getName());
- group.setDescription("description");
- NotificationChannel channel = new NotificationChannel(this.getClass().getName(),
- "channel" + this.getClass().getName(), IMPORTANCE_MIN);
- channel.setGroup(this.getClass().getName());
- NotificationChannel channel2 = new NotificationChannel("2"+this.getClass().getName(),
- "2channel" + this.getClass().getName(), IMPORTANCE_MIN);
- channel2.setGroup(this.getClass().getName());
-
- mNm.createNotificationChannelGroup(group);
- mNm.createNotificationChannel(channel);
- mNm.createNotificationChannel(channel2);
-
- final Intent intent = new Intent(Settings.ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS)
- .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
- .putExtra(Settings.EXTRA_CHANNEL_GROUP_ID, group.getId());
-
- mInstrumentation.startActivitySync(intent);
-
- onView(allOf(withText(group.getName().toString()))).check(matches(isDisplayed()));
- onView(allOf(withText(channel.getName().toString()))).check(
- matches(isDisplayed()));
- onView(allOf(withText(group.getDescription().toString()))).check(
- matches(isDisplayed()));
- onView(allOf(withText(channel2.getName().toString()))).check(
- matches(isDisplayed()));
- try {
- onView(allOf(withText("Android is blocking this group of notifications from"
- + " appearing on this device"))).check(matches(isDisplayed()));
- fail("Blocking footer erroneously appearing");
- } catch (Exception e) {
- // expected
- }
- }
-
- @Test
- public void launchNotificationSettings_blockedGroup() throws Exception {
- NotificationChannelGroup blocked =
- new NotificationChannelGroup("blocked", "blocked");
- NotificationChannel channel =
- new NotificationChannel("channel", "channel", IMPORTANCE_HIGH);
- channel.setGroup(blocked.getId());
- mNm.createNotificationChannelGroup(blocked);
- mNm.createNotificationChannel(channel);
-
- INotificationManager sINM = INotificationManager.Stub.asInterface(
- ServiceManager.getService(Context.NOTIFICATION_SERVICE));
- blocked.setBlocked(true);
- sINM.updateNotificationChannelGroupForPackage(
- mTargetContext.getPackageName(), Process.myUid(), blocked);
-
- final Intent intent = new Intent(Settings.ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS)
- .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
- .putExtra(Settings.EXTRA_CHANNEL_GROUP_ID, blocked.getId());
- mInstrumentation.startActivitySync(intent);
-
- onView(allOf(withText("Off"), isDisplayed())).check(matches(isDisplayed()));
- onView(allOf(withText("Android is blocking this group of notifications from"
- + " appearing on this device"))).check(matches(isDisplayed()));
-
- try {
- onView(allOf(withText(channel.getName().toString()))).check(matches(isDisplayed()));
- fail("settings appearing for blocked group");
- } catch (Exception e) {
- // expected
- }
- }
-}
diff --git a/tests/unit/src/com/android/settings/search/SearchActivityTest.java b/tests/unit/src/com/android/settings/search/SearchActivityTest.java
deleted file mode 100644
index 8a7e3fe..0000000
--- a/tests/unit/src/com/android/settings/search/SearchActivityTest.java
+++ /dev/null
@@ -1,52 +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.search;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class SearchActivityTest {
-
- @Test
- public void shouldHaveParentActivity() {
- final Context context = InstrumentationRegistry.getTargetContext();
- final PackageManager packageManager = context.getPackageManager();
- final Intent intent = new Intent(context, SearchActivity.class);
- final List<ResolveInfo> resolveInfos = packageManager.queryIntentActivities(
- intent, PackageManager.GET_META_DATA);
-
- assertThat(resolveInfos).isNotEmpty();
- assertThat(resolveInfos.get(0).activityInfo.parentActivityName)
- .isEqualTo(Settings.class.getName());
- }
-}
diff --git a/tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java b/tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java
deleted file mode 100644
index e89dc9e..0000000
--- a/tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.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.search;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
-import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.core.AllOf.allOf;
-
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.widget.SearchView;
-
-import com.android.settings.R;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class SearchFragmentEspressoTest {
- @Rule
- public ActivityTestRule<SearchActivity> mActivityRule =
- new ActivityTestRule<>(SearchActivity.class, true, true);
-
- @Test
- public void test_OpenKeyboardOnSearchLaunch() {
- onView(allOf(hasFocus(), withId(R.id.search_view)))
- .check(matches(withClassName(containsString(SearchView.class.getName()))));
- }
-}
diff --git a/tests/unit/src/com/android/settings/CreateShortcutTest.java b/tests/unit/src/com/android/settings/shortcut/CreateShortcutTest.java
similarity index 90%
rename from tests/unit/src/com/android/settings/CreateShortcutTest.java
rename to tests/unit/src/com/android/settings/shortcut/CreateShortcutTest.java
index 4ae9bd7..5ec008b 100644
--- a/tests/unit/src/com/android/settings/CreateShortcutTest.java
+++ b/tests/unit/src/com/android/settings/shortcut/CreateShortcutTest.java
@@ -14,12 +14,10 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.shortcut;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.any;
@@ -39,9 +37,13 @@
import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager;
import android.support.test.InstrumentationRegistry;
+import android.support.test.espresso.matcher.ViewMatchers;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+import com.android.settings.R;
+import com.android.settings.Settings;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -55,12 +57,6 @@
/**
* Tests for {@link CreateShortcutTest}
- *
- m SettingsTests &&
- adb install \
- -r -g ${ANDROID_PRODUCT_OUT}/data/app/SettingsTests/SettingsTests.apk &&
- adb shell am instrument -e class com.android.settings.CreateShortcutTest \
- -w com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner
*/
@RunWith(AndroidJUnit4.class)
@SmallTest
@@ -71,8 +67,10 @@
private Instrumentation mInstrumentation;
private Context mContext;
- @Mock ShortcutManager mShortcutManager;
- @Captor ArgumentCaptor<List<ShortcutInfo>> mListCaptor;
+ @Mock
+ ShortcutManager mShortcutManager;
+ @Captor
+ ArgumentCaptor<List<ShortcutInfo>> mListCaptor;
@Before
public void setup() {
@@ -84,15 +82,17 @@
@Test
public void test_layoutDoesNotHaveCancelButton() {
mInstrumentation.startActivitySync(new Intent(Intent.ACTION_CREATE_SHORTCUT)
- .setClassName(mContext, CreateShortcut.class.getName()));
- onView(withText(R.string.cancel)).check(doesNotExist());
+ .setClassName(mContext, CreateShortcut.class.getName())
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+ onView(ViewMatchers.withText(R.string.cancel)).check(doesNotExist());
}
@Test
public void createResultIntent() {
CreateShortcut orgActivity = (CreateShortcut) mInstrumentation.startActivitySync(
new Intent(Intent.ACTION_CREATE_SHORTCUT)
- .setClassName(mContext, CreateShortcut.class.getName()));
+ .setClassName(mContext, CreateShortcut.class.getName())
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
CreateShortcut activity = spy(orgActivity);
doReturn(mShortcutManager).when(activity).getSystemService(eq(Context.SHORTCUT_SERVICE));
diff --git a/tests/unit/src/com/android/settings/TetherServiceTest.java b/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
similarity index 98%
rename from tests/unit/src/com/android/settings/TetherServiceTest.java
rename to tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
index 899ea7a..7bf5798 100644
--- a/tests/unit/src/com/android/settings/TetherServiceTest.java
+++ b/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.wifi.tether;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
@@ -49,17 +49,13 @@
import android.content.SharedPreferences.Editor;
import android.content.res.Resources;
import android.net.ConnectivityManager;
-import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.ResultReceiver;
import android.os.SystemClock;
import android.test.ServiceTestCase;
-import android.test.mock.MockResources;
import android.util.Log;
-import com.android.settings.TetherService;
-
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;