diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9c8a677..5ef5caf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -176,14 +176,40 @@
 
         <!-- Wireless Controls -->
 
-        <activity android:name="Settings$WirelessSettingsActivity"
-                android:taskAffinity="com.android.settings"
-                android:label="@string/wireless_networks_settings_title"
-                android:icon="@drawable/ic_settings_more"
-                android:parentActivityName="Settings">
+        <activity android:name=".Settings$NetworkDashboardActivity"
+            android:taskAffinity="com.android.settings"
+            android:label="@string/network_dashboard_title"
+            android:icon="@drawable/ic_dashboard_network"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
                 <action android:name="android.settings.AIRPLANE_MODE_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="10">
+                <action android:name="com.android.settings.action.SETTINGS"/>
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.ia.homepage"/>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.network.NetworkDashboardFragment"/>
+            <meta-data android:name="com.android.settings.summary"
+                android:value="@string/network_dashboard_summary"/>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
+        <activity android:name=".Settings$ConnectedDeviceDashboardActivity"
+            android:taskAffinity="com.android.settings"
+            android:label="@string/connected_devices_dashboard_title"
+            android:icon="@drawable/ic_devices_other"
+            android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.NFC_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -192,16 +218,15 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-            <intent-filter android:priority="-1">
-                <action android:name="com.android.settings.action.SETTINGS" />
+            <intent-filter android:priority="10">
+                <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.wireless" />
-            <meta-data android:name="com.android.settings.title"
-                android:resource="@string/radio_controls_title" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.WirelessSettings" />
-            <!-- Note that this doesn't really show any Wireless settings. -->
+                android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.ia.homepage"/>
+            <meta-data android:name="com.android.settings.summary"
+                android:value="@string/connected_devices_dashboard_summary"/>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -384,7 +409,7 @@
                 android:launchMode="singleTask"
                 android:taskAffinity="com.android.settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:parentActivityName="Settings$WirelessSettingsActivity"
+                android:parentActivityName="Settings$NetworkDashboardActivity"
                 android:process="com.android.phone">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APN_SETTINGS" />
@@ -537,11 +562,11 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="5">
+            <intent-filter android:priority="240">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.system" />
+                android:value="com.android.settings.category.ia.system" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DateTimeSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -552,7 +577,7 @@
                 android:label="@string/language_picker_title"
                 android:icon="@drawable/ic_settings_language"
                 android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
+                android:parentActivityName="Settings$LanguageAndInputSettingsActivity">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LOCALE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -568,25 +593,25 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$InputMethodAndLanguageSettingsActivity"
+        <activity android:name=".Settings$LanguageAndInputSettingsActivity"
             android:label="@string/language_keyboard_settings_title"
             android:icon="@drawable/ic_settings_language"
             android:taskAffinity="com.android.settings"
-            android:parentActivityName="Settings">
+            android:parentActivityName="Settings$SystemDashboardActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="-1">
-                <action android:name="com.android.settings.action.SETTINGS" />
+            <intent-filter android:priority="260">
+                <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.personal" />
+                android:value="com.android.settings.category.ia.system"/>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.inputmethod.InputMethodAndLanguageSettings" />
+                android:value="com.android.settings.language.LanguageAndInputSettings"/>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
+                android:value="true"/>
         </activity>
 
         <activity android:name="Settings$AvailableVirtualKeyboardActivity"
@@ -614,7 +639,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageAssist" />
+                android:value="com.android.settings.applications.assist.ManageAssist" />
         </activity>
 
         <activity android:name="Settings$KeyboardLayoutPickerActivity"
@@ -648,15 +673,15 @@
                 android:label="@string/language_keyboard_settings_title"
                 android:clearTaskOnLaunch="true"
                 android:exported="true"
-                android:targetActivity="Settings$InputMethodAndLanguageSettingsActivity">
+                android:targetActivity="Settings$LanguageAndInputSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.inputmethod.InputMethodAndLanguageSettings" />
+                android:value="com.android.settings.language.LanguageAndInputSettings" />
         </activity-alias>
 
         <activity android:name="Settings$SpellCheckersSettingsActivity"
                 android:label="@string/spellcheckers_settings_title"
                 android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
+                android:parentActivityName="Settings$LanguageAndInputSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
@@ -692,7 +717,7 @@
         <activity android:name="Settings$UserDictionarySettingsActivity"
                 android:label="@string/user_dict_settings_title"
                 android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
+                android:parentActivityName="Settings$LanguageAndInputSettingsActivity">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -891,7 +916,7 @@
 
         <activity android:name="Settings$DisplaySettingsActivity"
                 android:label="@string/display_settings"
-                android:icon="@drawable/ic_settings_display"
+                android:icon="@drawable/ic_dashboard_display"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -904,15 +929,17 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="9">
+            <intent-filter android:priority="7">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
+                android:value="com.android.settings.category.ia.homepage" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DisplaySettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
+            <meta-data android:name="com.android.settings.summary"
+                android:value="@string/display_dashboard_summary"/>
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -953,11 +980,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-            <intent-filter android:priority="-1">
+            <intent-filter android:priority="10">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.system" />
+                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"
@@ -1030,7 +1057,7 @@
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
+                android:value="com.android.settings.category.ia.development" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ProcessStatsSummary" />
         </activity>
@@ -1271,7 +1298,7 @@
 
         <activity android:name="Settings$SecuritySettingsActivity"
                 android:label="@string/security_settings_title"
-                android:icon="@drawable/ic_settings_security"
+                android:icon="@drawable/ic_dashboard_security"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity=""
                 android:parentActivityName="Settings">
@@ -1285,11 +1312,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-            <intent-filter android:priority="2">
+            <intent-filter android:priority="4">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.personal" />
+                       android:value="com.android.settings.category.ia.homepage" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.SecuritySettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1342,11 +1369,6 @@
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.PRIVACY_SETTINGS" />
-                <action android:name="android.settings.BACKUP_AND_RESET_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" />
@@ -1457,15 +1479,17 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="4">
+            <intent-filter android:priority="2">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.system" />
+                android:value="com.android.settings.category.ia.homepage" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.accessibility.AccessibilitySettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
+            <meta-data android:name="com.android.settings.summary"
+                android:resource="@string/accessibility_settings_summary" />
         </activity>
 
         <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
@@ -1523,7 +1547,7 @@
         <activity android:name="Settings$TextToSpeechSettingsActivity"
                 android:label="@string/tts_settings"
                 android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
+                android:parentActivityName="Settings$LanguageAndInputSettingsActivity">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.TTS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1543,11 +1567,11 @@
                 <action android:name="android.settings.ENTERPRISE_PRIVACY_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:priority="-1">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
+                android:value="com.android.settings.category.ia.system" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.enterprise.EnterprisePrivacySettings" />
         </activity>
@@ -1921,11 +1945,11 @@
                 <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="2">
+            <intent-filter android:priority="50">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.system" />
+                android:value="com.android.settings.category.ia.system" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DevelopmentSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1946,11 +1970,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-            <intent-filter android:priority="3">
+            <intent-filter android:priority="2">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.system" />
+                android:value="com.android.settings.category.ia.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.print.PrintSettingsFragment" />
         </activity>
@@ -2050,11 +2074,11 @@
                   android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
         </activity>
 
+        <service android:name=".bluetooth.BluetoothPairingService" />
+
         <receiver android:name=".bluetooth.BluetoothPairingRequest">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
-                <action android:name="android.bluetooth.device.action.PAIRING_CANCEL" />
-                <action android:name="android.bluetooth.device.action.BOND_STATE_CHANGED" />
             </intent-filter>
         </receiver>
 
@@ -2092,7 +2116,7 @@
         <activity android:name="Settings$AndroidBeamSettingsActivity"
                 android:label="@string/android_beam_settings_title"
                 android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$WirelessSettingsActivity">
+                android:parentActivityName="Settings$ConnectedDeviceDashboardActivity">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFCSHARING_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2216,11 +2240,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="4">
+            <intent-filter android:priority="8">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
+                android:value="com.android.settings.category.ia.homepage" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
         </activity>
@@ -2259,26 +2283,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$AccountSettingsActivity"
-            android:label="@string/account_settings_title"
-            android:icon="@drawable/ic_settings_accounts"
-            android:taskAffinity=""
-            android:parentActivityName="Settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter android:priority="1">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.personal" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.accounts.AccountSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
         <activity android:name="Settings$AccountSyncSettingsActivity"
             android:label="@string/account_sync_settings_title"
             android:taskAffinity=""
@@ -2314,7 +2318,7 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/header_add_an_account"
             android:taskAffinity="com.android.settings"
-            android:parentActivityName="Settings$ManageAccountsSettingsActivity">
+            android:parentActivityName="Settings$UserAndAccountDashboardActivity">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2399,11 +2403,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="1">
+            <intent-filter android:priority="10">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.wireless" />
+                android:value="com.android.settings.category.ia.wireless" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.datausage.DataUsageSummary" />
         </activity>
@@ -2598,15 +2602,21 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="7">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ACTION_OTHER_SOUND_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="6">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.device" />
+                       android:value="com.android.settings.category.ia.homepage" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.SoundSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
+            <meta-data android:name="com.android.settings.summary"
+                android:value="@string/sound_dashboard_summary"/>
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -2618,24 +2628,6 @@
                 android:value="com.android.settings.notification.SoundSettings" />
         </activity-alias>
 
-        <activity android:name="Settings$OtherSoundSettingsActivity"
-                android:label="@string/other_sound_settings"
-                android:exported="true"
-                android:taskAffinity="">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.ACTION_OTHER_SOUND_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.notification.OtherSoundSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
         <!-- Show apps for which application-level notification settings are applicable -->
         <activity android:name="Settings$NotificationAppListActivity"
                 android:label="@string/app_notifications_title"
@@ -2771,7 +2763,7 @@
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.wireless" />
+                android:value="com.android.settings.category.ia.wireless" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.sim.SimSettings" />
         </activity>
@@ -2954,27 +2946,7 @@
                 android:value="true" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.webview.WebViewAppPicker" />
-      </activity-alias>
-
-        <!-- activity for gesture settings -->
-        <activity android:name="Settings$GestureSettingsActivity"
-                  android:label="@string/gesture_preference_title"
-                  android:icon="@drawable/ic_settings_gestures"
-                  android:enabled="@bool/config_gesture_settings_enabled">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.SHORTCUT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.device" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.gestures.GestureSettings" />
-            <meta-data android:name="com.android.settings.summary"
-                       android:resource="@string/gesture_preference_summary" />
-        </activity>
+        </activity-alias>
 
         <activity android:name=".backup.BackupSettingsActivity"
                   android:label="@string/privacy_settings_title"
@@ -2991,11 +2963,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-            <intent-filter android:priority="-2">
+            <intent-filter android:priority="60">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.personal" />
+                       android:value="com.android.settings.category.ia.system" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
         </activity>
@@ -3015,49 +2987,9 @@
         <!-- Information architecture host activities -->
 
         <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->
-        <activity android:name=".Settings$NetworkDashboardActivity"
-                  android:taskAffinity=""
-                  android:label="@string/network_dashboard_title"
-                  android:icon="@drawable/ic_settings_wireless">
-            <intent-filter android:priority="10">
-                <action android:name="com.android.settings.action.SETTINGS"/>
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.homepage"/>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.network.NetworkDashboardFragment"/>
-            <meta-data android:name="com.android.settings.summary"
-                       android:value="@string/network_dashboard_summary"/>
-        </activity>
-
-        <activity-alias android:name="DataUsageDashboardAlias"
-                        android:targetActivity="Settings$DataUsageSummaryActivity">
-            <intent-filter android:priority="10">
-                <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.wireless"/>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.datausage.DataUsageSummary"/>
-        </activity-alias>
-
-        <activity android:name=".Settings$ConnectedDeviceDashboardActivity"
-                  android:label="@string/connected_devices_dashboard_title"
-                  android:icon="@drawable/ic_devices_other">
-            <intent-filter android:priority="10">
-                <action android:name="com.android.settings.action.SETTINGS"/>
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.homepage"/>
-            <meta-data android:name="com.android.settings.summary"
-                       android:value="@string/connected_devices_dashboard_summary"/>
-        </activity>
-
         <activity android:name=".Settings$AppAndNotificationDashboardActivity"
                   android:label="@string/app_and_notification_dashboard_title"
-                  android:icon="@drawable/ic_apps">
+                  android:icon="@drawable/ic_dashboard_apps">
             <intent-filter android:priority="9">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
@@ -3069,50 +3001,9 @@
                        android:value="@string/app_and_notification_dashboard_summary"/>
         </activity>
 
-        <activity-alias android:name="BatteryDashboardAlias"
-                        android:targetActivity="Settings$PowerUsageSummaryActivity">
-            <intent-filter android:priority="8">
-                <action android:name="com.android.settings.action.SETTINGS"/>
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.fuelgauge.PowerUsageSummary"/>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.homepage"/>
-        </activity-alias>
-
-        <activity-alias android:name="DisplayDashboardAlias"
-                        android:targetActivity="Settings$DisplaySettingsActivity">
-            <intent-filter android:priority="7">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.homepage" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.DisplaySettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-            <meta-data android:name="com.android.settings.summary"
-                       android:value="@string/display_dashboard_summary"/>
-        </activity-alias>
-
-        <activity-alias android:name="SoundDashboardAlias"
-                        android:targetActivity="Settings$SoundSettingsActivity">
-            <intent-filter android:priority="6">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.homepage" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.SoundSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-            <meta-data android:name="com.android.settings.summary"
-                       android:value="@string/sound_dashboard_summary"/>
-        </activity-alias>
-
         <activity android:name=".Settings$StorageDashboardActivity"
                   android:label="@string/storage_settings"
-                  android:icon="@drawable/ic_settings_storage">
+                  android:icon="@drawable/ic_dashboard_storage">
             <intent-filter android:priority="5">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
@@ -3124,22 +3015,9 @@
                        android:value="true" />
         </activity>
 
-        <activity-alias android:name="SecurityDashboardAlias"
-                android:targetActivity="Settings$SecuritySettingsActivity">
-            <intent-filter android:priority="4">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.homepage" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.SecuritySettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity-alias>
-
         <activity android:name=".Settings$UserAndAccountDashboardActivity"
                   android:label="@string/account_dashboard_title"
-                  android:icon="@drawable/ic_settings_accounts">
+                  android:icon="@drawable/ic_dashboard_user">
             <intent-filter android:priority="3">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
@@ -3151,39 +3029,13 @@
                        android:value="com.android.settings.accounts.UserAndAccountDashboardFragment"/>
             <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-alias android:name="LocationDashboardAlias"
-                        android:targetActivity="Settings$LocationSettingsActivity">
-            <intent-filter>
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.security" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.location.LocationSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity-alias>
-
-        <activity-alias android:name="AccessibilityDashboardAlias"
-                        android:targetActivity="Settings$AccessibilitySettingsActivity">
-            <intent-filter android:priority="2">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.homepage" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.accessibility.AccessibilitySettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-            <meta-data android:name="com.android.settings.summary"
-                       android:resource="@string/accessibility_settings_summary" />
-        </activity-alias>
-
         <activity android:name=".Settings$SystemDashboardActivity"
                   android:label="@string/header_category_system"
-                  android:icon="@drawable/ic_settings_about">
+                  android:icon="@drawable/ic_dashboard_system">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
@@ -3197,7 +3049,8 @@
 
         <activity android:name=".Settings$SupportDashboardActivity"
                   android:label="@string/page_tab_title_support"
-                  android:icon="@drawable/ic_help">
+                  android:icon="@drawable/ic_help"
+                  android:enabled="@bool/config_support_enabled">
             <intent-filter android:priority="0">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
@@ -3209,100 +3062,6 @@
                        android:resource="@string/support_summary"/>
         </activity>
 
-        <!-- Alias for IME & Language in new IA. Should merge into TargetActivity when launch -->
-        <activity android:name=".Settings$LanguageAndInputSettingsActivity"
-                  android:label="@string/language_keyboard_settings_title"
-                  android:icon="@drawable/ic_settings_language">
-            <intent-filter android:priority="260">
-                <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.FRAGMENT_CLASS"
-                       android:value="com.android.settings.language.LanguageAndInputSettings"/>
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true"/>
-            <!-- Inherit intent-filter from LanguageSettingsActivity -->
-        </activity>
-
-        <!-- Alias for Date & Time in new IA. Should merge into TargetActivity when launch -->
-        <activity-alias android:name="DateTimeDashboardAlias"
-                        android:targetActivity="Settings$DateTimeSettingsActivity">
-            <intent-filter android:priority="240">
-                <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.FRAGMENT_CLASS"
-                       android:value="com.android.settings.DateTimeSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity-alias>
-
-        <activity-alias android:name="BackupResetDashboardAlias"
-                        android:targetActivity=".backup.BackupSettingsActivity">
-            <intent-filter android:priority="60">
-                <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.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity-alias>
-
-        <!-- Alias for developer setting in new IA. Should merge into TargetActivity when launch -->
-        <activity-alias android:name="DevelopmentSettingsDashboardAlias"
-                        android:targetActivity="Settings$DevelopmentSettingsActivity"
-                        android:label="@string/development_settings_title"
-                        android:icon="@drawable/ic_settings_development">
-            <intent-filter android:priority="50">
-                <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.FRAGMENT_CLASS"
-                       android:value="com.android.settings.DevelopmentSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity-alias>
-
-        <activity-alias android:name="AboutDeviceDashboardAlias"
-                        android:targetActivity="Settings$DeviceInfoSettingsActivity">
-            <intent-filter android:priority="10">
-                <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.FRAGMENT_CLASS"
-                       android:value="com.android.settings.DeviceInfoSettings" />
-            <meta-data android:name="com.android.settings.title"
-                android:resource="@string/about_settings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity-alias>
-
-        <activity-alias android:name="MemorySettingsDashboardAlias"
-                        android:targetActivity=".Settings$MemorySettingsActivity">
-            <intent-filter>
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.development" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.ProcessStatsSummary" />
-        </activity-alias>
-
-        <activity-alias android:name="PrintDashboardAlias"
-                        android:targetActivity="Settings$PrintSettingsActivity">
-            <intent-filter android:priority="2">
-                <action android:name="com.android.settings.action.SETTINGS"/>
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.print.PrintSettingsFragment" />
-            <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.device" />
-        </activity-alias>
-
         <activity-alias android:name="ManageApplicationsDashboardAlias"
                         android:targetActivity="Settings$ManageApplicationsActivity">
             <intent-filter android:priority="200">
@@ -3383,18 +3142,6 @@
                        android:value="true"/>
         </activity-alias>
 
-        <!-- Alias for enterprise privacy setting in new IA. Should merge into TargetActivity when launch -->
-        <activity-alias android:name="EnterprisePrivacyDashboardAlias"
-                        android:targetActivity="Settings$EnterprisePrivacySettingsActivity">
-            <intent-filter android:priority="-1">
-                <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.FRAGMENT_CLASS"
-                android:value="com.android.settings.enterprise.EnterprisePrivacySettings" />
-        </activity-alias>
-
         <!-- End of information architecture host activities -->
 
         <service
diff --git a/res/color/storage_wizard_button_red.xml b/res/color/storage_wizard_button_red.xml
index 9e9a908..59de7c7 100644
--- a/res/color/storage_wizard_button_red.xml
+++ b/res/color/storage_wizard_button_red.xml
@@ -17,6 +17,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false"
           android:alpha="?android:attr/disabledAlpha"
-          android:color="#fff4511e" />
-    <item android:color="#fff4511e" />
+          android:color="?android:attr/colorError" />
+    <item android:color="?android:attr/colorError" />
 </selector>
diff --git a/res/drawable/app_filter_spinner_background.xml b/res/drawable/app_filter_spinner_background.xml
new file mode 100644
index 0000000..70a56ff
--- /dev/null
+++ b/res/drawable/app_filter_spinner_background.xml
@@ -0,0 +1,34 @@
+<?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.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+            android:paddingMode="stack"
+            android:paddingStart="0dp"
+            android:paddingEnd="48dp"
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp">
+    <item
+        android:gravity="end|fill_vertical"
+        android:width="48dp"
+        android:drawable="@*android:drawable/control_background_40dp_material" />
+
+    <item
+        android:drawable="@drawable/ic_expand_more_inverse"
+        android:gravity="end|center_vertical"
+        android:width="24dp"
+        android:height="24dp"
+        android:end="12dp" />
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_dashboard_apps.xml b/res/drawable/ic_dashboard_apps.xml
new file mode 100644
index 0000000..c0083a6
--- /dev/null
+++ b/res/drawable/ic_dashboard_apps.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2017 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z"
+        android:fillColor="#ec8122"/>
+</vector>
diff --git a/res/drawable/ic_dashboard_display.xml b/res/drawable/ic_dashboard_display.xml
new file mode 100644
index 0000000..ae367cf
--- /dev/null
+++ b/res/drawable/ic_dashboard_display.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4184f3"
+        android:pathData="M20.0,15.31L23.31,12.0 20.0,8.69L20.0,4.0l-4.69,0.0L12.0,0.69 8.69,4.0L4.0,4.0l0.0,4.69L0.69,12.0 4.0,15.31L4.0,20.0l4.69,0.0L12.0,23.31 15.31,20.0L20.0,20.0l0.0,-4.69zM12.0,18.0L12.0,6.0c3.31,0.0 6.0,2.69 6.0,6.0s-2.69,6.0 -6.0,6.0z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_dashboard_network.xml b/res/drawable/ic_dashboard_network.xml
new file mode 100644
index 0000000..6c7ee2e
--- /dev/null
+++ b/res/drawable/ic_dashboard_network.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="18.0"
+        android:viewportHeight="18.0">
+    <path
+        android:fillColor="#0b9c57"
+        android:pathData="M9.01,15.99l8.8,-10.96C17.47,4.77 14.08,2.0 9.0,2.0S0.53,4.7 0.19,5.03l8.8,10.96l0.02,0.0z"/>
+</vector>
diff --git a/res/drawable/ic_dashboard_security.xml b/res/drawable/ic_dashboard_security.xml
new file mode 100644
index 0000000..1e6a1e8
--- /dev/null
+++ b/res/drawable/ic_dashboard_security.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#7a1ea1"
+        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>
\ No newline at end of file
diff --git a/res/drawable/ic_dashboard_sound.xml b/res/drawable/ic_dashboard_sound.xml
new file mode 100644
index 0000000..0cd3b04
--- /dev/null
+++ b/res/drawable/ic_dashboard_sound.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4184f3"
+        android:pathData="M3.0,9.0l0.0,6.0l4.0,0.0l5.0,5.0L12.0,4.0L7.0,9.0L3.0,9.0zm13.5,3.0c0.0,-1.77 -1.02,-3.29 -2.5,-4.03l0.0,8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14.0,3.23l0.0,2.06c2.8,0.86 5.0,3.54 5.0,6.71s-2.11,5.85 -5.0,6.71l0.0,2.06c4.01,-0.91 7.0,-4.49 7.0,-8.77s-2.99,-7.86 -7.0,-8.77z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_dashboard_storage.xml b/res/drawable/ic_dashboard_storage.xml
new file mode 100644
index 0000000..2b6160e
--- /dev/null
+++ b/res/drawable/ic_dashboard_storage.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4184f3"
+        android:pathData="M2.0,20.0l20.0,0.0l0.0,-4.0L2.0,16.0l0.0,4.0zm2.0,-3.0l2.0,0.0l0.0,2.0L4.0,19.0l0.0,-2.0zM2.0,4.0l0.0,4.0l20.0,0.0L22.0,4.0L2.0,4.0zm4.0,3.0L4.0,7.0L4.0,5.0l2.0,0.0l0.0,2.0zm-4.0,7.0l20.0,0.0l0.0,-4.0L2.0,10.0l0.0,4.0zm2.0,-3.0l2.0,0.0l0.0,2.0L4.0,13.0l0.0,-2.0z"/>
+</vector>
diff --git a/res/drawable/ic_dashboard_system.xml b/res/drawable/ic_dashboard_system.xml
new file mode 100644
index 0000000..fdd9214
--- /dev/null
+++ b/res/drawable/ic_dashboard_system.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#606060"
+        android:pathData="M11.0,17.0l2.0,0.0l0.0,-6.0l-2.0,0.0l0.0,6.0zm1.0,-15.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zm0.0,18.0c-4.41,0.0 -8.0,-3.59 -8.0,-8.0s3.59,-8.0 8.0,-8.0 8.0,3.59 8.0,8.0 -3.59,8.0 -8.0,8.0zM11.0,9.0l2.0,0.0L13.0,7.0l-2.0,0.0l0.0,2.0z"/>
+</vector>
diff --git a/res/drawable/ic_dashboard_user.xml b/res/drawable/ic_dashboard_user.xml
new file mode 100644
index 0000000..302d33e
--- /dev/null
+++ b/res/drawable/ic_dashboard_user.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<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="#aeb32a"
+        android:pathData="M3.0,5.0
+        l0.0,14.0c0.0,1.0 0.89,2.0 2.0,2.0l14.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0
+        L21.0,5.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0
+        L5.0,3.0c-1.11,0.0 -2.0,0.9 -2.0,2.0zm12.0,4.0c0.0,1.66 -1.34,3.0 -3.0,3.0s-3.0,-1.34 -3.0,-3.0 1.34,-3.0 3.0,-3.0 3.0,1.34 3.0,3.0zm-9.0,8.0c0.0,-2.0 4.0,-3.1 6.0,-3.1s6.0,1.1 6.0,3.1l0.0,1.0
+        l-12.0,0l0.0,-1.0z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml
index 20639a3..73407a3 100644
--- a/res/drawable/ic_devices_other.xml
+++ b/res/drawable/ic_devices_other.xml
@@ -17,9 +17,8 @@
         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="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"
-        android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#0b9c57"/>
 </vector>
diff --git a/res/drawable/ic_expand_more_inverse.xml b/res/drawable/ic_expand_more_inverse.xml
new file mode 100644
index 0000000..c39e3f9
--- /dev/null
+++ b/res/drawable/ic_expand_more_inverse.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorForegroundInverse">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16.59,8.59L12.0,13.17 7.41,8.59 6.0,10.0l6.0,6.0 6.0,-6.0z"/>
+
+</vector>
diff --git a/res/drawable/ic_fingerprint_error.xml b/res/drawable/ic_fingerprint_error.xml
index b822d45..c9363bc 100644
--- a/res/drawable/ic_fingerprint_error.xml
+++ b/res/drawable/ic_fingerprint_error.xml
@@ -19,12 +19,12 @@
         android:viewportWidth="32.0"
         android:viewportHeight="32.0">
     <path
-        android:fillColor="@*android:color/system_error"
+        android:fillColor="?android:attr/colorError"
         android:pathData="M15.99,2.5C8.53,2.5 2.5,8.54 2.5,16.0s6.03,13.5 13.49,13.5S29.5,23.46 29.5,16.0S23.45,2.5 15.99,2.5zM16.0,26.8c-5.97,0.0 -10.8,-4.83 -10.8,-10.8S10.03,5.2 16.0,5.2S26.8,10.03 26.8,16.0S21.97,26.8 16.0,26.8z"/>
     <path
-        android:fillColor="@*android:color/system_error"
+        android:fillColor="?android:attr/colorError"
         android:pathData="M14.65,20.05l2.7,0.0l0.0,2.7l-2.7,0.0z"/>
     <path
-        android:fillColor="@*android:color/system_error"
+        android:fillColor="?android:attr/colorError"
         android:pathData="M14.65,9.25l2.7,0.0l0.0,8.1l-2.7,0.0z"/>
 </vector>
diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml
index 7a225e5..5b056e7 100644
--- a/res/drawable/ic_help.xml
+++ b/res/drawable/ic_help.xml
@@ -17,9 +17,8 @@
         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,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"
-        android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#f3501d"/>
 </vector>
diff --git a/res/drawable/ic_launcher_settings.xml b/res/drawable/ic_launcher_settings.xml
index 7b09499..cdf9e35 100644
--- a/res/drawable/ic_launcher_settings.xml
+++ b/res/drawable/ic_launcher_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="?android:attr/colorAccent"/>
+    <background android:drawable="@*android:color/accent_device_default_light"/>
     <foreground android:drawable="@mipmap/ic_launcher_settings"/>
 </adaptive-icon>
diff --git a/res/drawable/ic_settings_24dp_inverse.xml b/res/drawable/ic_settings_24dp_inverse.xml
new file mode 100644
index 0000000..6f70d21
--- /dev/null
+++ b/res/drawable/ic_settings_24dp_inverse.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorForegroundInverse">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66
+            -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3
+            -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2
+            14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59
+            -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49
+            0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66
+            0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3
+            0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42
+            0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25
+            1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49
+            -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57
+            -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml
index 34c0bdd..a689c4a 100644
--- a/res/drawable/ic_settings_accessibility.xml
+++ b/res/drawable/ic_settings_accessibility.xml
@@ -17,9 +17,8 @@
         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:fillColor="#3e50b4"
         android:pathData="M12.0,2.0c1.1,0.0 2.0,0.9 2.0,2.0s-0.9,2.0 -2.0,2.0 -2.0,-0.9 -2.0,-2.0 0.9,-2.0 2.0,-2.0zm9.0,7.0l-6.0,0.0l0.0,13.0l-2.0,0.0l0.0,-6.0l-2.0,0.0l0.0,6.0L9.0,22.0L9.0,9.0L3.0,9.0L3.0,7.0l18.0,0.0l0.0,2.0z"/>
 </vector>
diff --git a/res/drawable/ic_settings_battery.xml b/res/drawable/ic_settings_battery.xml
index c8e053d..f1e56d8 100644
--- a/res/drawable/ic_settings_battery.xml
+++ b/res/drawable/ic_settings_battery.xml
@@ -17,10 +17,9 @@
         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:fillColor="#4184f3"
         android:pathData="M15.67,4.0L14.0,4.0L14.0,2.0l-4.0,0.0l0.0,2.0L8.33,4.0C7.6,4.0 7.0,4.6 7.0,5.33l0.0,15.33C7.0,21.4 7.6,22.0 8.33,22.0l7.33,0.0c0.74,0.0 1.34,-0.6 1.34,-1.33L17.0,5.33C17.0,4.6 16.4,4.0 15.67,4.0z
         M16,5l0,5.5l-8,0l0,-5.5l3,0l0,-2l2,0l0,2l3,0z"/>
 </vector>
diff --git a/res/drawable/ic_settings_more.xml b/res/drawable/ic_settings_home.xml
similarity index 60%
rename from res/drawable/ic_settings_more.xml
rename to res/drawable/ic_settings_home.xml
index 1de391a..1cc9593 100644
--- a/res/drawable/ic_settings_more.xml
+++ b/res/drawable/ic_settings_home.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2016 The Android Open Source Project
+    Copyright (C) 2017 The Android Open 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,12 +14,12 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="18.0"
-        android:viewportHeight="18.0"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+    <path android:fillColor="#FFFFFFFF"
+          android:pathData="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" />
+    <path android:pathData="M0 0h24v24H0z" />
 </vector>
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index b4d5fce..0743577 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -39,6 +39,8 @@
             android:layout_weight="1.0"
             android:layout_marginStart="?attr/suwMarginSides"
             android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
+            android:clipChildren="false"
+            android:clipToPadding="false"
             android:orientation="vertical">
 
             <ImageView
@@ -86,7 +88,9 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
-                android:layout_weight="1.0">
+                android:layout_weight="1.0"
+                android:clipChildren="false"
+                android:clipToPadding="false">
 
                 <!-- confirm / restart buttons -->
                 <LinearLayout android:id="@+id/buttonContainer"
@@ -94,6 +98,8 @@
                     android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
                     android:layout_alignParentBottom="true"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
                     android:orientation="horizontal">
 
                     <!-- left / top button: skip, or re-try -->
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index 27af681..c89bc42 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -40,6 +40,8 @@
             android:layout_height="match_parent"
             android:layout_marginStart="?attr/suwMarginSides"
             android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
+            android:clipChildren="false"
+            android:clipToPadding="false"
             android:orientation="vertical">
 
             <ImageView
diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml
index b64b27f..3dadece 100644
--- a/res/layout-land/fingerprint_enroll_find_sensor.xml
+++ b/res/layout-land/fingerprint_enroll_find_sensor.xml
@@ -36,12 +36,16 @@
             android:layout_height="match_parent"
             android:layout_marginStart="?attr/suwMarginSides"
             android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
+            android:clipChildren="false"
+            android:clipToPadding="false"
             android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:clipChildren="false"
+                android:clipToPadding="false">
 
                 <ImageView
                     android:id="@+id/suw_layout_icon"
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
index 664123d..5fc0d73 100644
--- a/res/layout-land/fingerprint_enroll_finish.xml
+++ b/res/layout-land/fingerprint_enroll_finish.xml
@@ -36,6 +36,8 @@
             android:layout_weight="1"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:clipChildren="false"
+            android:clipToPadding="false"
             android:orientation="vertical">
 
             <TextView
@@ -59,6 +61,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
+                android:clipChildren="false"
+                android:clipToPadding="false"
                 android:orientation="horizontal">
 
                 <Button
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
index 263ce05..00d4cca 100644
--- a/res/layout/app_details.xml
+++ b/res/layout/app_details.xml
@@ -43,36 +43,6 @@
             android:antialias="true"/>
 
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/app_detail_icon"
-            android:paddingStart="24dp"
-            android:paddingEnd="24dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/app_detail_title"
-                style="@style/TextAppearance.EntityHeaderTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:gravity="start"
-                android:paddingTop="8dp"/>
-
-            <TextView
-                android:id="@+id/app_detail_summary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="start"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:textAppearance="@android:style/TextAppearance.Material.Body1"
-                android:textColor="?android:attr/textColorSecondary"/>
-
-        </LinearLayout>
-
-        <LinearLayout
             android:id="@+id/app_detail_links"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -98,40 +68,48 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@id/app_detail_icon"
+            android:layout_toStartOf="@id/app_detail_links"
+            android:paddingStart="24dp"
+            android:paddingEnd="24dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/app_detail_title"
+                style="@style/TextAppearance.EntityHeaderTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="false"
+                android:ellipsize="marquee"
+                android:gravity="start"
+                android:paddingTop="8dp"/>
+
+            <TextView
+                android:id="@+id/install_type"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="start"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textColor="?android:attr/textColorSecondary"/>
+
+            <TextView
+                android:id="@+id/app_detail_summary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="start"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textColor="?android:attr/textColorSecondary"/>
+
+        </LinearLayout>
+
     </RelativeLayout>
 
-    <TextView
-        android:id="@+id/instant_app_developer_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:visibility="gone"/>
-
-    <LinearLayout
-        android:id="@+id/instant_app_maturity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:visibility="gone">
-
-        <ImageView
-            android:id="@+id/instant_app_maturity_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:scaleType="fitXY"/>
-        <TextView
-            android:id="@+id/instant_app_maturity_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/instant_app_monetization"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:visibility="gone"/>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/apps_filter_spinner.xml b/res/layout/apps_filter_spinner.xml
index 3ba7404..3eebbb0 100644
--- a/res/layout/apps_filter_spinner.xml
+++ b/res/layout/apps_filter_spinner.xml
@@ -15,38 +15,32 @@
      limitations under the License.
 -->
 
-<RelativeLayout 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="?android:attr/actionBarSize"
+    android:background="?android:attr/colorAccent"
     android:gravity="center_vertical"
     android:paddingEnd="@dimen/switchbar_subsettings_margin_end"
-    android:theme="?attr/switchBarTheme" >
+    android:orientation="horizontal">
 
     <Spinner
         android:id="@+id/filter_spinner"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_marginStart="64dp"
-        android:layout_marginEnd="70dp"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_centerVertical="true"
-        android:textAlignment="viewStart" />
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:paddingStart="64dp"
+        android:background="@drawable/app_filter_spinner_background"/>
 
     <ImageView
         android:id="@+id/filter_settings"
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="56dp"
         android:layout_height="56dp"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:minHeight="0dp"
-        android:minWidth="0dp"
         android:contentDescription="@string/configure"
         android:scaleType="center"
-        android:src="@drawable/ic_settings_24dp"
-        style="?android:attr/borderlessButtonStyle"
+        android:src="@drawable/ic_settings_24dp_inverse"
         android:visibility="gone" />
 
-
-</RelativeLayout>
+</LinearLayout>
 
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index 4b9f3e5..15fb7db 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -26,6 +26,8 @@
         style="@style/SuwContentFrame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipChildren="false"
+        android:clipToPadding="false"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
@@ -54,6 +56,8 @@
                 android:id="@+id/bottom_container"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:clipChildren="false"
+                android:clipToPadding="false"
                 android:orientation="vertical">
 
             <android.support.v7.widget.RecyclerView
diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml
index c50aa5b..050479b 100644
--- a/res/layout/choose_lock_pattern_common.xml
+++ b/res/layout/choose_lock_pattern_common.xml
@@ -29,6 +29,8 @@
         style="@style/SuwContentFrame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipChildren="false"
+        android:clipToPadding="false"
         android:orientation="vertical">
 
         <!-- takes up all space above button bar at bottom -->
@@ -37,6 +39,8 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:gravity="center"
+            android:clipChildren="false"
+            android:clipToPadding="false"
             android:orientation="vertical">
 
             <TextView android:id="@+id/headerText"
@@ -56,6 +60,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:clipChildren="false"
+                android:clipToPadding="false"
                 android:orientation="horizontal">
 
                 <!-- left : cancel, or re-try -->
diff --git a/res/layout/dashboard_container.xml b/res/layout/dashboard_container.xml
deleted file mode 100644
index f6b81ae..0000000
--- a/res/layout/dashboard_container.xml
+++ /dev/null
@@ -1,21 +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.
--->
-
-<com.android.settings.widget.RtlCompatibleViewPager
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
diff --git a/res/layout/dashboard_container_header.xml b/res/layout/dashboard_container_header.xml
deleted file mode 100644
index 37412e7..0000000
--- a/res/layout/dashboard_container_header.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<com.android.settings.widget.SlidingTabLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/sliding_tabs"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/dashboard_header_margin_start"
-    android:layout_marginEnd="@dimen/dashboard_header_margin_end"/>
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index 3a2ee09..4aa0aa8 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -80,7 +80,7 @@
         settings:neighborMargin="5dip"
         settings:labelSize="60dip"
         settings:labelTemplate="@string/data_usage_sweep_limit"
-        settings:labelColor="#fff4511e"
+        settings:labelColor="?android:attr/colorError"
         settings:safeRegion="4dp" />
 
 </com.android.settings.widget.ChartDataUsageView>
diff --git a/res/layout/encryption_interstitial_header.xml b/res/layout/encryption_interstitial_header.xml
index 9601fa8..b4f6dbb 100644
--- a/res/layout/encryption_interstitial_header.xml
+++ b/res/layout/encryption_interstitial_header.xml
@@ -15,7 +15,9 @@
     limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/encryption_interstitial_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
diff --git a/res/layout/filter_spinner_item.xml b/res/layout/filter_spinner_item.xml
index 68f6f91..ffdd623 100644
--- a/res/layout/filter_spinner_item.xml
+++ b/res/layout/filter_spinner_item.xml
@@ -15,12 +15,14 @@
      limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     style="?android:attr/spinnerItemStyle"
-    android:singleLine="true"
+    android:maxLines="1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
+    android:textColor="?android:attr/colorForegroundInverse"
     android:textAppearance="@style/TextAppearance.Switch"
-    android:textAlignment="inherit"/>
+    android:textAlignment="inherit" />
diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml
index bcbbadf..99c96ad 100644
--- a/res/layout/fingerprint_enroll_finish_base.xml
+++ b/res/layout/fingerprint_enroll_finish_base.xml
@@ -75,6 +75,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
+            android:clipChildren="false"
+            android:clipToPadding="false"
             android:orientation="horizontal">
 
             <Button
diff --git a/res/layout/fingerprint_enroll_introduction.xml b/res/layout/fingerprint_enroll_introduction.xml
index ccd1f62..6d20756 100644
--- a/res/layout/fingerprint_enroll_introduction.xml
+++ b/res/layout/fingerprint_enroll_introduction.xml
@@ -26,6 +26,8 @@
         style="@style/SuwContentFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
         android:orientation="vertical">
 
         <com.android.setupwizardlib.view.RichTextView
@@ -44,6 +46,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:clipChildren="false"
+            android:clipToPadding="false"
             android:orientation="horizontal">
 
             <Button
diff --git a/res/layout/preference_dropdown_material_settings.xml b/res/layout/preference_dropdown_material_settings.xml
index ee4051d..22f98b6 100644
--- a/res/layout/preference_dropdown_material_settings.xml
+++ b/res/layout/preference_dropdown_material_settings.xml
@@ -18,72 +18,18 @@
 
 <!-- Based off frameworks/base/core/res/res/layout/preference_dropdown_material.xml
      except that icon space in this layout is always reserved -->
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground"
-    android:clipToPadding="false">
+    android:layout_height="wrap_content">
 
     <Spinner
         android:id="@+id/spinner"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/preference_no_icon_padding_start"
         android:visibility="invisible" />
 
-    <LinearLayout
-        android:id="@+id/icon_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="60dp"
-        android:gravity="start|center_vertical"
-        android:orientation="horizontal"
-        android:paddingEnd="12dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp">
-        <android.support.v7.internal.widget.PreferenceImageView
-            android:id="@android:id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxWidth="48dp"
-            android:maxHeight="48dp" />
-    </LinearLayout>
+    <include layout="@layout/preference_material_settings"/>
 
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp">
-
-        <TextView android:id="@android:id/title"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:textAppearance="@style/Preference_TextAppearanceMaterialSubhead"
-                  android:ellipsize="marquee" />
-
-        <TextView android:id="@android:id/summary"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_below="@android:id/title"
-                  android:layout_alignLeft="@android:id/title"
-                  android:textAppearance="?android:attr/textAppearanceSmall"
-                  android:textColor="?android:attr/textColorSecondary"
-                  android:maxLines="10" />
-
-    </RelativeLayout>
-
-    <!-- Preference should place its actual preference widget here. -->
-    <LinearLayout android:id="@android:id/widget_frame"
-                  android:layout_width="wrap_content"
-                  android:layout_height="match_parent"
-                  android:gravity="end|center_vertical"
-                  android:paddingLeft="16dp"
-                  android:orientation="vertical" />
-
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index d1ce0dc..e48f20f 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -28,6 +28,8 @@
         style="@style/SuwContentFrame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipChildren="false"
+        android:clipToPadding="false"
         android:orientation="vertical">
 
         <TextView
diff --git a/res/layout/restricted_preference_dropdown.xml b/res/layout/restricted_preference_dropdown.xml
index fd0d07d..c93a007 100644
--- a/res/layout/restricted_preference_dropdown.xml
+++ b/res/layout/restricted_preference_dropdown.xml
@@ -23,7 +23,8 @@
             class="com.android.settings.notification.RestrictedDropDownPreference$ReselectionSpinner"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="invisible" />
+            android:visibility="invisible"
+            android:layout_marginStart="@dimen/preference_no_icon_padding_start"/>
 
     <include layout="@layout/preference_material_settings" />
 
diff --git a/res/layout/zen_rule_name.xml b/res/layout/zen_rule_name.xml
index 1112ce2..bdf1f9f 100755
--- a/res/layout/zen_rule_name.xml
+++ b/res/layout/zen_rule_name.xml
@@ -40,7 +40,7 @@
         android:singleLine="true"
         android:layout_marginLeft="26dp"
         android:layout_marginRight="26dp"
-        android:textColor="@color/zen_rule_name_warning"
+        android:textColor="?android:attr/colorError"
         android:text="@string/zen_mode_rule_name_warning" />
 
 </LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 07725d8..2260e01 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Ligging"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Rekeninge"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Sekuriteit en skermslot"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripsie en eiebewyse"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stel my ligging, skermontsluiting, eiebewysbergingslot"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Wagwoorde"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privaatheid"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Gedeaktiveer deur administrateur"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Sekuriteitstatus"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Ligging, vingerafdruk"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Dieselfde as toestelskermslot"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Bestuur programme"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Bestuur en verwyder geïnstalleerde programme"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Programinligting"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Bestuur programme, stel kits-loodskortpaaie op"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Program-instellings"</string>
     <string name="install_applications" msgid="4872012136210802181">"Onbekende bronne"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Bestuur spasie"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Kies filteropsies"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Gedeaktiveer"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Alle programme"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Gedeaktiveerde programme"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Afgelaai"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Loop tans"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-berging"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Op SD-kaart"</string>
     <string name="disabled" msgid="9206776641295849915">"Gedeaktiveer"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nie vir hierdie gebruiker geïnstalleer nie"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Geïnstalleer"</string>
     <string name="no_applications" msgid="7336588977497084921">"Geen programme nie"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interne berging"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"interne berging"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Stel invoer metodes op"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Instellings"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Instellings"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktiewe invoermetodes"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Gebruik stelseltale"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> instellings"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Kies aktiewe invoermetodes"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Skermsleutelbord-instellings"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Dateer outomaties skermvergroting op"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Dateer skermvergroting op tydens programverwisseling"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Kragknoppie beëindig oproep"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Sê wagwoorde hardop"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Groot muiswyser"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono-oudio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombineer kanale wanneer oudio gespeel word"</string>
@@ -1833,7 +1829,11 @@
     <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> oor"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> tot gelaai"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Gebruik sedert battery laas volgelaai is"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Skermgebruik"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Skermverbruik"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Skandering van mobiele netwerk"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Programgebruik sedert battery laas volgelaai is"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Toestelgebruik sedert battery laas volgelaai is"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batterygebruik sedert uitgeprop"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batterygebruik sedert terugstelling"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> op battery"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oorberekende kragverbruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Vir %1$s gebruik"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s van algehele batterykrag"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Gebruiksontleding sedert battery laas volgelaai is"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Geskatte tyd oor"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tyd om vol te laai"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Skatting kan op grond van gebruik verander"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedert uitgeprop is"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedert laas uitgeprop vir <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Altyd-aan is onaktief"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nie gesteun deur hierdie program nie"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Laat net verbindings deur VPN toe"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Vereis VPN-verbinding?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Snelsluit is aktief"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Snelsluit is onaktief"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Kies \'n VPN-profiel om altyd aan gekoppel te bly. Netwerkverkeer sal net toegelaat word wanneer verbind aan hierdie VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Beperkte profiele kan nie rekeninge byvoeg nie"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Vee <xliff:g id="USER_NAME">%1$s</xliff:g> van hierdie toestel af uit"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Sluitskerminstellings"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Voeg gebruikers van die sluitskerm af by"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nuwe gebruiker"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nuwe profiel"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Verwyder jouself?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Skakel foonoproepe en SMS aan?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Oproep- en SMS-geskiedenis sal met hierdie gebruiker gedeel word."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Noodinligting"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Inligting oor <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Inligting en kontakte vir <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Laat programme en inhoud toe"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programme met beperkings"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Brei instellings vir program uit"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Wys %d versteekte items</item>
       <item quantity="one">Wys %d versteekte item</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Netwerk en internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, sellulêr, datagebruik, warmkol"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Netwerk en internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobiel, datagebruik, warmkol"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Gekoppelde toestelle"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, uitsaai"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programme en kennisgewings"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultate"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, netwerkverbinding"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"sms, teksboodskappe, boodskappe, boodskappe"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"sellulêr, selfoondiensverskaffer, draadloos, data, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"sellulêr, mobiel, selfoondiensverskaffer, draadloos, data, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, oproep, bel tans"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanseerder"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skerm, raakskerm"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alarmsein"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreer"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Aanskakel-klanke"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Moenie steur nie-voorkeure"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"\'Net prioriteit\' laat toe"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Outomatiese reëls"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Stel Moenie-steur-nie-skedule"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Verstek-werkkennisgewingtoon"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Werkwekker se verstekluitoon"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Dieselfde as persoonlike profiel"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Vervang werkprofielklanke?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Gebruik persoonlike profiel se klanke?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Vervang"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Jou huidige werkprofielklanke sal vervang word met jou persoonlike profiel se klanke"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Jou persoonlike profiel se klanke sal gebruik word pleks van jou huidige werkprofiel se klanke"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Luitone"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Ander klanke en vibrasies"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Kennisgewingvoorkeure"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Geen toestemmings is verleen nie"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Geen toestemmings is versoek nie"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle programme"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Geaktiveer"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Geïnstalleerde programme"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Kitsprogramme"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Persoonlik"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Werk"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Geblokkeer"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Met domein-URL\'e"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Gevorderd"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Stel programme op"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende program"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Verstek vir werk"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Bystand en steminvoer"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Bystandprogram"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Geen"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Kies bystandprogram"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Maak <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> jou assistent?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Die assistent sal inligting oor programme wat tans op jou stelsel gebruik word, kan lees, insluitend inligting wat op jou skerm sigbaar is of toeganklik is binne die programme."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Stem in"</string>
@@ -2959,6 +2958,8 @@
     <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">"Batteryoptimalisering"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Opletberigte oor gebruik"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Wys alle programme"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Versteek ekstra programme"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nie geoptimaliseer nie"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nie geoptimeer nie"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimaliseer batterygebruik"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Koel kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gebruik koeler skermkleure"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Skakel skerm af om kleur toe te pas"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Herselflaai toestel om telefonie-monitorverandering toe te pas"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Outomatiese stelselopdaterings"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Saamgebinde HAL\'s (vereis herselflaai)"</string>
     <string name="usage" msgid="2977875522080448986">"Gebruik"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Swiep na onder op die vingerafdruksensor aan die agterkant van jou foon om jou kennisgewings na te gaan."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Swiep na onder op die vingerafdruksensor aan die agterkant van jou tablet om jou kennisgewings na te gaan."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Swiep na onder op die vingerafdruksensor aan die agterkant van jou toestel om jou kennisgewings na te gaan."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Bystandgebaar"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Aan"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Af"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Selflaaiprogram is reeds ontsluit"</string>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globale HTTP-instaanbediener is gestel"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Die administrateur kan die toestel sluit en die wagwoord terugstel"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Die administrateur kan alle toesteldata uitvee"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administrateur het maksimum wagwoordpogings gestel na <xliff:g id="COUNT_1">%d</xliff:g> voordat alle toesteldata uitgevee word</item>
+      <item quantity="one">Administrateur het maksimum wagwoordpogings gestel na <xliff:g id="COUNT_0">%d</xliff:g> voordat alle toesteldata uitgevee word</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administrateur het maksimum wagwoordpogings gestel na <xliff:g id="COUNT_1">%d</xliff:g> voordat werkprofieldata uitgevee word</item>
+      <item quantity="one">Administrateur het maksimum wagwoordpogings gestel na <xliff:g id="COUNT_0">%d</xliff:g> voordat werkprofieldata uitgevee word</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Hierdie toestel word bestuur."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Hierdie toestel word deur <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> bestuur."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Kom meer te wete"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto\'s en video\'s"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musiek en oudio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Speletjies"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ander programme"</string>
     <string name="storage_files" msgid="8581083146777364063">"Lêers"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Bergingbestuurder: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Af"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aan"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Speletjies"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiolêers"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musiek"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(gedeïnstalleer vir gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(gedeaktiveer vir gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Outovulprogram"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 082ffb8..0cbeb4a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"አካባቢ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"መለያዎች"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"ደህንነት እና የማያ ገጽ መቆለፊያ"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ምስጠራ እና ምስክርነቶች"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"የእኔን ስፍራ፣ማያ ክፈት፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"የይለፍ ቃሎች"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"ግላዊነት"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"በአስተዳዳሪ የተሰናከለ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"የደህንነት ሁኔታ"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"አካባቢ፣ የጣት አሻራ"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ከመሣሪያ ማያ ገጽ መቆለፊያ ጋር ተመሳሳይ"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"መተግበሪያዎች አስተዳድር"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"የተጫኑ መተግበራያዎች አስተዳድር እና አስወግድ"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"የመተግበሪያ መረጃ"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"መተግበሪያዎች አደራጅ፣ በፍጥነት ማስነሻ አቋራጮች አዘጋጅ"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"መተግበሪያ ቅንብሮች"</string>
     <string name="install_applications" msgid="4872012136210802181">"ያልታወቁ ምንጮች"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"ባዶ ቦታ አደራጅ"</string>
     <string name="filter" msgid="2018011724373033887">"አጣራ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"የማጣሪያ አማራጮችን ምረጥ"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"ሁሉም"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"ተሰናክሏል"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"ሁሉም መተግበሪያዎች"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"የተሰናከሉ መተግበሪያዎች"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ወርዷል"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"አሂድ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"የUSB  ማከማቻ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"በSD ካርድ ላይ"</string>
     <string name="disabled" msgid="9206776641295849915">"ቦዝኗል"</string>
     <string name="not_installed" msgid="2797554494953450291">"ለዚህ ተጠቃሚ አልተጫነም"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"ተጭኗል"</string>
     <string name="no_applications" msgid="7336588977497084921">"ምንም መተግበሪያዎች የሉም::"</string>
     <string name="internal_storage" msgid="1584700623164275282">"የውስጥ ማከማቻ"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ውስጣዊ ማከማቻ"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"የግቤት ስልቶችን አዘጋጅ"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"ቅንብሮች"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"ቅንብሮች"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"የገባሪ ግቤት ዘዴ"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"የሥርዓት ቋንቋዎችን ይጠቀሙ"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>ቅንብሮች"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"ንቁ የሆኑ ግቤት ስልቶች ምረጥ"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"በማያ ላይ ቁልፍሰሌዳ ቅንብሮች"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"ማጉላትን በራስ-አዘምን"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"የመተግበሪያ ሽግግሮች ላይ ማጉላትን አዘምን"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"የኃይል አዘራር ጥሪውን ይዘገዋል"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"የይለፍ ቃላትን ተናገር"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"ትልቅ የመዳፊት ጠቋሚ"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"ሞኖ ኦዲዮ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ኦዲዮ ሲያጫውቱ ሰርጦችን ያጣምሩ"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"የተሞላው ሃይል በሙሉ እስኪያልቅ ድረስ ይጠቀሙ"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"የማያ ገጽ አጠቃቀም"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"የማያ ገጽ ፍጆታ"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"የተንቀሳቃሽ ስልክ አውታረ መረብ ቅኝት"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"ሙሉ ኃይል ከተሞላበት የመጨረሻው ጊዜ ጀምሮ ያለው የመተግበሪያ አጠቃቀም"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"ሙሉ ኃይል ከተሞላበት የመጨረሻው ጊዜ ጀምሮ ያለው የመሣሪያ አጠቃቀም"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ከተነቀለ ጀምሮ የባትሪ ጥቅም"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ዳግም ከተጀመረጀምሮ የባትሪ ጥቅም"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> ባትሪ ላይ"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ከመጠን በላይ የተቆጠረ የሃይል አጠቃቀም"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"ለ%1$s ጥቅም ላይ የሚውል"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"ከአጠቃላዩ ባትሪ %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"ሙሉ ኃይል ከተሞላበት የመጨረሻው ጊዜ ጀምሮ ያለው የአጠቃቀም ትንተና"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"የተገመተው ቀሪ ጊዜ"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"ሙሉ ኃይል ለመሙላት ቀሪ ጊዜ"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"ግምት በአጠቃቀም ላይ መሠረት ሊለወጥ ይችላል"</string>
     <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>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"ሁልጊዜ-የበራ ቦዝኗል"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"በዚህ መተግበሪያ አይደገፍም"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Only allow connections through VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"የVPN ግንኙነት ይጠይቅ?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"አሳሪ ገቢር ነው"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"አሳሪ ቦዝኗል"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ሁልጊዜ እንደተገናኙ የሚቆዩበት የVPN መገለጫ ይምረጡ። ከዚህ VPN ጋር ሲገናኝ ብቻ ነው የአውታረ መረብ ትራፊክ የሚፈቀደው።"</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"የተገደቡ መገለጫዎች መለያዎችን ማከል አይችሉም"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g>ን ከዚህ መሣሪያ ሰርዝ"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"የገጽ ቆልፍ ቅንብሮች"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"ከማያ ገጽ ቁልፍ ሆነው ተጠቃሚዎችን ያክሉ"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"አዲስ ተጠቃሚ"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"አዲስ መገለጫ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"እራስዎን ይሰርዙ?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"የስልክ ጥሪዎች እና ኤስኤምኤስ ይብሩ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"የጥሪ እና የኤስኤምኤስ ታሪክ ለዚህ ተጠቃሚ ይጋራል።"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"የአስቸኳይ ጊዜ መረጃ"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"የ<xliff:g id="USER_NAME">%1$s</xliff:g> መረጃ"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"የ<xliff:g id="USER_NAME">%1$s</xliff:g> መረጃ እና እውቂያዎች"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"መተግበሪያዎችን እና ይዘትን ይፍቀዱ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ገደቦች ያሏቸው መተግበሪያዎች"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"የመተግበሪያዎች ቅንብሮችን ዘርጋ"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="one">%d የተደበቁ ንጥሎችን አሳይ</item>
       <item quantity="other">%d የተደበቁ ንጥሎችን አሳይ</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"አውታረ መረብ እና በይነመረብ"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi፣ የተንቀሳቃሽ ስልክ፣ የውሂብ አጠቃቀም፣ የመገናኛ ነጥብ"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"አውታረ መረብ እና በይነመረብ"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi፣ ሞባይል፣ የውሂብ አጠቃቀም፣ የመገናኛ ነጥብ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"የተገናኙ መሣሪያዎች"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"ብሉቱዝ፣ NFC፣ cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"መተግበሪያዎች እና ማሳወቂያዎች"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"ውጤቶች"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi፣ wi-fi፣ የአውታረ መረብ ግንኙነት"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"የጽሑፍ መልዕክት፣ ጽሑፍ መላክ፣ መልዕክቶች፣ መልዕክት አላላክ"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"የተንቀሳቃሽ ስልክ፣ የተንቀሳቃሽ ስልክ አገልግሎት አቅራቢ፣ ገመድ-አልባ፣ ውሂብ፣ 4ጂ፣ 3ጂ፣ 2ጂ፣ lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"የተንቀሳቃሽ ስልክ፣ የተንቀሳቃሽ ስልክ አገልግሎት አቅራቢ፣ ገመድ-አልባ፣ ውሂብ፣ 4ጂ፣ 3ጂ፣ 2ጂ፣ lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi፣ wi-fi፣ ጥሪ፣ መደወል"</string>
     <string name="keywords_home" msgid="3626170808219458848">"አስጀማሪ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ማያ ገጽ፣ ማያንካ"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"ማንቂያ"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ንዘር"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ድምፆችን ያብሩ"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"የአትረብሽ ምርጫዎች"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ቅድሚያ ተሰጪ ብቻ ይፈቅዳል"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ራስ-ሰር ደንቦች"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"የአትረብሽ መርሐግብር ያዘጋጁ"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ነባሪ የስራ ማሳወቂያ ቅላጼ"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ነባሪ የስራ ማንቂያ ጥሪ ቅላጼ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ከግል መገለጫ ጋር ተመሳሳይ"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"በመገለጫ ድምጾች ይተኩ?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"የግል መገለጫ ድምፆችን ይጠቀሙ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ተካ"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"የአሁኑ የስራ መገለጫዎ ድምጾች በግል መገለጫ ድምጾችዎ ይተካሉ"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"የእርስዎ የግል መገለጫ ድምፆች አሁን ባሉት የሥራ መገለጫ ድምፆች ምትክ ጥቅም ላይ ይውላሉ"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"የስልክ ጥሪ ድምፆች"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ሌሎች ድምጾች እና ንዝረቶች"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"የማሳወቂያ ምርጫዎች"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ምንም ፈቃዶች አልተሰጡም"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"ምንም ፈቃዶች አልተጠየቁም"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ሁሉም መተግበሪያዎች"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"የነቁ"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"የተጫኑ መተግበሪያዎች"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ቅጽበታዊ መተግበሪያዎች"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"የግል"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ስራ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"የታገዱ"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ከጎራ ዩአርኤሎች ጋር"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"የላቀ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"መተግበሪያዎች ያዋቅሩ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ያልታወቀ መተግበሪያ"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"ለሥራ ነባሪ"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"እገዛ እና ድምጽ ግቤት"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"የእገዛ መተግበሪያ"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"ምንም"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"የረዳት መተግበሪያን ይምረጡ"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> የእርስዎ ረዳት ይደረግ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"ረዳቱ በእርስዎ ስርዓት ላይ በአገልግሎት ላይ ስለሚውሉ መተግበሪያዎች መረጃን ማንበብ ይችላል፣ ይህም በእርስዎ ማያ ገጽ ላይ የሚታይ ወይም በመተግበሪያዎች ውስጥ የሚደረስበት መረጃን ይጨምራል።"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"እስማማለሁ"</string>
@@ -2959,6 +2958,8 @@
     <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">"ባትሪን ማትባት"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"የአጠቃቀም ማንቂያዎች"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"ሁሉንም መተግበሪያዎች አሳይ"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"ተጨማሪ መተግበሪያዎችን ደብቅ"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"አልተባም"</string>
     <string name="high_power_on" msgid="6216293998227583810">"አልተባም"</string>
     <string name="high_power_off" msgid="3393904131961263278">"የባትሪ አጠቃቀምን አትባ"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ቀዝቀዝ ያለ የቀለም ሙቀት"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ቀዝቀዝ ያሉ የማሳያ ቀለሞችን ይጠቀሙ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"የቀለም ለውጥን ለመተግበር ማያ ገጹን ያጥፉት"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"የቴሌፎኒ መከታተያ ለውጥን ለመተግበር መሣሪያውን ዳግም ያስነሱት"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ራስ-ሰር የስርዓት ዝማኔዎች"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (ዳግም ማስነሳት ያስፈልገዋል)"</string>
     <string name="usage" msgid="2977875522080448986">"አጠቃቀም"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"የእጅ ውዝዋዜ ረዳት"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ሁለንተናዊ የHTTP ወኪል ተዘጋጅቷል"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"አስተዳዳሪ መሣሪያን መቆለፍና የይለፍ ቃል ዳግም ማስጀመር ይችላል"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"አስተዳዳሪ ሁሉንም የመሣሪያ ውሂብ መሰረዝ ይችላል"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <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="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"ይህ መሣሪያ የሚተዳደር ነው።"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ይህ መሣሪያ በ<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> የሚተዳደር ነው።"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"የበለጠ ለመረዳት"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ፎቶዎች እና ቪዲዮዎች"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"ሙዚቃ እና ኦዲዮ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ጨዋታዎች"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ሌሎች መተግበሪያዎች"</string>
     <string name="storage_files" msgid="8581083146777364063">"ፋይሎች"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"የማከማቻ አስተዳዳሪ፦ <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ጠፍቷል"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"በርቷል"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ጨዋታዎች"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"የኦዲዮ ፋይሎች"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"ሙዚቃ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ለተጠቃሚ <xliff:g id="USER">%s</xliff:g> ተራግፏል)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ለተጠቃሚ <xliff:g id="USER">%s</xliff:g> ተሰናክሏል)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"የራስ-ሙላ መተግበሪያ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f5715dc..6aeecc7 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -338,9 +338,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"الموقع"</string>
     <string name="account_settings_title" msgid="626177544686329806">"الحسابات"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"الأمان وقفل الشاشة"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"التشفير وبيانات الاعتماد"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"‏تعيين موقعي، إلغاء تأمين الشاشة، تأمين شريحة SIM، تأمين تخزين الاعتماد"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين تخزين الاعتماد"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"كلمات المرور"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"الخصوصية"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"معطّل بواسطة المشرف"</string>
     <string name="security_status_title" msgid="5848766673665944640">"حالة الأمان"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"موقع، بصمة إصبع"</string>
@@ -1466,8 +1467,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"نفس قفل شاشة الجهاز"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"إدارة التطبيقات"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"إدارة التطبيقات المثبتة وإزالتها"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"معلومات التطبيق"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"إدارة التطبيقات، إعداد اختصارات التشغيل السريع"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"إعدادات التطبيق"</string>
     <string name="install_applications" msgid="4872012136210802181">"مصادر غير معروفة"</string>
@@ -1531,16 +1531,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"إدارة المساحة"</string>
     <string name="filter" msgid="2018011724373033887">"تصفية"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"اختر خيارات التصفية"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"الكل"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"معطلة"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"جميع التطبيقات"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"التطبيقات المعطلة"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"تم التنزيل"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"قيد التشغيل"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏وحدة تخزين USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏في بطاقة SD"</string>
     <string name="disabled" msgid="9206776641295849915">"معطل"</string>
     <string name="not_installed" msgid="2797554494953450291">"لم يتم التثبيت لهذا المستخدم"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"مثبّت"</string>
     <string name="no_applications" msgid="7336588977497084921">"ليست هناك أية تطبيقات."</string>
     <string name="internal_storage" msgid="1584700623164275282">"وحدة التخزين الداخلية"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"وحدة تخزين داخلية"</string>
@@ -1718,8 +1717,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"إعداد أسلوب الإدخال"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"الإعدادات"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"الإعدادات"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"طرق الإدخال النشطة"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"استخدام لغات النظام"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"إعدادات <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"اختيار أساليب الإدخال النشطة"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"إعدادات لوحة المفاتيح على الشاشة"</string>
@@ -1756,14 +1753,13 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"الشاشة"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"التسميات التوضيحية"</string>
     <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"إيماءة التكبير"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"انقر ۳ مرات للتكبير."</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"انقر ٣ مرات للتكبير."</string>
     <string name="accessibility_screen_magnification_summary" msgid="7798920976388197258"><b>"للتكبير"</b>"، انقر على الشاشة بسرعة 3 مرات بإصبع واحد.\n"<ul><li>"اسحب إصبعين أو أكثر للتمرير"</li>\n<li>"قارب بين إصبعين أو أكثر معًا أو باعد بينهما لضبط مستوى التكبير / التصغير"</li></ul>\n\n<b>"للتكبير بشكل مؤقت"</b>"، انقر بسرعة على الشاشة 3 مرات واستمر بالضغط بإصبعك بعد النقرة الثالثة.\n"<ul><li>"اسحب إصبعك للتنقل على الشاشة"</li>\n<li>"ارفع إصبعك للتصغير"</li></ul>\n\n"لا يمكنك استخدام التكبير عند استخدام لوحة المفاتيح وشريط التنقل."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"اختصارات تسهيل الدخول"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"نص ذو درجة تباين عالية"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"التحديث التلقائي لتكبير الشاشة"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"تحديث تكبير الشاشة أثناء تنقلات التطبيق"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"زر الطاقة ينهي الاتصال"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"نطق كلمات المرور"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"مؤشر الماوس الكبير"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"صوت أحادي"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"الجمع بين القنوات عند تشغيل الصوت"</string>
@@ -1901,7 +1897,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"الاستخدام منذ آخر شحن كامل"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"استخدام الشاشة"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"استهلاك الشاشة"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"البحث عن شبكات الجوال"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"استخدام التطبيق منذ آخر عملية شحن بالكامل"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"استخدام الجهاز منذ آخر عملية شحن بالكامل"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"استخدام البطارية عند فصل الطاقة"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"استخدام البطارية منذ إعادة التعيين"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> على البطارية"</string>
@@ -1991,8 +1991,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"استخدام زائد عن الحد للطاقة"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> مللي أمبير في الساعة"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"‏مستخدمة لمدة %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"‏%1$s من إجمالي شحن البطارية"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"تحليل الاستخدام منذ آخر شحن كامل"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"الوقت التقديري المتبقي"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"الوقت المتبقي لشحن الجهاز بالكامل"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"قد يتغير الوقت التقديري بناءً على الاستخدام"</string>
     <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>
@@ -2033,7 +2035,7 @@
     <string name="mem_use_zram_type" msgid="9087217476795358232">"‏تبديل ZRam"</string>
     <string name="mem_use_free_type" msgid="717708548454880840">"مجانًا"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"الإجمالي"</string>
-    <string name="menu_duration_3h" msgid="4714866438374738385">"۳ ساعات"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"٣ ساعات"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"٦ ساعات"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"۱۲ ساعة"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"يوم واحد"</string>
@@ -2384,6 +2386,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"اتصال غير نشط دائمًا"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"عدم التوافق مع هذا التطبيق"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"‏السماح بالاتصالات من خلال الشبكة الظاهرية الخاصة (VPN) فقط"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"أيتطلب الأمر اتصالاً بشبكة ظاهرية خاصة؟"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"الإغلاق نشط"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"الإغلاق غير نشط"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‏حدد ملفًا شخصيًا للشبكة الظاهرية الخاصة (VPN) للاتصال الدائم بها. لن يتم السماح بحركة مرور الشبكة إلا عند الاتصال بهذه الشبكة الظاهرية الخاصة."</string>
@@ -2485,8 +2488,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"لا يمكن للملفات الشخصية إضافة حسابات"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"حذف <xliff:g id="USER_NAME">%1$s</xliff:g> من هذا الجهاز"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"إعدادات شاشة التأمين"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"إضافة المستخدمين من شاشة التأمين"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"مستخدم جديد"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"ملف شخصي جديد"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"هل تريد حذف نفسك؟"</string>
@@ -2514,7 +2516,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"‏تشغيل المكالمات الهاتفية والرسائل القصيرة SMS؟"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"‏ستتم مشاركة سجل المكالمات والرسائل القصيرة SMS مع هذا المستخدم."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"معلومات الطوارئ"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"معلومات حول <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"المعلومات وجهات الاتصال للمستخدم <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"السماح بالتطبيقات والمحتوى"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"التطبيقات ذات القيود"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسيع إعدادات التطبيق"</string>
@@ -2638,8 +2640,8 @@
       <item quantity="other">‏عرض %d عنصر مخفي</item>
       <item quantity="one">‏عرض %d عنصر مخفي</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"الشبكة والإنترنت"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"‏Wi-Fi، شبكة جوّال، استخدام بيانات، نقطة اتصال"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"الشبكة والإنترنت"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"‏Wi-Fi، جوّال، استخدام بيانات، نقطة اتصال"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"الأجهزة المرتبطة"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"‏بلوتوث، NFC، إرسال"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"التطبيقات والإشعارات"</string>
@@ -2655,7 +2657,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"النتائج"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"‏اتصال شبكة واي فاي wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"رسالة نصية، إرسال رسالة، رسائل، مراسلة"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"‏خلوي، مشغل شبكة جوال، لاسلكي، بيانات، جيل رابع، جيل ثالث، جيل ثاني، lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"‏خلوي، جوّال، مشغل شبكة جوال، لاسلكي، بيانات، جيل رابع، جيل ثالث، جيل ثاني، lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"‏اتصال، مكالمة، واي فاي، wifi"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"شاشة، شاشة تعمل باللمس"</string>
@@ -2731,8 +2733,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"تنبيه"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"اهتزاز"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"أصوات تشغيل الجهاز"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"تفضيلات \"الرجاء عدم الإزعاج\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"السماح بذات الأولوية فقط"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"القواعد التلقائية"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"تعيين جدول زمني للرجاء عدم الإزعاج"</string>
@@ -2749,9 +2750,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"نغمة إشعار العمل الافتراضية"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"نغمة رنين منبه العمل الافتراضية"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"مثل الملف الشخصي"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"أتستبدل أصوات ملف العمل؟"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"هل تريد استخدام أصوات الملف الشخصي؟"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"استبدال"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"سيتم استبدال الأصوات الحالية للملف الشخصي للعمل بأصوات ملفك الشخصي على حسابك الشخصي."</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"سيتم استخدام أصوات ملفك الشخصي بدلاً من الأصوات الحالية للملف الشخصي للعمل"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"نغمات الرنين"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"الأصوات والاهتزازات الأخرى"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"تفضيلات الإشعارات"</string>
@@ -3011,11 +3012,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"لم يتم منح أي أذونات"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"لم يتم طلب أي أذونات"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"جميع التطبيقات"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"ممكّن"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"التطبيقات المثبَّتة"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"التطبيقات الفورية"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"شخصي"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"العمل"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"محظور"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"‏مع عناوين URL للنطاقات"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"متقدمة"</string>
     <string name="configure_apps" msgid="6685680790825882528">"تهيئة التطبيقات"</string>
     <string name="unknown_app" msgid="5275921288718717656">"تطبيق غير معروف"</string>
@@ -3044,8 +3045,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"التطبيقات الافتراضية للعمل"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"المساعد والإدخال الصوتي"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"تطبيق المساعد"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"بدون"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"اختيار التطبيق المساعد"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"هل تريد جعل <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> تطبيقك المساعد؟"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"سيتمكن تطبيق المساعد من قراءة المعلومات عن التطبيقات قيد الاستخدام على نظامك، بما في ذلك المعلومات المرئية على شاشتك أو التي يمكن الوصول إليها داخل التطبيقات."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"أوافق"</string>
@@ -3075,6 +3074,8 @@
     <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">"تحسين البطارية"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"تنبيهات الاستخدام"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"إظهار جميع التطبيقات"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"إخفاء التطبيقات الإضافية"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"بدون تحسين"</string>
     <string name="high_power_on" msgid="6216293998227583810">"بدون تحسين"</string>
     <string name="high_power_off" msgid="3393904131961263278">"يحسِّن من استخدام البطارية"</string>
@@ -3122,8 +3123,8 @@
     <string name="memory_usage" msgid="1781358557214390033">"استخدام الذاكرة"</string>
     <string name="app_list_memory_use" msgid="6987417883876419338">"استخدام التطبيق"</string>
     <string name="memory_details" msgid="5943436005716991782">"التفاصيل"</string>
-    <string name="memory_use_summary" msgid="5608257211903075754">"متوسط الذاكرة المستخدمة خلال آخر ۳ ساعات: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="no_memory_use_summary" msgid="2016900536806235588">"لم يتم استخدام الذاكرة خلال آخر ۳ ساعات"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"متوسط الذاكرة المستخدمة خلال آخر ٣ ساعات: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"لم يتم استخدام الذاكرة خلال آخر ٣ ساعات"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"الترتيب بحسب متوسط الاستخدام"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"الترتيب بحسب الاستخدام الأقصى"</string>
     <string name="memory_performance" msgid="5661005192284103281">"الأداء"</string>
@@ -3263,6 +3264,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"درجة حرارة لون رائعة"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استخدم ألوان أكثر روعة للشاشة"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"لتطبيق التغيير في اللون، أوقف الشاشة."</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"لتطبيق التغيير الذي تم إجراؤه على خدمة مراقبة الاتصالات الهاتفية، يُرجى إعادة تشغيل الجهاز"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"تحديثات النظام التلقائية"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"‏دمج طبقات تجريد اختلافات الأجهزة \"HALs\" (يتطلب إعادة التشغيل)"</string>
     <string name="usage" msgid="2977875522080448986">"الاستخدام"</string>
@@ -3456,6 +3458,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"إيماءة المساعدة"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3541,12 +3545,30 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏تم تعيين الخادم الوكيل HTTP العام"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"يمكن للمشرف قفل الجهاز وإعادة تعيين كلمة المرور"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"يمكن للمشرف حذف جميع بيانات الجهاز"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="zero">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولة فقط قبل حذف كل بيانات الجهاز</item>
+      <item quantity="two">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على محاولتين (<xliff:g id="COUNT_1">%d</xliff:g>) فقط قبل حذف كل بيانات الجهاز</item>
+      <item quantity="few">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولات فقط قبل حذف كل بيانات الجهاز</item>
+      <item quantity="many">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <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_0">%d</xliff:g>) فقط قبل حذف كل بيانات الجهاز</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="zero">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولة فقط قبل حذف بيانات الملف الشخصي للعمل</item>
+      <item quantity="two">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على محاولتين <xliff:g id="COUNT_1">%d</xliff:g> فقط قبل حذف بيانات الملف الشخصي للعمل</item>
+      <item quantity="few">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <xliff:g id="COUNT_1">%d</xliff:g> محاولات فقط قبل حذف بيانات الملف الشخصي للعمل</item>
+      <item quantity="many">ضبط المشرف الحد الأقصى لعدد محاولات إدخال كلمة المرور على <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_0">%d</xliff:g>) فقط قبل حذف بيانات الملف الشخصي للعمل</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"تتم إدارة هذا الجهاز."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"تتم إدارة هذا الجهاز بواسطة <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"مزيد من المعلومات"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"الصور ومقاطع الفيديو"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"الموسيقى والصوت"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"الألعاب"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"تطبيقات أخرى"</string>
     <string name="storage_files" msgid="8581083146777364063">"الملفات"</string>
@@ -3557,9 +3579,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"إدارة سعة التخزين: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"إيقاف"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"تشغيل"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"الألعاب"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ملفات صوتية"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"الموسيقى"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(تم إلغاء التثبيت للمستخدم <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(تم التعطيل للمستخدم <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"تطبيق الملء التلقائي"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index a8ebb78..858517e 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Yer"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hesablar"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Təhlükəsizlik və ekran kilidi"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Şifrələmə və kredensiallar"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Məkanım\'ı, ekranı kiliddən çıxarmanı, hesab yaddaş kilidini ayarlayın,"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Məkanım\'ı, ekranı kiliddən çıxarmanı, hesab yaddaş kilidini ayarlayın,"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Parollar"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Məxfilik"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Administrator tərəfindən deaktiv edildi"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Təhlükəsizlik statusu"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Məkan, barmaq izi"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fi seçin"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi yandırılır..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi söndürün..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Bütün şəbəkələrə baxın"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Xəta"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Bu ölkədə mövcud deyil 5 GHz band"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Uçuş rejimində"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth birləşmə"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Birləşmə"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Hotspot və Qoşulma"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot aktivdir, birləşdirilir"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Hotspot aktivdir"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Birləşmə"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Data Qənaəti aktiv olduqda daşınan hotspotları birləşdirmək və ya istifadə etmək olmur"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB Birləşmə"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Cihazın ekran kilidi kimi eyni"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Tətbiqləri idarə edin"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Quraşdırılmış tətbiqləri idarə edin və silin"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Tətbiq haqqında məlumat"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Tətbiqləri idarə edin, tez işəsalma qısayollarını quraşdırın"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Tətbiq parametrləri"</string>
     <string name="install_applications" msgid="4872012136210802181">"Naməlum mənbələr"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Boşluğu idarə edin"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filtr variantları seçin"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Bütün"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Deaktiv"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Bütün tətbiqlər"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Deaktiv tətbiqlər"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Endirilib"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Proses gedir"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB yaddaş"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartda"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktiv"</string>
     <string name="not_installed" msgid="2797554494953450291">"Bu istifadəçi üçün quraşdırılmayıb"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Quraşdırıldı"</string>
     <string name="no_applications" msgid="7336588977497084921">"Tətbiq yoxdur."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Daxili yaddaş"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"daxili yaddaş"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Daxiletmə üsullarını quraşdırın"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Ayarlar"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Ayarlar"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktiv daxiletmə üsulları"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Sistem dillərini istifadə edin"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ayarlar"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Aktiv daxiletmə metodlarını seçin"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekranda klaviatura ayarları"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekran böyüdücünü avtomatik güncəlləyin"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Tətbiq keçidlərində ekran böyüdücünü güncəlləyin"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Yanıdırıb-söndürmə düyməsi zəngi sonlandırır"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Parolları səsləndirin"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Böyük maus kursoru"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono audio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Audio oxudulan zaman kanalları birləşdirin"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Son tam dolmadan sonra işlədin"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Ekran istifadəsi"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın enerji sərfiyyatı"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobil şəbəkənin skan edilməsi"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Sonuncu tam doldurulmadan sonrakı tətbiq istifadəsi"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Sonuncu tam doldurulmadan sonrakı cihaz istifadəsi"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Elektrik şəbəkəsindən çıxarılandan sonra batareya istifadəsi"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sıfırlanandan sonra batareya istifadəsi"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Batareyada <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Artıq hesablanmış enerji istifadəsi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s qədər istifadə edilib"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"Batareyanın %1$s faizi"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Sonuncu tam doldurulmadan sonrakı istifadə problemi"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Təxmini qalan vaxt"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Batareyanın tam dolma vaxtı"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"İstifadəyə əsasən hesablama dəyişə bilər"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> şəbəkədən ayrılandan bəri"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ərzində elektrikə qoşulmayıb"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ümumi istifadə"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Hər zaman-deaktiv"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Bu tətbiq tərəfindən dəstəklənmir"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Yalnız VPN üzərindən olan bağlantılara icazə verin"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN bağlantısı tələb edilir?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Kilidləmə aktivdir"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Kilidləmə qeyri aktivdir"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Həmişə qoşulu qalmaq üçün VPN profili seçin. Yalnız bu VPN\'ə qoşulu olduqda şəbəkə trafikinə icazə veriləcək."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Məhdudlaşdırılmış profillər hesablar əlavə edə bilməz"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> adlı istifadəçini bu cihazdan silin"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Ekran ayarlarını kilidləyin"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Kilid ekranından istifadəçi əlavə edin"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Yeni istifadəçi"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Yeni profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Özünüzü silirsiniz?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefon zəngləri &amp; SMS aktivləşdirilsin?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Zəng və SMS tarixçəsi bu istifadəçi ilə paylaşılacaq."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Təcili məlumat"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> haqqında informasiya"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> üçün məlumat və kontaktlar"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tətbiq və kontentə icazə ver"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Məhdudiyyətli Tətbiqlər"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Tətbiq üçün parametrləri genişləndirin"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">%d gizli element göstərin</item>
       <item quantity="one">%d gizli element göstərin</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Şəbəkə və internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobil, data istifadəsi, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Şəbəkə və İnternet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, data istifadəsi, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Qoşulmuş cihazlar"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, yayım"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Tətbiq və bildirişlər"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"İstifadəçi və hesablar"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Defolt tətbiqlər"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Dil seçimləri, yedəkləmə, güncəlləmələr, telefon haqqında"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Dil seçimləri, yedəkləmə, güncəlləmələr, cihaz haqqında"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ayarlar"</string>
     <string name="search_menu" msgid="6283419262313758339">"Axtarış ayarları"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Axtarış ayarları"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Nəticələr"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, şəbəkə bağlantısı"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mətn mesajı, mətn yazmaq, mesajlar, mesaj yazmaq"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobil şəbəkə, mobil operator, simsiz, data, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"şəbəkə, mobil, şəbəkə operatoru, simsiz, data, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, zəng, çağrı"</string>
     <string name="keywords_home" msgid="3626170808219458848">"başlatma"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, taçskrin"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Xəbərdarlıq"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrasiya"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Səsləri aktiv edin"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"\"Narahat etməyin\" tərcihləri"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Yalnız prioritet icazə verir"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Avtomatik qaydalar"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Narahat etməyin Cədvəlini quraşdırın"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Defolt iş profili səsi"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Defolt iş siqnalı zəng melodiyası"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Şəxsi profil ilə eynidir"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"İş profili səsləri əvəz edilsin?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Şəxsi profil səsləri istifadə olunsun?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Əvəz edin"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Cari iş profili səsləriniz şəxsi profil səsləri ilə əvəz olunacaq"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Cari profil səsləri əvəzinə şəxsi profil səsləri istifadə olunacaq"</string>
     <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="7447797716856573587">"Bildiriş tərcihləri"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"İcazə verilməyib"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"İcazə sorğusu göndərilməyib"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Bütün proqramlar"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Aktiv"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Quraşdırılmış tətbiqlər"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Ani tətbiqlər"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Şəxsi"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"İş"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloklanıb"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domen URL-ləri ilə"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Qabaqcıl"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Tətbiqi konfiqurasiya edin"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Naməlum tətbiq"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"İş üçün defolt"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Yardım və səsli daxiletmə"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Yardım tətbiqi"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Heç biri"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Yardım tətbiqini seçin"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> Sizin köməkçiniz olsun?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Köməkçi sisteminizdə istifadə olunan tətbiqlər haqqında məlumatı oxuya biləcək, bura ekranınızda görünən və tətbiqlər daxilində əlçatan olan məlumat da daxildir."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Razıyam"</string>
@@ -2966,6 +2958,8 @@
     <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">"Batareya optimallaşdırılması"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"İstifadə siqnalları"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Bütün tətbiqləri göstərin"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Əlavə tətbiqləri gizlədin"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Enerjiyə qənaət etmir"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Enerjiyə qənaət etmir"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Batareya istifadəsi optimallaşdırılır"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Sərin rəng temperaturu"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Serinləşdirici ekran rənglərini istifadə edin"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rəng dəyişikliyini tətbiq etmək üçün ekranı söndürün"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefoniya monitoruna dəyişikliyi tətbiq etmək üçün cihazı yenidən yükləyin"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Avtomatik sistem güncəlləmələri"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Bloklanmış HALlar (yenidən yükləmə tələb edir)"</string>
     <string name="usage" msgid="2977875522080448986">"İstifadə"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Köməkçi işarə"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Qlobal HTTP proksi ayarlandı"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Admin cihazı kilidləyə və parolu sıfırlaya bilər"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Admin cihazın bütün datalarını silə bilər"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Admin bütün cihaz datasını silməzdən əvvəl maksimum parol cəhdlərini <xliff:g id="COUNT_1">%d</xliff:g> dəfəyə quraşdırdı</item>
+      <item quantity="one">Admin bütün cihaz datasını silməzdən əvvəl maksimum parol cəhdlərini <xliff:g id="COUNT_0">%d</xliff:g> dəfəyə quraşdırdı</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Admin iş profil datasını silməzdən əvvəl maksimum parol cəhdlərini <xliff:g id="COUNT_1">%d</xliff:g> dəfəyə quraşdırdı</item>
+      <item quantity="one">Admin iş profil datasını silməzdən əvvəl maksimum parol cəhdlərini <xliff:g id="COUNT_0">%d</xliff:g> dəfəyə quraşdırdı</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Bu cihaz idarə olunur."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tərəfindən idarə olunur."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Ətraflı məlumat"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto və Videolar"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musiqi və Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Oyunlar"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Digər tətbiqlər"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fayllar"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Yaddaş Meneceri: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Deaktiv"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktiv"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Oyunlar"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio fayllar"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musiqi"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> üçün silindi)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> üçün deaktiv edildi)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Avtomatik doldurma tətbiqi"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 2acff6f..25d65a0 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -332,9 +332,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Nalozi"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Bezbednost i zaključavanje ekrana"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrovanje i akreditivi"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Podešavanje Moje lokacije, otključavanja ekrana, zaključavanja SIM kartice i zaključavanja akreditiva skladišta"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Podešavanje Moje lokacije, otključavanja ekrana, zaključavanja skladišta akreditiva"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Lozinke"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privatnost"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Onemogućio je administrator"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Bezbednosni status"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Lokacija, otisak prsta"</string>
@@ -1436,8 +1437,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Isto kao zaključavanje ekrana uređaja"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljaj aplikacijama"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje instaliranim aplikacijama i njihovo uklanjanje"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informacije o aplikaciji"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Upravljanje aplikacijama, podešavanje prečica za brzo pokretanje"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Podešavanja aplikacije"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nepoznati izvori"</string>
@@ -1498,16 +1498,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
     <string name="filter" msgid="2018011724373033887">"Filtriraj"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Izbor opcija filtera"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Sve"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Onemogućeno"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Sve aplikacije"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Onemogućene aplikacije"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Preuzeto"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Pokretanje"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB memorija"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na SD kartici"</string>
     <string name="disabled" msgid="9206776641295849915">"Onemogućeno"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nije instal. za ovog korisnika"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instalirana"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nema aplikacija."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interno skladište"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"interna memorija"</string>
@@ -1685,8 +1684,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Podešavanje metoda unosa"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Podešavanja"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Podešavanja"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metode aktivnog unosa"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Koristi jezike sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> podešavanja"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Izbor metoda aktivnog unosa"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Podešavanja tastature na ekranu"</string>
@@ -1730,7 +1727,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatski ažuriraj uvelič. ekrana"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ažurira uveličavanje ekrana pri prelazu aplikacija"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Dugme uključi/isključi prekida poziv"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Izgovaraj lozinke"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Veliki pokazivač miša"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono zvuk"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombinujte kanale kada puštate audio sadržaj"</string>
@@ -1850,7 +1846,11 @@
     <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">"Još <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Puni se još <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Korišćenje od poslednjeg potpunog punjenja"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Korišćenje ekrana"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja za ekran"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilnih mreža"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Korišćenje aplikacija od poslednjeg potpunog punjenja"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Korišćenje uređaja od poslednjeg potpunog punjenja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Korišćenje baterije nakon isključivanja"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Korišćenje baterije nakon ponovnog postavljanja"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na bateriji"</string>
@@ -1940,8 +1940,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekomerno izračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Koristi se %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ukupnog kapaciteta baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Analiza potrošnje od poslednjeg potpunog punjenja"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Procenjeno preostalo vreme"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Vreme do potpunog punjenja"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Procena može da se menja na osnovu korišćenja"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Tokom poslednjeg isključivanja za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2333,6 +2335,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Uvek uključeni VPN je neaktivan"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ove aplikacija ne podržava"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Dozvoli samo veze preko VPN-a"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Treba vam VPN veza?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Zaključavanje je aktivno"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Zaključavanje je neaktivno"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Izaberite VPN profil sa kojim ćete uvek biti povezani. Mrežni sadržaj će biti dozvoljen samo kada ste povezani sa ovim VPN-om."</string>
@@ -2422,8 +2425,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ograničeni profili ne mogu da dodaju naloge"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Izbriši <xliff:g id="USER_NAME">%1$s</xliff:g> sa uređaja"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Podešavanja zaključanog ekrana"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Dodajte korisnike sa zaključanog ekrana"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novi korisnik"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novi profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Želite li da izbrišete sebe?"</string>
@@ -2451,7 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Uključiti telefonske pozive i SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Istorija poziva i SMS-ova će se deliti sa ovim korisnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije o hitnom slučaju"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informacije o korisniku <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informacije i kontakti za <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dozvole za aplikacije i sadržaj"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije sa ograničenjima"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi podešavanja aplikacije"</string>
@@ -2572,8 +2574,8 @@
       <item quantity="few">Prikaži %d skrivene stavke</item>
       <item quantity="other">Prikaži %d skrivenih stavki</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Mreža i internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobilna mreža, potrošnja podataka, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Mreža i internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilna mreža, potrošnja podataka, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, prebacivanje"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obaveštenja"</string>
@@ -2589,7 +2591,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Rezultati"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"WiFi, Wi-Fi, mrežna veza"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, slanje SMS-ova, poruke, slanje poruka"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobilna, mobilni operater, bežično, podaci, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilna mreža, mobilni podaci, mobilni operater, bežično, podaci, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"WiFi, Wi-Fi, poziv, pozivanje"</string>
     <string name="keywords_home" msgid="3626170808219458848">"pokretač"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, dodirni ekran"</string>
@@ -2665,8 +2667,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Obaveštenje"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibracija"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Zvukovi pri uključivanju"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Ne uznemiravaj – podešavanja"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dozvoljeni su samo prioriteti"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Podesite raspored za Ne uznemiravaj"</string>
@@ -2683,9 +2684,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Podrazumevani zvuk za obaveštenja za Work"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Podrazumevana melodija zvona za alarm za Work"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Isto kao i za lični profil"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Zameniti zvuke profila za Work?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Želite li da koristite zvuke ličnog profila?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Zameni"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Aktuelni zvuci profila za Work će biti zamenjeni zvucima sa ličnog profila"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Zvuci sa ličnog profila će se koristiti umesto aktuelnih zvuka profila za Work"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Melodije zvona"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Drugi zvuci i vibracije"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Podešavanja obaveštenja"</string>
@@ -2927,11 +2928,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nijedna dozvola nije odobrena"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nijedna dozvola nije zahtevana"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Sve aplikacije"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Omogućene"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Instalirane aplikacije"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant aplikacije"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Lične"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Posao"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirana"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Sa URL-ovima domena"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Napredna"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurišite aplikacije"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
@@ -2957,8 +2958,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Podrazumevana za posao"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Pomoć i glasovni unos"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplikacija za pomoć"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ništa"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Izaberite Aplikaciju za pomoć"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Želite li da <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> bude aplikacija za pomoć?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Pomoćnik će moći da čita informacije o aplikacijama koje se koriste u sistemu, uključujući informacije koje mogu da se vide na ekranu ili kojima može da se pristupa u okviru  aplikacija."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Prihvatam"</string>
@@ -2988,6 +2987,8 @@
     <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">"Optimizacija baterije"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Obaveštenja o korišćenju"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Prikaži sve aplikacije"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Bez optimizacije"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija korišćenja baterije"</string>
@@ -3170,6 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristi hladnije boje ekrana"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primenili promenu boje, isključite ekran"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Restartujte uređaj da biste primenili promenu TelephonyMonitor-a"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatska ažuriranja sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (zahteva restartovanje)"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
@@ -3351,6 +3353,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani telefona."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani uređaja."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Pokret za pomoć"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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">"Alatka za pokretanje operativnog sistema je već otključana"</string>
@@ -3418,12 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globalni HTTP proksi je podešen"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrator može da zaključava uređaj i resetuje lozinku"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator može da briše sve podatke sa uređaja"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu svi podaci sa uređaja</item>
+      <item quantity="few">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu svi podaci sa uređaja</item>
+      <item quantity="other">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu svi podaci sa uređaja</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu podaci profila za Work</item>
+      <item quantity="few">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu podaci profila za Work</item>
+      <item quantity="other">Administrator je podesio maksimalan broj pokušaja za unos lozinke na <xliff:g id="COUNT_1">%d</xliff:g>, posle čega se brišu podaci profila za Work</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Ovim uređajem se upravlja."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saznajte više"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Slike i video snimci"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzika i audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
@@ -3434,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menadžer memorijskog prostora: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Isključeno"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Uključeno"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio datoteke"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacija za automatsko popunjavanje"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 85cdbf7..8052b98 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -334,9 +334,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Месцазнаходжанне"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Уліковыя запісы"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Бяспека і блакіроўка экрана"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шыфраванне і ўліковыя даныя"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаць Маё месцазнаходжанне, разблакаванне экрана, блакаванне SIM-карты, блакаванне сховішча ўліковых дадзеных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устанавіць маё месцазнаходжанне, разблакаванне экрана, блакаванне сховішча ўліковых дадзеных"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Паролі"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Прыватнасць"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Адключана адміністратарам"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Стан бяспекі"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Месцазнаходжанне, адбіткі пальцаў"</string>
@@ -1446,8 +1447,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Аднолькава з блакіроўкай экрана прылады"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Кіраванне прыкладаннямі"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Кіраванне ўсталяванымi прыкладаннямi і iх выдаленне"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Звесткі пра праграму"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Кіраванне прыкладаннямі, налады шляхоў хуткага доступу"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Налады прыкладання"</string>
     <string name="install_applications" msgid="4872012136210802181">"Невядомыя крыніцы"</string>
@@ -1509,16 +1509,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Кіраванне вольным месцам"</string>
     <string name="filter" msgid="2018011724373033887">"Фільтр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Выберыце параметры фільтра"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Усе"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Адключаныя"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Усе праграмы"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Адключаныя праграмы"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Спампавана"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Выконваецца"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-назапашвальнік"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD-карце"</string>
     <string name="disabled" msgid="9206776641295849915">"Адключанае"</string>
     <string name="not_installed" msgid="2797554494953450291">"Не ўсталяв. для гэтага карыст."</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Усталявана"</string>
     <string name="no_applications" msgid="7336588977497084921">"Няма прыкладанняў."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Унутраная памяць"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"унутраная памяць"</string>
@@ -1696,8 +1695,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Налада метадаў уводу"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Налады"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Налады"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Актыўныя метады ўводу"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Выкарыстоўваць мовы сістэмы"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Налады <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Выберыце актыўныя метады ўводу"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Налады экраннай клавіятуры"</string>
@@ -1741,7 +1738,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Аўтаматычнае абнаўленне павелiчэння экрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Абнаўленне павелiчэння экрану падчас перахода з прыкладання"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Нац. на кнопку сілкавання зав. выклік"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Прамаўляць паролі"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Вялікі ўказальнік мышы"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Монафанія"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Аб\'ядноўваць каналы пры прайграванні аўдыя"</string>
@@ -1867,7 +1863,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Спажыванне з моманту апош. поўн. зарадкі"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Выкарыстанне экрана"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Расход зараду на падсвечванне экрана"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Сканіраванне мабільнай сеткі"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Выкарыстанне праграм з моманту апошняй поўнай зарадкі"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Выкарыстанне прылады з моманту апошняй поўнай зарадкі"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Выкарыстанне акумулятару з моманту адключэння"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Выкарыстанне акумулятару з моманту перазагрузкі"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Працуе ад акумулятару: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1957,8 +1957,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Няўлічанае спажыванне энергіі"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАг"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Выкарыстоўваецца %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ад агульнага зараду акумулятара"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Разбіўка па выкарыстанні з моманту апошняй поўнай зарадкі"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Прыблзіны час, які застаўся"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Час да поўнай зарадкі"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Прыблізны час можа мяняцца ў залежнасці ад умоў выкарыстання"</string>
     <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>
@@ -2350,6 +2352,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\"Заўсёды ўключана\" не актывавана"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Не падтрымліваецца гэтай праграмай"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Дазваляць падключэнне толькі праз VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Патрабуецца падключэнне VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Блакіроўка актыўная"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Блакіроўка неактыўная"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Дазволiць, каб VPN заўсёды заставаўся падключаным да сеткi, можна будзе толькi пасля падключэння да гэтага VPN."</string>
@@ -2443,8 +2446,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Уладальнiкi профіляў з абмежаваннямi не могуць дадаваць уліковыя запісы"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Выдаліць <xliff:g id="USER_NAME">%1$s</xliff:g> з гэтай прылады"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Налады экрана блакіроўкі"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Дадаваць карыстальнікаў з экрана блакіроўкі"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Новы карыстальнік"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Новы профiль"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Выдаляеце сябе?"</string>
@@ -2472,7 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Уключыць тэлефонныя выклікі і SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Гэты карыстальнік атрымае доступ да гісторыі выклікаў і SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Інфармацыя для экстранных сітуацый"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Інфармацыя пра карыстальніка <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Інфармацыя і кантакты карыстальніка <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дазволіць прыкладанні і змесціва"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Прыкладанні з абмежаваннямі"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Разгарнуць параметры прыкладання"</string>
@@ -2594,8 +2596,8 @@
       <item quantity="many">Паказаць %d схаваных элементаў</item>
       <item quantity="other">Паказаць %d схаванага элемента</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Сетка і інтэрнэт"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, сотавая сетка, выкарыстанне трафіка, хот-спот"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Сетка і інтэрнэт"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мабільны, выкарыстанне трафіка, хот-спот"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Падключаныя прылады"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, трансляцыі"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Праграмы і апавяшчэнні"</string>
@@ -2611,7 +2613,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Вынікі"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, падключэнне да сеткі"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"тэкставае паведамленне, SMS, паведамленні, абмен паведамленнямі"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"мабільны, мабільны аператар, бесправадны, даныя, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"сотавы, мабільны, сотавы аператар, бесправадны, даныя, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, выклік, тэлефанія"</string>
     <string name="keywords_home" msgid="3626170808219458848">"праграма запуску"</string>
     <string name="keywords_display" msgid="8910345814565493016">"экран, сэнсарны экран"</string>
@@ -2687,8 +2689,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Абвестка"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вібрацыя"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Гукі пры ўключэнні"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Налады рэжыму \"Не турбаваць\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дазволены толькі прыярытэтныя"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Аўтаматычныя правілы"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Задаць графік рэж. \"Не турб.\""</string>
@@ -2705,9 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Станд. гук апав. прац. проф."</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Станд. мелод. будз. прац.проф."</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Такія ж, як у асабістым профілі"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Замяніць гукі прац. профілю?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Выкарыстоўваць гукі асабістага профілю?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Замяніць"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Вашы бягучыя гукі працоўнага профілю будуць заменены гукамі вашага асабістага профілю"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Замест бягучай гукавай схемы вашага працоўнага профілю будуць выкарыстоўвацца гукі асабістага профілю"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Рынгтоны"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Іншыя гукі і вібрацыя"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Параметры апавяшчэнняў"</string>
@@ -2955,11 +2956,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Няма дазволаў"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Няма запытаў дазволаў"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Усе праграмы"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Уключаныя"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Усталяваныя праграмы"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Імгненныя праграмы"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Персанальныя"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Працоўныя"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблакiраваныя"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"З URL дамена"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Пашыраныя"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Канфігурацыя дадаткаў"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Невядомы дадатак"</string>
@@ -2986,8 +2987,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Стандартныя для працы"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Памочнік і галасавы ўвод"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Дадатак-памочнік"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Няма"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Выбраць дадатак-памочнік"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Зрабіць <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> вашым памочнікам?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Памочніку будзе даступна інфармацыя пра дадаткі, якія выкарыстоўваюцца ў вашай сістэме, у тым ліку інфармацыя, бачная на вашым экране і даступная ў дадатках."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Згаджаюся"</string>
@@ -3017,6 +3016,8 @@
     <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">"Аптымізацыя акумулятара"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Абвесткі аб выкарыстанні"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Паказваць усе праграмы"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Не паказваць дадатк. праграмы"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Не аптымізаваныя"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не аптымізавана"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Аптымізацыя выкарыстання акумулятара"</string>
@@ -3201,6 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Халодная каляровая тэмпература"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Выкарыстоўваць больш халодныя колеры экрана"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Каб прымяніць змяненне колеру, адключыце экран"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Каб змены ў сродку адсочвання тэлефаніі былі прыменены, трэба перазагрузіць прыладу"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аўтаматычныя абнаўленні сістэмы"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (патрабуецца перазагрузка)"</string>
     <string name="usage" msgid="2977875522080448986">"Выкарыстанне"</string>
@@ -3386,6 +3388,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Жэст для Памочніка"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3459,12 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глабальны HTTP-проксі зададзены"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Адміністратар можа блакіраваць прыладу і скідваць пароль"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Адміністратар можа выдаляць усе даныя прылады"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем усіх даных прылады</item>
+      <item quantity="few">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем усіх даных прылады</item>
+      <item quantity="many">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем усіх даных прылады</item>
+      <item quantity="other">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем усіх даных прылады</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем даных працоўнага профілю</item>
+      <item quantity="few">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем даных працоўнага профілю</item>
+      <item quantity="many">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем даных працоўнага профілю</item>
+      <item quantity="other">Адміністратар задаў максімальную колькасць спроб уводу пароля <xliff:g id="COUNT_1">%d</xliff:g> перад выдаленнем даных працоўнага профілю</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Гэта прылада знаходзіцца пад кіраваннем."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Гэта прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Даведацца больш"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Фота і відэа"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музыка і аўдыя"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Гульні"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Іншыя праграмы"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлы"</string>
@@ -3475,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менеджар сховішча: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Выключаны"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Уключаны"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Гульні"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аўдыяфайлы"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музыка"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(выдалена для карыстальніка <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(адключана для карыстальніка <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Праграма для аўтазапаўнення"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 28b53e7..dbc11f1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Местоположение"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Профили"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Сигурност и заключване на екрана"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифроване и идентификационни данни"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Задаване на Моето местоположение, отключване на екран и заключване на хранилището за идентификационни данни"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Поверителност"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Деактивирано от администратора"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Състояние на сигурността"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Местоположение, отпечатък"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Избиране на Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi се включва…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi се изключва…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Преглед на всички мрежи"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Грешка"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Честотата от 5 ГХц не е налице в тази държава"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"В самолетен режим"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Тетъринг през Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Тетъринг"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Точка за достъп/тетъринг"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Точката за достъп и тетърингът са включени"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Точката за достъп е включена"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Тетърингът е включен"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"При включена Икономия на данни не можете да активирате функцията за тетъринг, нито да използвате преносими точки за достъп"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Тетъринг през USB"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Като опцията за заключване на екрана на устройството"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управление на приложенията"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление и премахване на инсталирани приложения"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Информация за приложението"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Управление на приложения, задаване на преки пътища за бързо стартиране"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Настройки за приложения"</string>
     <string name="install_applications" msgid="4872012136210802181">"Неизвестни източници"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Управление на място"</string>
     <string name="filter" msgid="2018011724373033887">"Филтриране"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Избор на филтриращи опции"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Всички"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Деактивирани"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Всички приложения"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Деактивирани приложения"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Изтеглени"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Работещи"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB хранилище"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD карта"</string>
     <string name="disabled" msgid="9206776641295849915">"Деактивирано"</string>
     <string name="not_installed" msgid="2797554494953450291">"Не е инсталир. за потребителя"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Инсталирано"</string>
     <string name="no_applications" msgid="7336588977497084921">"Няма приложения."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Вътр. хранилище"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"вътрешно хранилище"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Настройка на методите на въвеждане"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Настройки"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Настройки"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Активни методи за въвеждане"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Използване на системните езици"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Настройки за <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Избор: Активни методи за въвеждане"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Настройки за екранна клавиатура"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ниво на мащаба на екрана: Автоакт."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ниво на мащаба на екрана при преходи на прилож.: Актуал."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Край на обажд.: Бутон за захранване"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Изговаряне на паролите"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Голям курсор на мишката"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Монозвук"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Комбиниране на каналите при възпроизв. на звук"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Използване от последното пълно зареждане"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Използване на екрана"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Консумация от екрана"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Сканиране за мобилни мрежи"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Използване на приложенията от последното пълно зареждане"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Използване на устройството от последното пълно зареждане"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Употреба на батерията след изключването"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Употреба на батерията след рестартирането"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> на батерия"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Отчетено в повече захранване"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАч"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Използвано в продължение на %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s от батерията като цяло"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Разбивка на използването от последното пълно зареждане"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Приблизително оставащо време"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Време до пълно зареждане"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Прогнозата може да се промени въз основа на използването"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Режимът „Винаги включено“ не е активен"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Не се поддържа от това приложение"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Разрешаване на връзки само през VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Да се изисква ли връзка с VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Заключването е активно"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Заключването не е активно"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Изберете потребителски профил за виртуална частна мрежа (VPN), за да останете винаги свързани с нея. Мрежовият трафик ще бъде разрешен само при връзка с тази VPN."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"В потребителските профили с ограничена функционалност не могат да се добавят профили"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Изтриване на <xliff:g id="USER_NAME">%1$s</xliff:g> от у-вото"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Настройки на заключения екран"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Добавяне на потребители от заключения екран"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Нов потребител"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Нов потребителски профил"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Искате ли да се изтриете?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Да се включат ли телефонните обаждания и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Историята на обажданията и SMS съобщенията ще се сподели с този потребител."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Информация за спешни случаи"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Информация за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Информация и контакти за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Разрешаване на приложения и съдържание"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничения"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Настройки за прилож.: Разгъв."</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">Показване на %d скрити елемента</item>
       <item quantity="one">Показване на %d скрит елемент</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Мрежа и интернет"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, мобилни данни, пренос на данни, точка за достъп"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и интернет"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобилна мрежа, пренос на данни, точка за достъп"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Свързани устройства"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, КБП, предаване"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Приложения и известия"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Потребител и профили"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Приложения по подразбиране"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Езици, създаване на резервно копие, актуализации, всичко за телефона"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Езици, резервнo копиe, актуализации, информация за устройството"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Настройки"</string>
     <string name="search_menu" msgid="6283419262313758339">"Търсете в настройките"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Настройки за търсене"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Резултати"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, връзка с мрежа"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"текстово съобщение, изпращане на текстово съобщение, съобщения, изпращане на съобщения"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"мобилна мрежа, мобилен оператор, безжична мрежа, данни, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"мобилни данни, мобилна мрежа, мобилен оператор, безжична мрежа, данни, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, обаждам се, обаждане"</string>
     <string name="keywords_home" msgid="3626170808219458848">"стартов панел"</string>
     <string name="keywords_display" msgid="8910345814565493016">"екран, сензорен екран"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Сигнал"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибриране"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Звуци при включване"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"„Не безпокойте“: Предпочитания"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Само приоритетни прекъсвания"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автомат. правила"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"График за „Не безпокойте“"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Известие: Станд. служ. мелодия"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Будилник: Станд. служ. мелодия"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Като за личния потребителски профил"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Замяна на звуците за служебния потребителски профил?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Да се използват ли звуците за личния потребителски профил?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Замяна"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Текущите звуци за служебния ви потребителски профил ще бъдат заменени с тези за личния ви"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Звуците за личния ви потребителски профил ще се използват вместо тези за текущия ви служебен"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Мелодии"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Други звуци и вибриране"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Предпочитания за известията"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Няма предоставени разрешения"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Няма заявени разрешения"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Всички приложения"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Активирани"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Инсталирани приложения"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Мигновени приложения"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Лични"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Служебни"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блокирани"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"С URL адреси в домейните"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Разширени"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Конфигуриране на приложенията"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестно приложение"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"По подразбиране за работа"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Помощник и гласово въвеждане"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Помощно приложение"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Няма"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Избиране на помощно приложение"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Искате ли <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> да е помощникът ви?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Помощникът ще може да чете информацията за използваните в системата приложения, включително данните, видими на екрана или достъпни в тях."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Приемам"</string>
@@ -2966,6 +2958,8 @@
     <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">"Оптимизиране на батерията"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Сигнали за употребата"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Показване на всички приложения"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Допълн. приложения: Скриване"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Без оптимизиране"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Без оптимизиране"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Разходът на батерията се оптимизира"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Студена цветова гама"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Използване на по-студени цветове за дисплея"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"За да приложите промяната на цветовете, изключете екрана"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"За да приложите промяната във функцията за наблюдение на телефонията, рестартирайте устройството"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматични системни актуализации"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Свързани абстрактни хардуерни слоеве (изисква рестартиране)"</string>
     <string name="usage" msgid="2977875522080448986">"Пренос на данни"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Помощен жест"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Зададен е общ HTTP прокси сървър"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Администраторът може да заключи устройството и да зададе нова парола"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Администраторът може да изтрие всички данни на устройството"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Администраторът е задал всички данни на устройството да бъдат изтрити след <xliff:g id="COUNT_1">%d</xliff:g> опита за въвеждане на паролата</item>
+      <item quantity="one">Администраторът е задал всички данни на устройството да бъдат изтрити след <xliff:g id="COUNT_0">%d</xliff:g> опит за въвеждане на паролата</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"Това устройство се управлява."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Това устройство се управлява от <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Научете повече"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Снимки и видеоклипове"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музика и аудио"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Игри"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Други приложения"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлове"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Мениджър на хранилището: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Изкл."</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Вкл."</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Игри"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудиофайлове"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музика"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(деинстал. за потребителя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(деактивирано за потребителя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Приложение за автоматично попълване"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index ef077d2..9125c19 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"অবস্থান"</string>
     <string name="account_settings_title" msgid="626177544686329806">"অ্যাকাউন্টগুলি"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"নিরাপত্তা এবং স্ক্রিন লক"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"এনক্রিপশান ও শংসাপত্র"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"আমার স্থান, স্ক্রীন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"আমার স্থান, স্ক্রীন আনলক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"পাসওয়ার্ড"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"গোপনীয়তা"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"প্রশাসক দ্বারা অক্ষমিত"</string>
     <string name="security_status_title" msgid="5848766673665944640">"নিরাপত্তা স্থিতি"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"অবস্থান, আঙ্গুলের ছাপ"</string>
@@ -348,7 +349,7 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"আঙ্গুলের ছাপ দিয়ে আনলক করুন"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"আঙ্গুলের ছাপ ব্যবহার করুন"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে শুধু আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন৷ আপনি কাদের আঙ্গুলের ছাপ যোগ করছেন সেই বিষয়ে সতর্ক থাকুন৷ এমনকি যাদের আঙ্গুলের ছাপ যোগ করা হবে তারা এই জিনিসগুলি করতে পারবে।\n\nদ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি জটিল প্যাটার্ন বা PIN এর চাইতে কম নিরাপদ হতে পারে।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে শুধু আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন৷ আপনি কাদের আঙ্গুলের ছাপ যোগ করছেন সেই বিষয়ে সতর্ক থাকুন৷ এমনকি যাদের আঙ্গুলের ছাপ যোগ করা হবে তারা এই জিনিসগুলি করতে পারবে।\n\nদ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি জটিল প্যাটার্ন বা PIN এর চাইতে কম নিরাপদ হতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"কেনাকাটার অনুমোদন দিতে বা অ্যাপ্সে সাইন ইন করতে শুধু আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন৷ আপনি কাদের আঙ্গুলের ছাপ যোগ করছেন সেই বিষয়ে সতর্ক থাকুন৷ এমনকি যাদের আঙ্গুলের ছাপ যোগ করা হবে তারা এই জিনিসগুলি করতে পারবেন।\n\nদ্রষ্টব্য: এই ডিভাইসটিকে আনলক করতে আপনি আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারবেন না৷ আরো তথ্যের জন্য আপনার প্রতিষ্ঠানের প্রশাসকের সাথে যোগাযোগ করুন৷"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"আপনার ফোন আনলক, কেনাকাটায় অনুমোদন, বা অ্যাপ্সে সাইন ইন করতে শুধু আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন৷ আপনি কাদের আঙ্গুলের ছাপ যোগ করছেন সেই বিষয়ে সতর্ক থাকুন৷ এমনকি যাদের আঙ্গুলের ছাপ যোগ করা হবে তারা এই জিনিসগুলি করতে পারবেন।\n\nদ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি জটিল প্যাটার্ন বা PIN এর চাইতে কম নিরাপদ হতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"বাতিল করুন"</string>
@@ -376,7 +377,7 @@
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"আঙ্গুলের ছাপ যোগ করা হয়েছে!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"যখন আপনি এই আইকন দেখতে পাবেন তখনই আপনি সনাক্ত করার জন্য অথবা একটি ক্রয় করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারেন৷"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"আপনার ডিভাইসকে জাগাতে এবং আনলক করতে শুধুমাত্র আঙ্গুলের ছাপ সেন্সরে স্পর্শ করুন৷"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"আপনি যখন এই আইকনটি দেখতে পান, তখন আপনি কেনাকাটাগুলিতে অনুমোদন এবং অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন৷"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"আপনি যখন এই আইকনটি দেখতে পান, তখন আপনি কেনাকাটাগুলিতে অনুমোদন এবং অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন৷"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"আঙ্গুলের ছাপ সেট আপ করা এড়িয়ে যাবেন?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"আপনি আপনার ফোন আনলক করার একটি উপায় হিসেবে আপনার আঙ্গুলের ছাপ ব্যবহারের ব্যবস্থাটিকে বেছে নিয়েছেন। আপনি যদি এখনই এটিকে এড়িয়ে যান, তাহলে আপনাকে পরে আবার এটি সেট আপ করতে হবে। সেট আপ করতে মাত্র এক মিনিট এর মত সময় লাগতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"স্ক্রীন লক সেট আপ করুন"</string>
@@ -395,8 +396,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"আপনি অনুমোদিত সর্বোচ্চ সংখ্যক আঙ্গুলের ছাপ যোগ করেছেন"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"এর বেশি আঙ্গুলের ছাপ যোগ করা যাবে না"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"সমস্ত আঙ্গুলের ছাপ সরাবেন?"</string>
-    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"আপনি আপনার আঙ্গুলের ছাপগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন না৷"</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="8840100810725902159">"আপনি আপনার আঙ্গুলের ছাপগুলি ব্যবহার করে আপনার কর্মস্থলের প্রোফাইল আনলক করতে, কেনাকাটায় অনুমোদন বা কাজের অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন না৷"</string>
+    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"আপনি আপনার আঙ্গুলের ছাপগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="8840100810725902159">"আপনি আপনার আঙ্গুলের ছাপগুলি ব্যবহার করে আপনার কর্মস্থলের প্রোফাইল আনলক করতে, কেনাকাটায় অনুমোদন বা কাজের অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"হ্যাঁ, সরান"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"অবিরত রাখতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন।"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"এনক্রিপশান"</string>
@@ -479,35 +480,35 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না৷"</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না৷"</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না৷"</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার স্ক্রীন লক ছাড়া কাজ করবে না৷"</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার স্ক্রীন লক ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না৷"</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না৷"</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না৷"</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"আপনার স্ক্রীন লক ছাড়া প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি কাজ করবে না৷"</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"আপনার স্ক্রীন লক ছাড়া প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি কাজ করবে না৷<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করুন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"হ্যাঁ, সরান"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"আনলক প্যাটার্ন পরিবর্তন করুন"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"আনলক পিন পরিবর্তন করুন"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"ওয়াই-ফাই নির্বাচন করুন"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"ওয়াই-ফাই চালু করা হচ্ছে..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"ওয়াই-ফাই বন্ধ করা হচ্ছে..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"সমস্ত নেটওয়ার্ক দেখুন"</string>
     <string name="wifi_error" msgid="3207971103917128179">"ত্রুটি"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"এই দেশে ৫ GHz ব্যান্ড পাওয়া যায় না"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"বিমান মোডে"</string>
@@ -768,8 +768,8 @@
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"এটি বন্ধ করতে, ওভারফ্লো মেনুতে ‘উন্নত’ লেখায় যান"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"অনুমতি দিন"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"আস্বীকার করুন"</string>
-    <string name="wifi_hotspot_title" msgid="7726205804813286950">"সংযোগ করতে প্রবেশ করুন করবেন?"</string>
-    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> এর চাহিদা অনুযায়ী নেটওয়ার্কের সাথে সংযুক্ত হওয়ার পূর্বে আপনাকে অনলাইনে প্রবেশ করুন করতে হবে।"</string>
+    <string name="wifi_hotspot_title" msgid="7726205804813286950">"সংযোগ করতে প্রবেশ করবেন?"</string>
+    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> এর চাহিদা অনুযায়ী নেটওয়ার্কের সাথে সংযুক্ত হওয়ার পূর্বে আপনাকে অনলাইনে প্রবেশ করতে হবে।"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"সংযুক্ত করুন"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"এই নেটওয়ার্কে কোন ইন্টারনেট অ্যাক্সেস নেই৷ এতে সংযুক্ত থাকতে চান?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"এই নেটওয়ার্কের জন্য আবার জিজ্ঞাসা করবেন না"</string>
@@ -1236,7 +1236,7 @@
     <string name="master_clear_title" msgid="5907939616087039756">"ফ্যাক্টরি ডেটা আবার সেট করুন"</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_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_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"USB সঞ্চয়স্থানটিকে"</b>" মুছে দিতে হবে।"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ব্লুটুথ টেদারিং"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"টেদারিং"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"হটস্পট ও টিথারিং"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"হটস্পট, টিথারিং চালু আছে"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"হটস্পট চালু আছে"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"টিথারিং চালু আছে"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ডেটা সেভার চালু থাকা অবস্থায় টেদার করা যাবে না বা পোর্টেবল হটস্পট ব্যবহার করা যাবে না"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB টেদারিং"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ডিভাইসের স্ক্রীন লকের মত একই"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"অ্যাপ্লিকেশনগুলি পরিচালনা করুন"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ইনস্টল করা অ্যাপ্লিকেশানগুলি পরিচালনা করুন ও সরান"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"অ্যাপের তথ্য"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"অ্যাপ্লিকেশান পরিচালনা করুন, দ্রুত লঞ্চ শর্টকাট সেটআপ করুন"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"অ্যাপ্লিকেশান সেটিংস"</string>
     <string name="install_applications" msgid="4872012136210802181">"অজানা উৎসগুলি"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"স্থান পরিচালনা করুন"</string>
     <string name="filter" msgid="2018011724373033887">"ফিল্টার"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ফিল্টার বিকল্পগুলি বেছে নিন"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"সমস্ত"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"অক্ষম হয়েছে"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"সমস্ত অ্যাপ"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"অক্ষম করা অ্যাপগুলি"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ডাউনলোড করা"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"চলমান"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB সঞ্চয়স্থান"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD কার্ডে"</string>
     <string name="disabled" msgid="9206776641295849915">"অক্ষম হয়েছে"</string>
     <string name="not_installed" msgid="2797554494953450291">"এই ব্যবহারকারীর জন্য ইনস্টল করা নেই"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"ইনস্টল করা হয়েছে"</string>
     <string name="no_applications" msgid="7336588977497084921">"কোনো অ্যাপ্লিকেশান নেই"</string>
     <string name="internal_storage" msgid="1584700623164275282">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"ইনপুট পদ্ধতিগুলি সেট আপ করুন"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"সেটিংস"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"সেটিংস"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"সক্রিয় ইনপুট পদ্ধতিগুলি"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"সিস্টেমের ভাষাগুলি ব্যবহার করুন"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> সেটিংস"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"সক্রিয় ইনপুট পদ্ধতিগুলি নির্বাচন করুন"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"অন-স্ক্রীন কীবোর্ড সেটিংস"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"স্ক্রীন বৃহত্তরীকরণ স্বতঃ আপডেট"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"অ্যাপ্লিকেশান ট্রানজিশনের উপর স্ক্রীন বৃহত্তরীকরণ আপডেট"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"পাওয়ার বোতামে কল শেষ হয়"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"পাসওয়ার্ড বলা"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"বড় মাউস পয়েন্টার"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"মোনো অডিও"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"অডিও বাজানোর সময় চ্যানেলগুলিকে একত্রিত করুন"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"শেষ সম্পূর্ণ চার্জ করার সময় থেকে যতটা ব্যবহার হয়েছে"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"স্ক্রিনের ব্যবহার"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"স্ক্রিনের জন্য ব্যবহার"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"মোবাইল নেটওয়ার্ক স্ক্যান করা"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"শেষ বার সম্পূর্ণ চার্জের পর থেকে অ্যাপের ব্যবহার"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"শেষ বার সম্পূর্ণ চার্জের পর থেকে ডিভাইসের ব্যবহার"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"আনপ্লাগ করার পর থেকে ব্যাটারি ব্যবহার"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"আবার সেট করা থেকে ব্যাটারি ব্যবহার"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> ব্যাটারিতে"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"নির্ধারিত শক্তির থেকে বেশী শক্তির ব্যবহার"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s এর জন্য ব্যবহার করা হয়েছে"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"সম্পূর্ণ ব্যাটারির %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"শেষবার সম্পূর্ণ চার্জ দেওয়ার পর থেকে ব্যাটারি ব্যবহারের হিসেব"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"আনুমানিক কতক্ষণ বাকি"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"পরে সম্পূর্ণ চার্জ হবে"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"ব্যবহারের উপর ভিত্তি করে অনুমান পরিবর্তন করা হতে পারে"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\'সর্বদা-চালু\' নিষ্ক্রিয় আছে"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"এই অ্যাপ্লিকেশানটি দ্বারা সমর্থিত নয়"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"শুধুমাত্র VPN মারফৎ সংযোগের অনুমতি দিন"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN সংযোগ প্রয়োজন?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"লকডাউন সক্রিয় রয়েছে"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"লকডাউন নিষ্ক্রিয় রয়েছে"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"সর্বদা সংযুক্ত থাকতে একটি VPN প্রোফাইল নির্বাচন করুন। এই VPN এ সংযুক্ত থাকাকালীন শুধুমাত্র নেটওয়ার্ক ট্রাফিকের অনুমতি দেওয়া হবে।"</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"সীমাবদ্ধযুক্ত প্রোফাইলগুলি অ্যাকাউন্ট যোগ করতে পারবে না"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"এই ডিভাইস থেকে <xliff:g id="USER_NAME">%1$s</xliff:g> মুছে ফেলুন"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"লক স্ক্রীন সেটিংস"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"লক স্ক্রিন থেকে ব্যবহারকারীদের যোগ করুন"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"নতুন ব্যবহারকারী"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"নতুন প্রোফাইল"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"নিজেকে মুছবেন?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ফোন কলগুলিকে এবং SMS চালু করবেন?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"কল ও SMS ইতিহাস এই ব্যবহারকারীর সাথে শেয়ার করা হবে।"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"জরুরি তথ্য"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> এর ব্যাপারে তথ্য"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> এর তথ্য ও পরিচিতি"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"অ্যাপ্লিকেশান এবং সামগ্রীর অনুমতি দিন"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"সীমাবদ্ধ সহ অ্যাপ্লিকেশানগুলি"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"অ্যাপ্লিকেশানের জন্য সেটিংস প্রসারিত করুন"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="one">%dটি লুকানো আইটেম দেখান</item>
       <item quantity="other">%dটি লুকানো আইটেম দেখান</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"নেটওয়ার্ক ও ইন্টারনেট"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"ওয়াই ফাই, সেলুলার ডেটার ব্যবহার, হটস্পট"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"নেটওয়ার্ক ও ইন্টারনেট"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"ওয়াই ফাই, মোবাইল, ডেটার ব্যবহার, হটস্পট"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"সংযুক্ত ডিভাইস"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"ব্লুটুথ, NFC, কাস্ট"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"অ্যাপ্স &amp; বিজ্ঞপ্তি"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"ব্যবহারকারি &amp; অ্যাকাউন্টগুলি"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"ডিফল্ট অ্যাপ্স"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"ভাষাগুলি, ব্যাকআপ, আপডেটগুলি, ফোনটির বিষয়ে"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"ভাষা, ব্যাক আপ, আপডেট, ডিভাইস সম্বন্ধে"</string>
     <string name="search_results_title" msgid="1796252422574886932">"সেটিংস"</string>
     <string name="search_menu" msgid="6283419262313758339">"অনুসন্ধান সেটিংস"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"অনুসন্ধান সেটিংস"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"ফলাফল"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, নেটওয়ার্ক সংযোগ"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"পাঠ্য বার্তা, পাঠ্য বার্তা পাঠানো, বার্তাগুলি, বার্তালাপ"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"সেলুলার, ফোন পরিষেবা প্রদানকারী, ওয়্যারলেস, ডেটা, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"সেলুলার, মোবাইল, সেলুলার পরিষেবা প্রদানকারী, ওয়্যারলেস, ডেটা, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, কল করুন, কল করা হচ্ছে"</string>
     <string name="keywords_home" msgid="3626170808219458848">"লঞ্চার"</string>
     <string name="keywords_display" msgid="8910345814565493016">"স্ক্রীন, টাচস্ক্রীন"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"সতর্কতা"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"কম্পন"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ধ্বনিগুলিতে শক্তি"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"বিরক্ত করবেন না পছন্দগুলি"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"শুধুমাত্র অগ্রাধিকারকে অনুমতি দেয়"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"স্বয়ংক্রিয় নিয়মগুলি"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"\'বিরক্ত করবেন না\' এর সময়সূচী সেট করুন"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ডিফল্ট কর্মস্থলের বিজ্ঞপ্তি টোন"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ডিফল্ট কর্মস্থলের অ্যালার্ম রিংটোন"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ব্যক্তিগত প্রোফাইলের অনুরূপ"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"কর্মস্থলের প্রোফাইলের ধ্বনিগুলিকে প্রতিস্থাপন করতে চান?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ব্যক্তিগত প্রোফাইলের ধ্বনিগুলি ব্যবহার করবেন?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"প্রতিস্থাপন করুন"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"আপনার বর্তমান কর্মস্থালের প্রোফাইলের ধ্বনিগুলিকে আপনার ব্যক্তিগত প্রোফাইলের ধ্বনিগুলির সাথে প্রতিস্থাপন করা হবে"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"আপনার বর্তমান কর্মস্থলের প্রোফাইলের ধ্বনির বদলে আপনার ব্যক্তিগত প্রোফাইলের ধ্বনিগুলি ব্যবহার করা হবে"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"রিংটোনগুলি"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"অন্যান্য শব্দ এবং কম্পন"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"বিজ্ঞপ্তির পছন্দগুলি"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"কোন অনুমতি দেওয়া হয় নি"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"কোন অনুমতির অনুরোধ জানানো হয় নি"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"সমস্ত অ্যাপ্লিকেশান"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"সক্ষমিত"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ইনস্টল করা অ্যাপগুলি"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ঝটপট অ্যাপ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ব্যক্তিগত"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"কাজ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"অবরুদ্ধ রয়েছে"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ডোমেনের URLগুলি সহ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"উন্নত"</string>
     <string name="configure_apps" msgid="6685680790825882528">"অ্যাপ্লিকেশান কনফিগার করুন"</string>
     <string name="unknown_app" msgid="5275921288718717656">"অজানা অ্যাপ্লিকেশান"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"কর্মস্থলের জন্য ডিফল্ট"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"সহায়তা এবং ভয়েস ইনপুট"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"অ্যাপ্লিকেশান সহায়তা"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"কোনো কিছুই নয়"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"সহায়তা অ্যাপ্লিকেশান বাছুন"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> -কে আপনার সহায়ক করবেন?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"সহায়কটি আপনার স্ক্রীনে প্রদর্শিত বা অ্যাপ্লিকেশানগুলির মধ্যে অ্যাক্সেসযোগ্য তথ্য সহ, আপনার সিস্টেমে ব্যবহারে থাকা অ্যাপ্লিকেশানগুলির তথ্য পড়তে পারবে৷"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"সম্মত"</string>
@@ -2966,6 +2958,8 @@
     <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">"ব্যাটারি অপ্টিমাইজেশান"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ব্যবহারের সতর্কতা"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"সব অ্যাপ দেখুন"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"অতিরিক্ত অ্যাপগুলি লুকান"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"অপ্টিমাইজ করা নেই"</string>
     <string name="high_power_on" msgid="6216293998227583810">"অপ্টিমাইজ করা নেই"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ব্যাটারির ব্যবহার অপ্টিমাইজ করা হচ্ছে"</string>
@@ -3109,7 +3103,7 @@
     <string name="display_dashboard_summary" msgid="4145888780290131488">"ওয়ালপেপার, নিদ্রা মোড, হরফের আকার"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"১০ মিনিট ধরে নিষ্ক্রিয় থাকার পরে নিদ্রা মোডে যায়"</string>
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> এর মধ্যে <xliff:g id="USED_MEMORY">%1$s</xliff:g> মেমোরি ব্যবহৃত হয়েছে"</string>
-    <string name="user_summary" msgid="1617826998097722499">"<xliff:g id="USER_NAME">%1$s</xliff:g> হিসেবে প্রবেশ করুন করেছেন"</string>
+    <string name="user_summary" msgid="1617826998097722499">"<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>
     <string name="location_off_summary" msgid="6474350053215707957">"বন্ধ"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"কুল রঙের টেম্পারেচার"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"কুলার প্রদর্শনী রঙগুলি ব্যবহার করুন"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"রঙের পরিবর্তন প্রয়োগ করতে, স্ক্রীন বন্ধ করুন"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"টেলিফোনি মনিটর এ করা পরিবর্তন প্রয়োগ করতে ডিভাইসটি বন্ধ করে আবার চালু করুন"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"স্বয়ংক্রিয় সিস্টেম আপডেটগুলি"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HAL গুলি (আবার চালু করতে হবে)"</string>
     <string name="usage" msgid="2977875522080448986">"ব্যবহার"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"সহায়ক সঙ্কেত"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"বৈশ্বিক HTTP প্রক্সী সেট করা আছে"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"প্রশাসক ডিভাইসটি লক করতে ও পাসওয়ার্ড রিসেট করতে পারবেন"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"প্রশাসক ডিভাইসের সমস্ত ডেটা মুছে দিতে পারবেন"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <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="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"এই ডিভাইসটি পরিচালিত।"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"এই ডিভাইসটি <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> দ্বারা পরিচালিত।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"আরো জানুন"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ফটো ও ভিডিও"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"সঙ্গীত ও অডিও"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"গেম্স"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"অন্যান্য অ্যাপ্লিকেশান"</string>
     <string name="storage_files" msgid="8581083146777364063">"ফাইল"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"সঞ্চয়স্থান পরিচালক: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"বন্ধ আছে"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"চালু আছে"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"গেম্স"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"অডিও ফাইলগুলি"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"সঙ্গীত"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য আনইনস্টল হয়েছে)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য অক্ষম হয়েছে)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"স্বতঃপূরণ অ্যাপ"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 5e04ba8..f484821 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -332,9 +332,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Sigurnost i zaključavanje ekrana"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifriranje i akreditivi"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Postavite Moju lokaciju, otključavanje ekrana, zaključavanje SIM kartice, zaključavanje pohrane akreditiva"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavite Moju lokaciju, otključavanje ekrana, zaključavanje pohrane akreditiva"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Lozinke"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privatnost"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Onemogućio administrator"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Stanje sigurnosti"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Lokacija, otisak"</string>
@@ -678,8 +679,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Odaberite Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Uključivanje Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Isključivanje Wi-Fi..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Vidi sve mreže"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Greška"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Opseg od 5 GHz nije dostupan u ovoj zemlji"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"U načinu rada u avionu"</string>
@@ -1271,12 +1271,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetooth veze"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Pristupna tačka i tetering"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Pristupna tačka je uključena, veza se dijeli"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Pristupna tačka je uključena"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Dijeljenje veze"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dok je upaljena Ušteda podataka nije moguće povezati uređaj niti koristiti prijenosne pristupne tačke"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Dijeljenje USB veze"</string>
@@ -1440,8 +1437,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Isto kao i zaključavanje ekrana uređaja"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljaj aplikacijama"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje instaliranim aplikacijama i uklonite ih"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informacije o aplikaciji"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Upravljanje aplikacijama, postavljanje prečica za brzo pokretanje"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Postavke aplikacije"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nepoznati izvori"</string>
@@ -1502,16 +1498,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Odaberite opcije filtera"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Sve"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Onemogućene"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Sve aplikacije"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Onemogućene aplikacije"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Preuzeto"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Pokretanje"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB pohrana"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na SD kartici"</string>
     <string name="disabled" msgid="9206776641295849915">"Onemogućeno"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nije instal. za ovog korisnika"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instalirano"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nema aplikacija."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interna pohrana"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"interna memorija"</string>
@@ -1689,8 +1684,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Postavite načine unosa"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Postavke"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Postavke"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktivne metode unosa"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Koristi jezik sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> postavke"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Odaberite aktivne načine unosa"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Postavke tastature na ekranu"</string>
@@ -1716,7 +1709,7 @@
     <string name="usage_time_label" msgid="295954901452833058">"Vrijeme korištenja"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Pristupačnost"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Postavke pristupačnosti"</string>
-    <string name="accessibility_settings_summary" msgid="6654271785747778959">"Čitači ekrana, audio, prikaz, kontrola interakcije"</string>
+    <string name="accessibility_settings_summary" msgid="6654271785747778959">"Čitači ekrana, zvuk, prikaz, kontrola interakcije"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Postavke za vid"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Ovaj uređaj možete prilagoditi svojim potrebama. Ove osobine pristupačnosti se mogu kasnije promijeniti u Postavkama."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Usluge"</string>
@@ -1734,7 +1727,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatsko ažuriranje uvećanja ekrana"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ažurira uvećanje ekrana kod prelaza aplikacija"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Poziv se završava dugmetom za napajanje"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Izgovaranje lozinki"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Veliki pokazivač miša"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono audio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombiniraj kanale prilikom reproduciranja zvuka"</string>
@@ -1854,7 +1846,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Iskorišteno od preth. potpunog punjenja"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Korištenje ekrana"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja ekrana"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilne mreže"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Korištenje aplikacija od posljednjeg potpunog punjenja"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Korištenje uređaja od posljednjeg potpunog punjenja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Potrošnja baterije od isključivanja s napajanja"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Potrošnja baterije od posljednjeg pokretanja"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> rada na bateriji"</string>
@@ -1944,11 +1940,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekoračenje potrošnje energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Vrijeme korištenja: %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ukupnog korištenja baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Detaljan pregled korištenja od posljednjeg punjenja"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Procjena preostalog vremena"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Vrijeme do potpune napunjenosti"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Procjena se može mijenjati u zavisnosti od upotrebe"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja s napajanja"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Tokom posljednjeg isključivanja s napajanja <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ukupno korištenje"</string>
@@ -2339,6 +2335,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Opcija Uvijek uključeno je neaktivna"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ova aplikacija ne podržava ovu funkciju"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Dopusti povezivanje samo putem VPN mreže."</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Treba li zahtijevati VPN vezu?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Aktivirano je zaključavanje"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Zaključavanje nije aktivirano"</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>
@@ -2428,8 +2425,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ograničeni profili ne mogu dodati račune"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Izbrišite <xliff:g id="USER_NAME">%1$s</xliff:g> sa uređaja"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Postavke zaključavanja ekrana"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Dodajte korisnike sa zaključanog ekrana"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novi korisnik"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novi profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Želite li izbrisati sebe?"</string>
@@ -2457,7 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Uključiti telefonske pozive i SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Historija poziva i SMS-ova će se dijeliti s ovim korisnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije za hitne slučajeve"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informacije o korisniku <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informacije i kontakti za korisnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dozvole za aplikacije i sadržaj"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije s ograničenjima"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi postavke za aplikaciju"</string>
@@ -2488,7 +2484,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Promijeni PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikaži obavještenja"</string>
     <string name="help_label" msgid="6886837949306318591">"Pomoć i pov. inform."</string>
-    <string name="support_summary" msgid="8276116616493882830">"Članci za pomoć, podrška za telefon i ćaskanje"</string>
+    <string name="support_summary" msgid="8276116616493882830">"Članci za pomoć, podrška putem telefona i chata"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Račun za sadržaj"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ekstremne prijetnje"</string>
@@ -2578,8 +2574,8 @@
       <item quantity="few">Prikaži %d skrivene stavke</item>
       <item quantity="other">Prikaži %d skrivenih stavki</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Mreža i internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi mreža, mobilna mreža, korištenje podataka, pristupna tačka"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Mreža i internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilni, prijenos podataka, pristupna tačka"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, emitiranje"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavještenja"</string>
@@ -2587,8 +2583,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Korisnik i računi"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Zadane aplikacije"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Jezici, sigurnosna kopija, ažuriranja, o telefonu"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Jezici, sigurnosna kopija, ažuriranja, o telefonu"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Postavke"</string>
     <string name="search_menu" msgid="6283419262313758339">"Postavke pretraživanja"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Postavke pretraživanja"</string>
@@ -2596,7 +2591,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Rezultati"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, mrežne veze"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekstualna poruka, slanje tekstualnih poruka, poruke, slanje poruka"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobilni, operater mobilne mreže, bežični, podaci, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilni, mobilni operater, bežični, podaci, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, pozovi, pozivanje"</string>
     <string name="keywords_home" msgid="3626170808219458848">"pokretač"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, osjetljiv na dodir"</string>
@@ -2672,8 +2667,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozorenje"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibracija"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Uključivanje zvukova"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Postavke funkcije Ne ometaj"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dopustiti samo prioritete"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Podesi funkciju Ne uznemiravajj"</string>
@@ -2690,9 +2684,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Zadani ton radnih obavještenja"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Zadana melodija radnog alarma"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Isto kao kod ličnog profila"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Želite li zamijeniti zvuke radnog profila?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Želite li koristiti zvuke ličnog profila?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Zamijeni"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Postojeći zvuci vašeg radnog profila će se zamijeniti zvucima vašeg ličnog profila"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Zvuci ličnog profila će se koristiti umjesto trenutnih zvukova radnog profila"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Melodije zvona"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Ostali zvuci i vibracije"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Pref. postavke obavještenja"</string>
@@ -2934,11 +2928,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nema dodijeljenih dozvola"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nema zatraženih dozvola"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Sve aplikacije"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Omogućeno"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Instalirane aplikacije"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant-aplikacije"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Lične"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirano"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Sa URL-ovima domena"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Napredno"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguriraj aplikacije"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
@@ -2964,8 +2958,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Uobičajeno za rad"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Pomoć i glasovni unos"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplikacija za pomoć"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ne postoji"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Odaberite aplikaciju za pomoć"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Želite li da <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> bude vaš pomoćnik?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Pomoćnik dobija mogućnost čitanja informacija o aplikacijama koje se koriste na vašem sistemu, uključujući informacije vidljive na ekranu ili dostupne unutar aplikacija."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Pristajem"</string>
@@ -2995,6 +2987,8 @@
     <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">"Optimizacija baterije"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozorenja za korištenje"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Prikaži sve aplikacije"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nije optimiziran"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija potrošnje baterije"</string>
@@ -3177,6 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristite hladnije boje prikaza"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Isključite ekran kako biste primijenili promjenu boje"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Da primijenite promjenu na nadzoru telefonije, ponovo pokrenite uređaj"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatsko ažuriranje sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (potrebno je ponovo pokrenuti)"</string>
     <string name="usage" msgid="2977875522080448986">"Upotreba"</string>
@@ -3358,6 +3353,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da provjerite obavještenja, prevucite prema dolje na senzoru otiska prsta na poleđini telefona."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da provjerite obavještenja, prevucite prema dolje na senzoru otiska prsta na poleđini tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da provjerite obavještenja, prevucite prema dolje na senzoru otiska prsta na poleđini uređaja."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Pokret za pomoć"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3425,12 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globalno postavljanje za HTTP proksi"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrator može zaključati uređaj i postaviti novu lozinku"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator može izbrisati sve podatke iz uređaja"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaj upisivanja lozinke prije brisanja svih podataka s uređaja</item>
+      <item quantity="few">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaja upisivanja lozinke prije brisanja svih podataka s uređaja</item>
+      <item quantity="other">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaja upisivanja lozinke prije brisanja svih podataka s uređaja</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaj upisivanja lozinke prije brisanja podataka radnog profila</item>
+      <item quantity="few">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaja upisivanja lozinke prije brisanja podataka radnog profila</item>
+      <item quantity="other">Administrator je odredio maksimalno <xliff:g id="COUNT_1">%d</xliff:g> pokušaja upisivanja lozinke prije brisanja podataka radnog profila</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Ovim uređajem se upravlja."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saznajte više"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotografije i videozapisi"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzika i zvuk"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fajlovi"</string>
@@ -3441,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj pohranom: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Isključeno"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Uključeno"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio fajlovi"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacija za automatsko popunjavanje"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b0b9d32..31ef87b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicació"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Seguretat i bloqueig de pantalla"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptació i credencials"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Defineix La meva ubicació, el desbloqueig de pantalla i el bloqueig d\'emmagatzematge de credencials"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Contrasenyes"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privadesa"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Opció desactivada per l\'administrador"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Estat de seguretat"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Ubicació, empremta digital"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Selecciona una xarxa Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"S\'està activant la Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"S\'està desactivant la Wi-Fi..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Mostra totes les xarxes"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"La banda de 5 GHz no està disponible en aquest país"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"En mode d\'avió"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Compartició de xarxa per Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Compartició de xarxa"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Compartició de xarxa"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Punt d\'accés Wi-Fi i compartició de xarxa activats"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Punt d\'accés Wi-Fi activat"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Compartició de xarxa"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"No es pot compartir la xarxa ni utilitzar punts d\'accés Wi-Fi mentre la funció Economitzador de dades està activada"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Compartició de xarxa per USB"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"El mateix bloqueig de pantalla que el del dispositiu"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestiona les aplicacions"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestiona i elimina les aplicacions instal·lades"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informació de l\'aplicació"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gestiona les aplicacions i configura les dreceres d\'inici ràpid"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuració de l\'aplicació"</string>
     <string name="install_applications" msgid="4872012136210802181">"Orígens desconeguts"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Gestiona l\'espai"</string>
     <string name="filter" msgid="2018011724373033887">"Filtra"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Selecció d\'opcions de filtre"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Totes"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Desactivades"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Totes les aplicacions"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Aplicacions desactivades"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Baixades"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En execució"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Emmagatzematge USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"A la targeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desactivat"</string>
     <string name="not_installed" msgid="2797554494953450291">"No instal·lada per a l\'usuari"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instal·lada"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hi ha aplicacions."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Emmagatzematge intern"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"emmagatzematge intern"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Configura els mètodes d\'introducció"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Configuració"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Configuració"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Mètodes d\'introducció actius"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Utilitza els idiomes del sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configuració de: <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Selecciona mètodes d\'introducció actius"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuració del teclat en pantalla"</string>
@@ -1705,7 +1698,7 @@
     <string name="usage_time_label" msgid="295954901452833058">"Temps d\'ús"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilitat"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuració d\'accessibilitat"</string>
-    <string name="accessibility_settings_summary" msgid="6654271785747778959">"Lectors de pantalla, àudio, pantalla i controls d\'interacció"</string>
+    <string name="accessibility_settings_summary" msgid="6654271785747778959">"Lectors de pantalla, àudio, pantalla, controls d\'interacció"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuració de visió"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Pots personalitzar el dispositiu perquè s\'adapti a les teves necessitats. Aquestes funcions d\'accessibilitat es poden canviar més endavant des de Configuració."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Serveis"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualitza ampliació automàticament"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualitza augment pantalla a transicions aplic."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"El botó d\'engegada penja"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Pronuncia contrasenyes"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Punter de ratolí gran"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Àudio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combina els canals en reproduir àudio"</string>
@@ -1837,7 +1829,11 @@
     <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> per completar la càrrega"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Ús des de l\'última càrrega completa"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Ús de la pantalla"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consum de la pantalla"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Cerca de xarxes de telefonia mòbil"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Ús de les aplicacions des de l\'última càrrega completa"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Ús del dispositiu des de l\'última càrrega completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ús de la bateria des que s\'ha desconnectat"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Ús de la bateria des que s\'ha restablert"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> utilitzant bateria"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consum d\'energia comptabilitzat més d\'una vegada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"S\'ha utilitzat durant %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s d\'ús de la bateria"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Desglossament de l\'ús des de l\'última càrrega completa"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Temps estimat restant"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Temps per acabar de carregar"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"El temps estimat pot variar en funció de l\'ús"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> des de la desconnexió"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Mentre es va desconnectar per darrera vegada durant <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totals d\'ús"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"VPN sempre activada: opció no activada"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"No compatible amb aquesta aplicació"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Permet només connexions mitjançant VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"La connexió VPN ha de ser obligatòria?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"El bloqueig està actiu"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"El bloqueig està inactiu"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona un perfil de VPN per estar-hi sempre connectat. El trànsit de la xarxa només es permetrà quan estiguis connectat a aquesta VPN."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Els perfils restringits no poden afegir comptes."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Suprimeix <xliff:g id="USER_NAME">%1$s</xliff:g> del dispositiu"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Configuració de la pantalla de bloqueig"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Afegeix usuaris des de la pantalla de bloqueig"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Usuari nou"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Perfil nou"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Et vols suprimir a tu mateix?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vols activar les trucades i els SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historial de trucades i de SMS es compartirà amb aquest usuari."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informació d\'emergència"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informació sobre <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informació i contactes de: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permet aplicacions i contingut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacions amb restriccions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Desplega configuració aplicació"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">Mostra %d elements amagats</item>
       <item quantity="one">Mostra %d element amagat</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Xarxa i Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mòbil, ús de dades, punt d\'accés Wi-Fi"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Xarxa i Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mòbil, ús de dades i punt d\'accés Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositius connectats"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, emissió"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacions i notificacions"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Usuari i comptes"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicacions predeterminades"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Idiomes, còpia de seguretat, actualitzacions, informació sobre el telèfon"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Idiomes, còpia de seguretat, actualitzacions i informació del dispositiu"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuració"</string>
     <string name="search_menu" msgid="6283419262313758339">"Configuració de la cerca"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Configuració de la cerca"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultats"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, connexió de xarxa"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"missatge de text, enviar missatges, missatges, missatgeria"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mòbil, operador de telefonia mòbil, sense fil, dades, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"telèfon, mòbil, operador de telefonia mòbil, sense fil, dades, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, trucar, trucades"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"pantalla, pantalla tàctil"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibració"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Sons d\'inici"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Preferències per a No molesteu"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Només amb prioritat"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regles automàtiques"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Configura horari de No molesteu"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"So de notificació prof. pred."</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"So d\'alarma professional pred."</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Igual que al perfil personal"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Subst. sons del perfil prof.?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Vols utilitzar els sons del perfil personal?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Substitueix"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"El sons actuals del teu perfil professional se substituiran pels del perfil personal"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"S\'utilitzaran els sons del perfil personal en lloc dels sons del perfil professional actual"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Sons de trucada"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Vibracions i altres sons"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Preferències de notificació"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"No s\'ha concedit cap permís"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"No s\'ha sol·licitat cap permís"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Totes les aplicacions"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Activades"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Aplicacions instal·lades"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Aplicacions instantànies"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personals"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Professionals"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloquejades"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Amb URL del domini"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançada"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configura aplicacions"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicació desconeguda"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Predeterminada per a la feina"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistència i entrada veu"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplicació d\'assistència"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Cap"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Tria l\'aplicació d\'assistència"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Vols que <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> sigui l\'assistent?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"L\'assistent podrà llegir informació sobre les aplicacions que s\'utilitzen al teu sistema; també podrà accedir a la informació que es veu a la teva pantalla o a què accedeixes des de les aplicacions."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Accepta"</string>
@@ -2966,6 +2958,8 @@
     <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">"Optimització de la bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'ús"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Mostra totes les aplicacions"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Amaga aplicacions addicionals"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"No optimitzen la bateria"</string>
     <string name="high_power_on" msgid="6216293998227583810">"No optimitzen la bateria"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimitza l\'ús de la bateria"</string>
@@ -3042,17 +3036,17 @@
     <string name="app_list_preference_none" msgid="108006867520327904">"Cap"</string>
     <string name="work_profile_usage_access_warning" msgid="8870622842216566692">"Encara que es desactivi l\'accés a l\'ús d\'aquesta aplicació, l\'administrador podrà continuar fent el seguiment de les aplicacions del perfil professional."</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"Caràcters utilitzats: <xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="draw_overlay_title" msgid="4003905926278954971">"Aplic. que poden dibuixar sobre altres aplic."</string>
-    <string name="draw_overlay" msgid="9078696044299199938">"Dibuixa a sobre d\'aplicacions"</string>
-    <string name="system_alert_window_settings" msgid="1757821151143694951">"Dibuixa a sobre d\'altres aplicacions"</string>
+    <string name="draw_overlay_title" msgid="4003905926278954971">"Aplicacions que poden superposar-se"</string>
+    <string name="draw_overlay" msgid="9078696044299199938">"Superposa a altres aplicacions"</string>
+    <string name="system_alert_window_settings" msgid="1757821151143694951">"Superposa a altres aplicacions"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Aplicacions"</string>
-    <string name="system_alert_window_access_title" msgid="8811695381437304132">"Dibuixa a sobre d\'altres aplicacions"</string>
+    <string name="system_alert_window_access_title" msgid="8811695381437304132">"Superposa a altres aplicacions"</string>
     <string name="permit_draw_overlay" msgid="6606018549732046201">"Permet la superposició d\'aplicacions"</string>
     <string name="app_overlay_permission_preference" msgid="8355410276571387439">"Permís de l\'aplicació per dibuixar a sobre"</string>
     <string name="allow_overlay_description" msgid="7895191337585827691">"Amb aquest permís l\'aplicació es pot mostrar sobre les altres aplicacions que utilitzes i pot interferir amb l\'ús que fas de la interfície en altres aplicacions o canviar el que penses que estàs veient en altres aplicacions."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"RV realitat virtual processador estèreo servei ajuda"</string>
     <string name="keywords_system_alert_window" msgid="8579673659566564926">"finestra de diàleg d\'alerta del sistema per dibuixar sobre altres aplicacions"</string>
-    <string name="overlay_settings" msgid="222062091489691363">"Dibuixa sobre altres aplicac."</string>
+    <string name="overlay_settings" msgid="222062091489691363">"Superposa a altres aplicacions"</string>
     <string name="system_alert_window_summary" msgid="4268867238063922290">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicacions tenen permís per dibuixar sobre aplicacions"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicacions amb permís"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Sí"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de color freda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilitza colors de pantalla més freds"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Desactiva la pantalla per aplicar el canvi de color"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Per aplicar canvis al monitor de telefonia, reinicia el dispositiu"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualitzacions del sistema automàtiques"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (s\'ha de reiniciar)"</string>
     <string name="usage" msgid="2977875522080448986">"Ús"</string>
@@ -3323,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Per consultar les notificacions, llisca el dit cap avall al sensor d\'empremtes digitals de la part posterior del telèfon."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Per consultar les notificacions, llisca el dit cap avall al sensor d\'empremtes digitals de la part posterior de la tauleta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Per consultar les notificacions, llisca el dit cap avall al sensor d\'empremtes digitals de la part posterior del dispositiu."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Gest per obrir Assistència"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Activat"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Desactivat"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"El bootloader ja està desbloquejat"</string>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"S\'ha definit el servidor intermediari HTTP global"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"L\'administrador pot bloquejar el dispositiu i restablir-ne la contrasenya"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"L\'administrador pot suprimir totes les dades del dispositiu"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">L\'administrador ha establert en <xliff:g id="COUNT_1">%d</xliff:g> el nombre màxim d\'intents per introduir la contrasenya abans que se suprimeixin totes les dades del dispositiu</item>
+      <item quantity="one">L\'administrador ha establert en <xliff:g id="COUNT_0">%d</xliff:g> el nombre màxim d\'intents per introduir la contrasenya abans que se suprimeixin totes les dades del dispositiu</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">L\'administrador ha establert en <xliff:g id="COUNT_1">%d</xliff:g> el nombre màxim d\'intents per introduir la contrasenya abans que se suprimeixin les dades del perfil professional</item>
+      <item quantity="one">L\'administrador ha establert en <xliff:g id="COUNT_0">%d</xliff:g> el nombre màxim d\'intents per introduir la contrasenya abans que se suprimeixin les dades del perfil professional</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Aquest és un dispositiu gestionat."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> gestiona aquest dispositiu."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Més informació"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos i vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música i àudio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jocs"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Altres aplicacions"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fitxers"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestor d\'emmagatzematge: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desactivat"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activat"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jocs"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fitxers d\'àudio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstal·lat per a <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desactivat per a <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplicació d\'emplenament automàtic"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d9cf5c0..27c799e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -334,9 +334,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Účty"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Zabezpečení a zámek obrazovky"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrování a identifikační údaje"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Hesla"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Ochrana soukromí"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Zakázáno administrátorem"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Stav zabezpečení"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Poloha, otisky prstů"</string>
@@ -1446,8 +1447,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Stejný jako zámek obrazovky zařízení"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovat aplikace"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Umožňuje spravovat a odebírat instalované aplikace"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informace o aplikaci"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Správa aplikací a klávesových zkratek rychlého spuštění"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Nastavení aplikace"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznámé zdroje"</string>
@@ -1509,16 +1509,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Správa paměti"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrovat"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Vyberte možnosti filtru"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Vše"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Deaktivované"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Všechny aplikace"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Deaktivované aplikace"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Stažené"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Spuštěné"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Úložiště USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na kartě SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktivováno"</string>
     <string name="not_installed" msgid="2797554494953450291">"Pro tohoto uživ. nenainstal."</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Nainstalováno"</string>
     <string name="no_applications" msgid="7336588977497084921">"Žádné aplikace"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interní úložiště"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"interní úložiště"</string>
@@ -1696,8 +1695,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Nastavit metody zadávání"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Nastavení"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Nastavení"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktivní metody zadávání"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Použít systémové jazyky"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Nastavení modulu <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Vybrat aktivní metody zadávání"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavení softwarové klávesnice"</string>
@@ -1741,7 +1738,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automaticky aktualizovat přiblížení"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aktual. přiblížení obrazovky při přepnutí aplikací"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Vypínač ukončí hovor"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Vyslovovat hesla"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Velký kurzor myši"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Zvuk mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Při přehrávání zvuku kombinovat kanály"</string>
@@ -1867,7 +1863,11 @@
     <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">"Zbývá <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 nabití"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Použití od posledního úplného nabití"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Využití obrazovky"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Spotřeba obrazovky"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Vyhledávání mobilních sítí"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Využití aplikací od posledního úplného nabití"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Využití zařízení od posledního úplného nabití"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využití baterie od odpojení"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Využití baterie od obnovení"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Provoz na baterii: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1957,8 +1957,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadhodnocení spotřeby energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Doba používání: %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s celkové kapacity baterie"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Přehled využití od posledního úplného nabití"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Odhadovaný zbývající čas"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Čas do úplného nabití"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Odhad se může změnit podle používání"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojení"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Při posledním odpojení pro <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2350,6 +2352,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Trvalé zapnutí není aktivováno"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Aplikace tuto funkci nepodporuje"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Povolit pouze připojení přes VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Vyžadovat připojení VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Uzamknutí je aktivní"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Uzamknutí není aktivní"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vyberte profil VPN, ke kterému chcete zůstat trvale připojeni. Síťový provoz bude povolen pouze v případě, že budete připojeni k této síti VPN."</string>
@@ -2443,8 +2446,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Pomocí omezených profilů nelze přidávat účty."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Smazat <xliff:g id="USER_NAME">%1$s</xliff:g> ze zařízení"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Nastavení obrazovky uzamčení"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Přidání uživatele z obrazovky uzamčení"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nový uživatel"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nový profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcete se smazat?"</string>
@@ -2472,7 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Zapnout telefonní hovory a SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"S tímto uživatelem bude sdílena historie hovorů a SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Nouzové informace"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informace o uživateli <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informace a kontakty uživatele <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Povolit aplikace a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikace s omezením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbalit nastavení aplikace"</string>
@@ -2594,8 +2596,8 @@
       <item quantity="other">Zobrazit %d skrytých položek</item>
       <item quantity="one">Zobrazit %d skrytou položku</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Síť a internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobilní data, využití dat, sdílení datového připojení"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Síť a internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilní data, využití dat, sdílení datového připojení"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Připojená zařízení"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, odesílání"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikace a oznámení"</string>
@@ -2611,7 +2613,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Výsledky"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, síť, připojení"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"textová zpráva, posílání SMS, zprávy, odesílání zpráv"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobilní síť, mobilní operátor, bezdrátové, data, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilní síť, mobilní operátor, mobilní data, bezdrátové, data, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, hovor, volání"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"displej, dotyková obrazovka"</string>
@@ -2687,8 +2689,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozornění"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrace"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Zvuky při spouštění"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Nastavení režimu Nerušit"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Pouze prioritní"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatická pravidla"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Nastavit plán režimu Nerušit"</string>
@@ -2705,9 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Výchozí tón prac. oznámení"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Výchozí tón prac. budíku"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Stejné jako v osobním profilu"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Nahradit zvuky prac. profilu?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Použít zvuky osobního profilu?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Nahradit"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Zvuky aktuálního pracovního profilu budou nahrazeny zvuky z osobního profilu"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Místo zvuků aktuálního pracovního profilu budou použity zvuky osobního profilu"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Vyzváněcí tóny"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Další zvuky a vibrace"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Nastavení oznámení"</string>
@@ -2955,11 +2956,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nebyla udělena žádná oprávnění"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nevyžaduje žádná oprávnění"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Všechny aplikace"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Zapnuto"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Nainstalované aplikace"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Okamžité aplikace"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobní"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Práce"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokované"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S adresami URL domény"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšířená nastavení"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurace aplikací"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznámá aplikace"</string>
@@ -2986,8 +2987,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Výchozí pracovní"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Asistence a hlasové zadávání"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Asistenční aplikace"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Žádné"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Zvolte asistenční aplikaci"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Chcete <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> nastavit jako svého asistenta?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Asistent bude moci číst informace o aplikacích používaných v systému, včetně údajů viditelných na obrazovce a přístupných v rámci aplikací."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Souhlasím"</string>
@@ -3017,6 +3016,8 @@
     <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">"Optimalizace výdrže bat."</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozornění na využití"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Zobrazit všechny aplikace"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Skrýt aplikace navíc"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimalizováno"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimalizováno"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimalizace využívání baterie"</string>
@@ -3201,6 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Studené barvy"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Použijí se studenější barvy zobrazení"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Chcete-li změnu barev použít, vypněte obrazovku"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Chcete-li použít změnu sledování telefonních služeb, restartujte zařízení"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizace systému"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Navázané moduly HAL (vyžaduje restart)"</string>
     <string name="usage" msgid="2977875522080448986">"Využití"</string>
@@ -3386,6 +3388,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně telefonu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně tabletu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně zařízení."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto asistence"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Zapnuto"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Vypnuto"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Zavaděč je již odemknut"</string>
@@ -3459,12 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globální proxy server protokolu HTTP je nastaven"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrátor může zařízení uzamknout a resetovat heslo"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrátor může smazat všechna data v zařízení"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="few">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusy o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data v zařízení.</item>
+      <item quantity="many">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusu o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data v zařízení.</item>
+      <item quantity="other">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusů o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data v zařízení.</item>
+      <item quantity="one">Administrátor nastavil maximálně <xliff:g id="COUNT_0">%d</xliff:g> pokus o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data v zařízení.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="few">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusy o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data pracovního profilu.</item>
+      <item quantity="many">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusu o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data pracovního profilu.</item>
+      <item quantity="other">Administrátor nastavil maximálně <xliff:g id="COUNT_1">%d</xliff:g> pokusů o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data pracovního profilu.</item>
+      <item quantity="one">Administrátor nastavil maximálně <xliff:g id="COUNT_0">%d</xliff:g> pokus o zadání hesla. Pokud heslo nezadáte správně, budou vymazána veškerá data pracovního profilu.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Toto zařízení je spravováno."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Toto zařízení je spravováno organizací <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Další informace"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotky a videa"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Hudba a zvuk"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Hry"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Další aplikace"</string>
     <string name="storage_files" msgid="8581083146777364063">"Soubory"</string>
@@ -3475,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Správce úložiště: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Vypnuto"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Zapnuto"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Hry"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Zvukové soubory"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Hudba"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(pro uživatele <xliff:g id="USER">%s</xliff:g> odinstalováno)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(pro uživatele <xliff:g id="USER">%s</xliff:g> nedostupné)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikace na automatické vyplňování"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index df22904..e0ccc18 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Placering"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Sikkerhed og skærmlås"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Kryptering og loginoplysninger"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låst SIM-kort og lager for loginoplysninger"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, lager for loginoplysninger"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Adgangskoder"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privatliv"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Deaktiveret af administratoren"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Sikkerhedsstatus"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Placering, fingeraftryk"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Den samme som enhedens skærmlås"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerede apps"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Oplysninger om appen"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrer apps, konfigurer genveje til hurtig start"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Indstillinger for app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukendte kilder"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Administrer plads"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Vælg filtreringsmuligheder"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Deaktiveret"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Alle apps"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Deaktiverede apps"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Downloads"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kørende"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lager"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktiveret"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ikke installeret for denne bruger"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Installeret"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ingen apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagerplads"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"intern lagerplads"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Konfigurer inputmetoder"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Indstillinger"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Indstillinger"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktive inputmetoder"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Brug systemsprogene"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-indstillinger"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Vælg aktive inputmetoder"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Indstillinger for skærmens tastatur"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Opdater skærmforstørrelse automatisk"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Opdater skærmforstørrelsen på appovergange"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Afbryderknap afslutter opkald"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Oplæs adgangskoder"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Stor musemarkør"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monolyd"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombiner kanaler ved afspilning af lyd"</string>
@@ -1833,7 +1829,11 @@
     <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> tilbage"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> til batteriet er opladt"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Forbrug siden sidste fulde opladning"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Skærmtid"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Skærmens strømforbrug"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Scanning af mobilnetværk"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Appforbrug siden sidste fulde opladning"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Brug af enheden siden sidste fulde opladning"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriforbrug siden afbrydelse"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteriforbrug siden nulstilling"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> på batteri"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overvurderet strømforbrug"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Brugt i %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s af den samlede batteritid"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Oversigt over forbrug siden sidste fulde opladning"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Estimeret resterende tid"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tid til fuld opladning"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Estimeringen kan ændre sig afhængigt af forbrug"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden afbrydelse"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siden sidste afbrydelse for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2080,7 +2082,7 @@
     <string name="adding_profile_owner_warning" msgid="8081841501073689534">"Hvis du fortsætter, vil din bruger blive styret af din administrator, som også kan gemme tilknyttet data ud over dine personlige data.\n\nDin administrator har mulighed for at overvåge og administrere indstillinger, adgang, apps og data, der er knyttet til denne bruger, herunder netværksaktivitet og enhedens stedoplysninger."</string>
     <string name="admin_disabled_other_options" msgid="4564776259414246934">"Andre valgmuligheder er deaktiveret af din administrator."</string>
     <string name="admin_more_details" msgid="7901420667346456102">"Flere oplysninger"</string>
-    <string name="untitled_apn" msgid="1230060359198685513">"Ikke-navngivet"</string>
+    <string name="untitled_apn" msgid="1230060359198685513">"Unavngivet"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Generelt"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"Underretningslogfil"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ringetone og vibration ved opkald"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Altid slået til er deaktiveret"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Dette understøttes ikke af denne app"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Tillad kun forbindelser via VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Vil du kræve VPN-forbindelse?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Lukning er aktiveret"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Lukning er ikke aktiveret"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vælg en VPN-profil, der altid skal være forbindelse til. Netværkstrafik tillades kun, når der er forbindelse til dette VPN-netværk."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Begrænsede profiler kan ikke tilføje konti"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Slet <xliff:g id="USER_NAME">%1$s</xliff:g> fra denne enhed"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Lås skærmindstillinger"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Tilføj brugere fra låseskærmen"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Ny bruger"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Ny profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vil du slette dig selv?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vil du aktivere telefonopkald og sms?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Opkalds- og sms-historikken deles med denne bruger."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Oplysninger i nødsituationer"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Oplysninger om <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Oplysninger og kontaktpersoner for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillad apps og indhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applikationer med begrænsninger"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Udvid indstillingerne for applikationen"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="one">Vis %d skjult element</item>
       <item quantity="other">Vis %d skjulte elementer</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Netværk og internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobildata, dataforbrug, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Netværk &amp; internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, dataforbrug, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Tilsluttede enheder"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, cast-funktion"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps og underretninger"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultater"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, netværksforbindelse"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"sms, sende sms-beskeder, beskeder, chat"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobil, mobilselskab, trådløs, data, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobil, mobilselskab, trådløs, data, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, ring op, opkald"</string>
     <string name="keywords_home" msgid="3626170808219458848">"starter"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skærm, touchskærm"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Advarsel"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrer"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Aktivér lyde"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Præferencer for Forstyr ikke"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritet tillader kun"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Konfigurer Forstyr ikke-plan"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Standardtone for arbejdsunderretninger"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Standardringetone for arbejdsalarmer"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Samme som din private profil"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Erstat lyde for arbejdsprofil?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Vil du bruge lydene fra din private profil?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Erstat"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Dine aktuelle lyde for din arbejdsprofil erstattes af lydene fra din private profil"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Dine aktuelle lyde for din arbejdsprofil erstattes af lydene fra din private profil"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Ringetoner"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Andre lyde og vibrationer"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Underretningsindstillinger"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Der er ikke givet nogen tilladelser"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Der er ikke anmodet om nogen tilladelser"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle apps"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Aktiveret"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Installerede aps"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant apps"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personlig"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Arbejde"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeret"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med domænets webadresser"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanceret"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurer apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukendt app"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Standard til arbejdet"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistance og indtaling"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Assistanceapp"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ingen"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Vælg assistanceapp"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Gør <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> til din assistent?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Assistenten kan læse oplysninger om, hvilke apps der bruges på dit system, herunder oplysninger, der er synlige på din skærm eller tilgængelige i appsene."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Acceptér"</string>
@@ -2959,6 +2958,8 @@
     <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">"Batterioptimering"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Underretninger om forbrug"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Vis alle apps"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Skjul ekstra apps"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ikke-optimeret"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ikke-optimeret"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimeret batteriforbrug"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kølig farvetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Brug køligere skærmfarver"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Du skal slå skærmen fra, før du kan anvende farveændringer"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Genstart enheden for at anvende ændringen i forbindelse med Overvågning af telefoni"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiske systemopdateringer"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Gruppér HAL\'er i mappe (kræver genstart)"</string>
     <string name="usage" msgid="2977875522080448986">"Forbrug"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af telefonen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af din tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af enheden."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Forslagsbevægelse"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Til"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Fra"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloaderen er allerede låst op"</string>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy er konfigureret"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratoren kan låse enheden og nulstille adgangskoden"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratoren kan slette alle data på enheden"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Administratoren har indstillet det maksimale antal adgangskodeforsøg til <xliff:g id="COUNT_1">%d</xliff:g>, hvorefter alle enhedens data slettes</item>
+      <item quantity="other">Administratoren har indstillet det maksimale antal adgangskodeforsøg til <xliff:g id="COUNT_1">%d</xliff:g>, hvorefter alle enhedens data slettes</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Administratoren har indstillet det maksimale antal adgangskodeforsøg til <xliff:g id="COUNT_1">%d</xliff:g>, hvorefter data for arbejdsprofilen slettes</item>
+      <item quantity="other">Administratoren har indstillet det maksimale antal adgangskodeforsøg til <xliff:g id="COUNT_1">%d</xliff:g>, hvorefter data for arbejdsprofilen slettes</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Dette er en administreret enhed."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Denne enhed administreres af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Få flere oplysninger"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Billeder og videoer"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musik og lyd"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Spil"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andre apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Filer"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagerstyring: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Fra"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Til"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Spil"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Lydfiler"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(afinstalleret for brugeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(deaktiveret for brugeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Autofyld-app"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5f30bea..06fafdf 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -329,9 +329,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Standort"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konten"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Sicherheit &amp; Displaysperre"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Verschlüsselung &amp; Anmeldedaten"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldedatenspeicher festlegen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Passwörter"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Datenschutz"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Vom Administrator deaktiviert"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Sicherheitsstatus"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Standort, Fingerabdruck"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Identisch mit Displaysperre des Geräts"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installierte Apps verwalten und entfernen"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"App-Info"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Apps verwalten, Tastenkombinationen für Schnellstart festlegen"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"App-Einstellungen"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unbekannte Herkunft"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Speicherplatz verwalten"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filteroptionen auswählen"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Deaktiviert"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Alle Apps"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Deaktivierte Apps"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Heruntergeladen"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Aktiv"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-Speicher"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Auf SD-Karte"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktiviert"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nicht für Nutzer installiert"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Installiert"</string>
     <string name="no_applications" msgid="7336588977497084921">"Keine Apps"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interner Speicher"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"interner Speicher"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Eingabemethoden festlegen"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Einstellungen"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Einstellungen"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktive Eingabemethoden"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Systemsprache verwenden"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-Einstellungen"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Aktive Eingabemethoden auswählen"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Einstellungen der Bildschirmtastatur"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Vergrößerung autom. aktualisieren"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Vergrößerung bei App-Übergängen aktualisieren"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Ein/Aus beendet Anruf"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Passwörter aussprechen"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Großer Mausanzeiger"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono-Audio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kanäle bei der Audiowiedergabe verbinden"</string>
@@ -1833,7 +1829,11 @@
     <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">"Noch <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Verbleibende Ladezeit: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Verbrauch seit letztem vollen Aufladen"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Displaynutzung"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Displayverbrauch"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobilfunknetzsuche"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"App-Verbrauch seit der letzten vollständigen Aufladung"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Gerätenutzung seit der letzten vollständigen Aufladung"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkuverbrauch seit dem Ausstecken"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akkuverbrauch seit dem Zurücksetzen"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> mit Akku"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zu hoch berechneter Stromverbrauch"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Nutzungsdauer: %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s des gesamten Akkuverbrauchs"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Aufschlüsselung des Verbrauchs seit dem letzten vollen Aufladen"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Geschätzte verbleibende Akkulaufzeit"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Verbleibende Zeit, bis das Gerät vollständig geladen ist"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Schätzung der Akkulaufzeit kann sich je nach Nutzung ändern"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> seit dem Ausstecken"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Seit dem letzten Ausstecken für <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Durchgehend aktives VPN nicht aktiv"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Von dieser App nicht unterstützt"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Verbindungen nur über VPN zulassen"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN-Verbindung erforderlich?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Sperrung aktiv"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Sperrung inaktiv"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Wähle ein VPN-Profil für eine durchgehende Verbindung aus. Netzwerkverkehr ist nur möglich, wenn eine Verbindung zu diesem VPN besteht."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"In eingeschränkten Profilen können keine Konten hinzugefügt werden."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> vom Gerät löschen"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Einstellungen für den Sperrbildschirm"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Nutzer vom Sperrbildschirm hinzufügen"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Neuer Nutzer"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Neues Profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Sich selbst löschen?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Anrufe &amp; SMS aktivieren?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Anrufliste und SMS-Verlauf werden für diesen Nutzer freigegeben."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Notfallinformationen"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Weitere Informationen zu <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informationen und Kontakte für <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Apps und Inhalte zulassen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps mit Einschränkungen"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"App-Einstellungen erweitern"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">%d ausgeblendete Elemente anzeigen</item>
       <item quantity="one">%d ausgeblendetes Element anzeigen</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Netzwerk &amp; Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"WLAN, Mobilfunknetz, Datennutzung, Hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Netzwerk &amp; Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"WLAN, mobil, datennutzung, daten nutzung, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Verbundene Geräte"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, Streaming"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; Benachrichtigungen"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Ergebnisse"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wlan, netzwerkverbindung"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"textnachricht, sms, sms schicken, sms senden, nachrichten, mms"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobilfunk, mobilfunkanbieter, kabellos, drahtlos, daten, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilfunk, mobil, mobilfunkanbieter, kabellos, drahtlos, daten, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wlan, anruf, anrufen, anrufe über wlan"</string>
     <string name="keywords_home" msgid="3626170808219458848">"übersicht launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"bildschirm, display, touchscreen"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Warnung"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibration"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Töne beim Hochfahren"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Einstellungen für \"Bitte nicht stören\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Nur wichtige Unterbr. zulassen"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatische Regeln"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"\"Nicht stören\" einrichten"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Standard-Benachrichtigungston für Arbeitsprofil"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Standard-Weckton für Arbeitsprofil"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Dieselben wie beim persönlichen Profil"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Töne für Arbeitsprofil ersetzen?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Töne des persönlichen Profil verwenden?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Ersetzen"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Deine aktuellen Töne für das Arbeitsprofil werden durch die Töne für das persönliche Profil ersetzt"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Statt der aktuellen Töne deines Arbeitsprofils werden die Töne deines persönlichen Profils verwendet"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Klingeltöne"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Andere Töne und Vibrationen"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Benachrichtigungseinstellungen"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Keine Berechtigungen gewährt"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Keine Berechtigungen angefordert"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle Apps"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Aktiviert"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Installierte Apps"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant-Apps"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Nutzer"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Arbeit"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blockiert"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Mit Domain-URLs"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Erweitert"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Apps konfigurieren"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unbekannte App"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Standardeinstellung für Arbeit"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistent &amp; Spracheingabe"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Assistent-App"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Keine"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Assistent-App auswählen"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> als Assistenten festlegen?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Der Assistent kann Informationen zu Apps abrufen, die du auf deinem System verwendest, einschließlich Informationen, die auf deinem Bildschirm angezeigt werden oder die in Apps zugänglich sind."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Zustimmen"</string>
@@ -2959,6 +2958,8 @@
     <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">"Akku-Leistungsoptimierung"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Akkuwarnung"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Alle Apps anzeigen"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Weitere Apps ausblenden"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nicht optimiert"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nicht optimiert"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akkuverbrauch optimiert"</string>
@@ -3141,6 +3142,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kalte Farbtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kältere Displayfarben verwenden"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Deaktiviere den Bildschirm, um die neue Farbeinstellung zu übernehmen"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Gerät neu starten, damit die Änderungen bei Telephony Monitor wirksam werden"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatische Systemupdates"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Gebundene HALs (Neustart erforderlich)"</string>
     <string name="usage" msgid="2977875522080448986">"Nutzung"</string>
@@ -3318,6 +3320,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Smartphones über den Fingerabdrucksensor nach unten wischst."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Tablets über den Fingerabdrucksensor nach unten wischst."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Geräts über den Fingerabdrucksensor nach unten wischst."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Assistent-Bewegung"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"An"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Aus"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader ist bereits entsperrt"</string>
@@ -3379,12 +3383,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globaler HTTP-Proxy wurde eingerichet"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Der Administrator kann das Gerät sperren und das Passwort zurücksetzen"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Der Administrator kann alle Gerätedaten löschen"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Der Administrator lässt maximal <xliff:g id="COUNT_1">%d</xliff:g> falsche Passworteingaben zu. Bei Überschreitung dieser Anzahl werden alle Gerätedaten gelöscht.</item>
+      <item quantity="one">Der Administrator lässt maximal <xliff:g id="COUNT_0">%d</xliff:g> falsche Passworteingabe zu. Bei Überschreitung dieser Anzahl werden alle Gerätedaten gelöscht.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Der Administrator lässt maximal <xliff:g id="COUNT_1">%d</xliff:g> falsche Passworteingaben zu. Bei Überschreitung dieser Anzahl werden alle Daten des Arbeitsprofils gelöscht.</item>
+      <item quantity="one">Der Administrator lässt maximal <xliff:g id="COUNT_0">%d</xliff:g> falsche Passworteingabe zu. Bei Überschreitung dieser Anzahl werden alle Daten des Arbeitsprofils gelöscht.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Dieses Gerät wird verwaltet."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Dieses Gerät wird von <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> verwaltet."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Weitere Informationen"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos und Videos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musik und Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Spiele"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Weitere Apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Dateien"</string>
@@ -3395,9 +3409,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Speichermanager: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Aus"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"An"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Spiele"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiodateien"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(für Nutzer <xliff:g id="USER">%s</xliff:g> deinstalliert)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(für Nutzer <xliff:g id="USER">%s</xliff:g> deaktiviert)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"AutoFill-App"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 62724c0..c54cf94 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Τοποθεσία"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Λογαριασμοί"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Ασφάλεια και κλείδωμα οθόνης"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Κρυπτογράφηση και διαπιστευτήρια"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Κωδικοί πρόσβασης"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Απόρρητο"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Απενεργοποιήθηκε από το διαχειριστή"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Κατάσταση ασφάλειας"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Τοποθεσία, δακτυλικό αποτύπωμα"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Ίδιο με το κλείδωμα της οθόνης συσκευής"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Διαχείριση εφαρμογών"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Διαχείριση και κατάργηση εγκατεστημένων εφαρμογών"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Πληροφορίες εφαρμογής"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Διαχείριση εφαρμογών, ρύθμιση συντομεύσεων γρήγορης εκκίνησης"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ρυθμίσεις εφαρμογής"</string>
     <string name="install_applications" msgid="4872012136210802181">"Άγνωστες πηγές"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Διαχείριση χώρου"</string>
     <string name="filter" msgid="2018011724373033887">"Φίλτρο"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Επιλογές φίλτρου"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Όλα"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Απενεργοποιημένες"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Όλες τις εφαρμογές"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Απενεργοποιημένες εφαρμογές"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Η λήψη ολοκληρώθηκε"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Εκτελείται"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Αποθ. χώρος USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Στην κάρτα SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Απενεργοποιημένο"</string>
     <string name="not_installed" msgid="2797554494953450291">"Δεν εγκαταστ. για το χρήστη"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Εγκατεστημένη"</string>
     <string name="no_applications" msgid="7336588977497084921">"Δεν υπάρχουν εφαρμογές."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Εσ. αποθ. χώρος"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"εσωτερικός αποθηκευτικός χώρος"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Ρύθμιση μεθόδων εισαγωγής"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Ρυθμίσεις"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Ρυθμίσεις"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Ενεργές μέθοδοι εισαγωγής"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Χρήση γλωσσών συστήματος"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Ρυθμίσεις <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Επιλογή μεθόδων εισόδου"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ρυθμίσεις πληκτρολογίου οθόνης"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Αυτόματη ενημέρωση μεγέθυνσης οθόν."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ενημέρωση μεγέθυνσης οθόνης στις μεταβάσεις εφαρμ."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Το κουμπί λειτ. τερμ. την κλήση"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Εκφώνηση κωδικών πρόσβασης"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Μεγάλος δείκτης ποντικιού"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Μονοφωνικός ήχος"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Συνδυασμός καναλιών κατά την αναπαραγωγή ήχου"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Χρήση από την τελευταία πλήρη φόρτιση"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Χρήση οθόνης"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Κατανάλωση οθόνης"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Σάρωση δικτύου κινητής τηλεφωνίας"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Χρήση εφαρμογών από την τελευταία πλήρη φόρτιση"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Χρήση της συσκευής από την τελευταία πλήρη φόρτιση"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Χρήση μπαταρίας από τη στιγμή της αποσύνδεσης από την τροφοδοσία"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Χρήση μπαταρίας από τη στιγμή της επαναφοράς"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> με μπαταρία"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Υπερεκτίμηση χρήσης ισχύος"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Χρησιμοποιείται για %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s της συνολικής μπαταρίας"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Ανάλυση χρήσης από την τελευταία πλήρη φόρτιση"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Εκτιμώμενος υπολειπόμενος χρόνος"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Χρόνος για πλήρη φόρτιση"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Η εκτίμηση μπορεί να αλλάξει με βάση τη χρήση"</string>
     <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>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Ρύθμιση \"Πάντα ενεργό\" απενεργοποιημένη"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Δεν υποστηρίζεται από αυτήν την εφαρμογή"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Να επιτρέπονται μόνο συνδέσεις μέσω VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Να απαιτείται σύνδεση VPN;"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Το κλείδωμα είναι ενεργό"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Το κλείδωμα είναι ανενεργό"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Επιλέξτε ένα προφίλ VPN στο οποίο θα παραμένετε πάντα συνδεδεμένοι. Η κίνηση δικτύου θα επιτρέπεται μόνο κατά τη σύνδεση σε αυτό το VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Δεν είναι δυνατή η προσθήκη λογαριασμών από περιορισμένα προφίλ"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Διαγρ. <xliff:g id="USER_NAME">%1$s</xliff:g> από τη συσκ."</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Ρυθμίσεις κλειδώματος οθόνης"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Προσθήκη χρηστών από την οθόνη κλειδώματος"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Νέος χρήστης"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Νέο προφίλ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Διαγραφή του εαυτού σας;"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ενεργοποίηση τηλεφωνικών κλήσεων και SMS;"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Θα γίνει κοινή χρήση του ιστορικού κλήσεων και SMS με αυτόν το χρήστη."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Πληροφορίες έκτακτης ανάγκης"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Πληροφορίες σχετικά με τον χρήστη <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Πληροφορίες και επαφές για τον χρήστη <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Να επιτρέπονται εφαρμογές και περιεχόμενο"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Εφαρμογές με περιορισμούς"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Επέκταση ρυθμίσεων για εφαρμ."</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Εμφάνιση %d κρυφών στοιχείων</item>
       <item quantity="one">Εμφάνιση %d κρυφού στοιχείου</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Δίκτυο και διαδίκτυο"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, κινητή τηλεφωνία, χρήση δεδομένων, σημείο πρόσβασης Wi-Fi"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Δίκτυο και διαδίκτυο"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, δίκτυο κινητής τηλεφωνίας, χρήση δεδομένων, σημείο πρόσβασης Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Συνδεδεμένες συσκευές"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, μετάδοση"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Εφαρμογές και ειδοποιήσεις"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Αποτελέσματα"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, σύνδεση δικτύου"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"μήνυμα κειμένου, αποστολή SMS, μηνύματα, ανταλλαγή μηνυμάτων"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"δίκτυο κινητής τηλεφωνίας, εταιρεία κινητής τηλεφωνίας, ασύρματο, δεδομένα, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"δίκτυο κινητής τηλεφωνίας, εταιρεία κινητής τηλεφωνίας, ασύρματο, δεδομένα, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, καλώ, κλήση"</string>
     <string name="keywords_home" msgid="3626170808219458848">"λειτουργία εκκίνησης"</string>
     <string name="keywords_display" msgid="8910345814565493016">"οθόνη, οθόνη αφής"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Προειδοποίηση"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Δόνηση"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Ήχοι ενεργοποίησης"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Προτιμήσεις λειτουργίας \"Μην ενοχλείτε\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Μόνο προτεραιότητας"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Αυτόματοι κανόνες"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Ρύθμιση λειτ. \"Μην ενοχλείτε\""</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Προεπιλεγμ. ήχος ειδ. εργασίας"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Προεπιλεγμ. ήχος κλ. εργασίας"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Ίδιος με το προσωπικό προφίλ"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Αντικατάσταση ήχων προφίλ εργασίας;"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Να χρησιμοποιούνται οι ήχοι του προσωπικού προφίλ;"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Αντικατάσταση"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Οι τρέχοντες ήχοι του προφίλ εργασίας σας θα αντικατασταθούν με τους ήχους του προσωπικού προφίλ σας"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Οι τρέχοντες ήχοι του προφίλ εργασίας σας θα αντικατασταθούν από τους ήχους του προσωπικού προφίλ σας"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Ήχοι κλήσης"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Άλλοι ήχοι και δονήσεις"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Προτιμήσεις ειδοποιήσεων"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Δεν έχουν εκχωρηθεί δικαιώματα"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Δεν ζητήθηκαν δικαιώματα"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Όλες οι εφαρμογές"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Ενεργό"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Εγκατεστημένες εφαρμογές"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant Εφαρμογές"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Προσωπικό"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Εργασία"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Αποκλεισμένες"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Με διευθύνσεις URL τομέα"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Σύνθετες ρυθμίσεις"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Διαμόρφωση εφ/γών"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Άγνωστη εφαρμογή"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Προεπιλογή για εργασία"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Βοήθεια/φων/κές εντ."</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Βοηθητική εφαρμογή"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Κανένα"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Επιλογή εφαρμογής υποβοήθειας"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Θέλετε να ορίσετε την εφαρμογή <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ως βοηθό σας;"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Ο βοηθός θα μπορεί να διαβάσει πληροφορίες σχετικά με τις εφαρμογές που χρησιμοποιούνται στο σύστημά σας, συμπεριλαμβανομένων πληροφοριών που είναι ορατές στο σύστημά σας ή διαθέσιμες εντός των εφαρμογών."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Συμφωνώ"</string>
@@ -2959,6 +2958,8 @@
     <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">"Βελτιστοποίηση μπαταρίας"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Ειδοποιήσεις χρήσης"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Εμφάνιση όλων των εφαρμογών"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Απόκρυψη επιπλέον εφαρμογών"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Χωρίς βελτιστοποίηση"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Χωρίς βελτιστοποίηση"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Βελτιστοποίηση χρήσης μπαταρίας"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ψυχρή θερμοκρασία χρώματος"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Χρήση πιο ψυχρών χρωμάτων οθόνης"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Για να εφαρμόσετε μια αλλαγή στο χρώμα, απενεργοποιήστε την οθόνη"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Για να πραγματοποιήσετε αλλαγές στην παρακολούθηση τηλεφωνίας, επανεκκινήστε τη συσκευή"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Αυτόματες ενημερώσεις συστήματος"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL με βιβλιοδεσία (απαιτεί επανεκκίνηση)"</string>
     <string name="usage" msgid="2977875522080448986">"Χρήση"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Για να ελέγξετε τις ειδοποιήσεις σας, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων στο πίσω μέρος του τηλεφώνου."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Για να ελέγξετε τις ειδοποιήσεις σας, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων στο πίσω μέρος του tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Για να ελέγξετε τις ειδοποιήσεις σας, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων στο πίσω μέρος της συσκευής."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Κίνηση βοήθειας"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ο γενικός διακομιστής μεσολάβησης HTTP ορίστηκε"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Ο διαχειριστής μπορεί να κλειδώσει τη συσκευή και να επαναφέρει τον κωδικό πρόσβασης"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Ο διαχειριστής μπορεί να διαγράψει όλα τα δεδομένα της συσκευής"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Ο διαχειριστής όρισε τον μέγιστο αριθμό προσπαθειών εισαγωγής κωδικού πρόσβασης σε <xliff:g id="COUNT_1">%d</xliff:g> πριν από τη διαγραφή όλων των δεδομένων της συσκευής</item>
+      <item quantity="one">Ο διαχειριστής όρισε τον μέγιστο αριθμό προσπαθειών εισαγωγής κωδικού πρόσβασης σε <xliff:g id="COUNT_0">%d</xliff:g> πριν από τη διαγραφή όλων των δεδομένων της συσκευής</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"Αυτή η συσκευή είναι διαχειριζόμενη."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Τη συσκευή διαχειρίζεται ο οργανισμός <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Μάθετε περισσότερα"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Φωτογραφίες και βίντεο"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Μουσική και ήχος"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Παιχνίδια"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Άλλες εφαρμογές"</string>
     <string name="storage_files" msgid="8581083146777364063">"Αρχεία"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Διαχείριση αποθηκευτικού χώρου: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Ανενεργή"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ενεργή"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Παιχνίδια"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Αρχεία ήχου"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Μουσική"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(απεγκαταστάθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(απενεργοποιήθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Εφαρμογή αυτόματης συμπλήρωσης"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 76dd9c2..da57bfc 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Security &amp; screen lock"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption &amp; credentials"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Disabled by administrator"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Location, fingerprint"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Same as device screen lock"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"App info"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Manage apps, set up quick-launch shortcuts"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"App settings"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unknown sources"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Choose filter options"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"All"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Disabled"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"All apps"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Disabled apps"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Downloaded"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Running"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"On SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"Disabled"</string>
     <string name="not_installed" msgid="2797554494953450291">"Not installed for this user"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Installed"</string>
     <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Set up input methods"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Settings"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Settings"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Active input methods"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Use system languages"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> Settings"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Choose active input methods"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"On-screen keyboard settings"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto update screen magnification"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Update screen magnification on app transitions"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Power button ends call"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Speak passwords"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Large mouse cursor"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono audio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combine channels when playing audio"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Use since last full charge"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Screen usage"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"App usage since last full charge"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Device usage since last full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Battery use since reset"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> on battery"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Used for %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Usage breakdown since last full charge"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Estimated time left"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Time to full charge"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Estimation may change based on usage"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Always-on inactive"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Not supported by this app"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Only allow connections through VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Require VPN connection?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Lockdown active"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Lockdown inactive"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Restricted profiles cannot add accounts"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Delete <xliff:g id="USER_NAME">%1$s</xliff:g> from this device"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Lock screen settings"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Add users from lock screen"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"New user"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"New profile"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Delete yourself?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Turn on phone calls &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Call and SMS history will be shared with this user."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Emergency information"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Information about <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Info &amp; contacts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Show %d hidden items</item>
       <item quantity="one">Show %d hidden item</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Network &amp; Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobile, data usage, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Network &amp; Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, data usage, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Results"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wi-fi, Wi-Fi, network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"text message, texting, messages, messaging"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobile, mobile operator, wireless, data, 4G, 3G, 2G, LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobile, mobile operator, wireless, data, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wi-fi, Wi-Fi, call, calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"screen, touchscreen"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Power on sounds"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Do not disturb preferences"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Set Do Not Disturb schedule"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Default work notification tone"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Default work alarm ringtone"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Same as personal profile"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Replace work profile sounds?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Use personal profile sounds?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Replace"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Your current work profile sounds will be replaced with your personal profile sounds"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Your personal profile sounds will be used instead of your current work profile sounds"</string>
     <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="7447797716856573587">"Notification preferences"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"No permissions granted"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"No permissions requested"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"All apps"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Enabled"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Installed apps"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant apps"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocked"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configure apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Default for work"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assist &amp; voice input"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Assist app"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"None"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Choose Assist app"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Make <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> your assistant?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"The assistant will be able to read information about apps that are in use on your system, including information visible on your screen or accessible within the apps."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Agree"</string>
@@ -2959,6 +2958,8 @@
     <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">"Battery optimisation"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Show all apps"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Hide extra apps"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderised HALs (requires reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Assist gesture"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Admin can lock device and reset password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Admin can delete all device data"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting all device data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting all device data</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting work profile data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting work profile data</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"This device is managed."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Find out more"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Photos &amp; Videos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Music &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Files"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Off"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"On"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio files"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Music"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Auto-fill app"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f296d52..8c91a64 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Security &amp; screen lock"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption &amp; credentials"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Disabled by administrator"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Location, fingerprint"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Same as device screen lock"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"App info"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Manage apps, set up quick-launch shortcuts"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"App settings"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unknown sources"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Choose filter options"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"All"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Disabled"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"All apps"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Disabled apps"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Downloaded"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Running"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"On SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"Disabled"</string>
     <string name="not_installed" msgid="2797554494953450291">"Not installed for this user"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Installed"</string>
     <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Set up input methods"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Settings"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Settings"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Active input methods"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Use system languages"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> Settings"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Choose active input methods"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"On-screen keyboard settings"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto update screen magnification"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Update screen magnification on app transitions"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Power button ends call"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Speak passwords"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Large mouse cursor"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono audio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combine channels when playing audio"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Use since last full charge"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Screen usage"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"App usage since last full charge"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Device usage since last full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Battery use since reset"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> on battery"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Used for %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Usage breakdown since last full charge"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Estimated time left"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Time to full charge"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Estimation may change based on usage"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Always-on inactive"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Not supported by this app"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Only allow connections through VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Require VPN connection?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Lockdown active"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Lockdown inactive"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Restricted profiles cannot add accounts"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Delete <xliff:g id="USER_NAME">%1$s</xliff:g> from this device"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Lock screen settings"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Add users from lock screen"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"New user"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"New profile"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Delete yourself?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Turn on phone calls &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Call and SMS history will be shared with this user."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Emergency information"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Information about <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Info &amp; contacts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Show %d hidden items</item>
       <item quantity="one">Show %d hidden item</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Network &amp; Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobile, data usage, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Network &amp; Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, data usage, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Results"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wi-fi, Wi-Fi, network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"text message, texting, messages, messaging"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobile, mobile operator, wireless, data, 4G, 3G, 2G, LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobile, mobile operator, wireless, data, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wi-fi, Wi-Fi, call, calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"screen, touchscreen"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Power on sounds"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Do not disturb preferences"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Set Do Not Disturb schedule"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Default work notification tone"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Default work alarm ringtone"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Same as personal profile"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Replace work profile sounds?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Use personal profile sounds?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Replace"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Your current work profile sounds will be replaced with your personal profile sounds"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Your personal profile sounds will be used instead of your current work profile sounds"</string>
     <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="7447797716856573587">"Notification preferences"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"No permissions granted"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"No permissions requested"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"All apps"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Enabled"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Installed apps"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant apps"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocked"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configure apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Default for work"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assist &amp; voice input"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Assist app"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"None"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Choose Assist app"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Make <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> your assistant?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"The assistant will be able to read information about apps that are in use on your system, including information visible on your screen or accessible within the apps."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Agree"</string>
@@ -2959,6 +2958,8 @@
     <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">"Battery optimisation"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Show all apps"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Hide extra apps"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderised HALs (requires reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Assist gesture"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Admin can lock device and reset password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Admin can delete all device data"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting all device data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting all device data</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting work profile data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting work profile data</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"This device is managed."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Find out more"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Photos &amp; Videos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Music &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Files"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Off"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"On"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio files"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Music"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Auto-fill app"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index f296d52..8c91a64 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Security &amp; screen lock"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption &amp; credentials"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Disabled by administrator"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Location, fingerprint"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Same as device screen lock"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"App info"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Manage apps, set up quick-launch shortcuts"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"App settings"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unknown sources"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Choose filter options"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"All"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Disabled"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"All apps"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Disabled apps"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Downloaded"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Running"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"On SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"Disabled"</string>
     <string name="not_installed" msgid="2797554494953450291">"Not installed for this user"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Installed"</string>
     <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Set up input methods"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Settings"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Settings"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Active input methods"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Use system languages"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> Settings"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Choose active input methods"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"On-screen keyboard settings"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto update screen magnification"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Update screen magnification on app transitions"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Power button ends call"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Speak passwords"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Large mouse cursor"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono audio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combine channels when playing audio"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Use since last full charge"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Screen usage"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"App usage since last full charge"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Device usage since last full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Battery use since reset"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> on battery"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Used for %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Usage breakdown since last full charge"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Estimated time left"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Time to full charge"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Estimation may change based on usage"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Always-on inactive"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Not supported by this app"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Only allow connections through VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Require VPN connection?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Lockdown active"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Lockdown inactive"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Restricted profiles cannot add accounts"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Delete <xliff:g id="USER_NAME">%1$s</xliff:g> from this device"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Lock screen settings"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Add users from lock screen"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"New user"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"New profile"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Delete yourself?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Turn on phone calls &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Call and SMS history will be shared with this user."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Emergency information"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Information about <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Info &amp; contacts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Show %d hidden items</item>
       <item quantity="one">Show %d hidden item</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Network &amp; Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobile, data usage, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Network &amp; Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, data usage, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Results"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wi-fi, Wi-Fi, network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"text message, texting, messages, messaging"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobile, mobile operator, wireless, data, 4G, 3G, 2G, LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobile, mobile operator, wireless, data, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wi-fi, Wi-Fi, call, calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"screen, touchscreen"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Power on sounds"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Do not disturb preferences"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Set Do Not Disturb schedule"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Default work notification tone"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Default work alarm ringtone"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Same as personal profile"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Replace work profile sounds?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Use personal profile sounds?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Replace"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Your current work profile sounds will be replaced with your personal profile sounds"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Your personal profile sounds will be used instead of your current work profile sounds"</string>
     <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="7447797716856573587">"Notification preferences"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"No permissions granted"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"No permissions requested"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"All apps"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Enabled"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Installed apps"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant apps"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocked"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configure apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Default for work"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assist &amp; voice input"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Assist app"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"None"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Choose Assist app"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Make <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> your assistant?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"The assistant will be able to read information about apps that are in use on your system, including information visible on your screen or accessible within the apps."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Agree"</string>
@@ -2959,6 +2958,8 @@
     <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">"Battery optimisation"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Show all apps"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Hide extra apps"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderised HALs (requires reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Assist gesture"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Admin can lock device and reset password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Admin can delete all device data"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting all device data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting all device data</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting work profile data</item>
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_0">%d</xliff:g> before deleting work profile data</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"This device is managed."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Find out more"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Photos &amp; Videos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Music &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Files"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Off"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"On"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio files"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Music"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Auto-fill app"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8330cdd..0d0fcb7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Seguridad y bloqueo de pantalla"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptación y credenciales"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacidad"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Inhabilitada por el administrador"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Estado de seguridad"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Ubicación, huella digital"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Igual al bloqueo de pantalla del dispositivo"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Información de la app"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrar aplicaciones, configurar accesos directos de inicio rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuración de aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fuentes desconocidas"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar el espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Elegir opciones de filtro"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Todos"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Inhabilitadas"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Todas las apps"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Apps inhabilitadas"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descargado"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En ejecución"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamiento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"En tarjeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Inhabilitadas"</string>
     <string name="not_installed" msgid="2797554494953450291">"No instalada para este usuario"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instalada"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hay aplicaciones."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Almacenamiento interno"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"Almacenamiento interno"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Configurar métodos de entrada"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Configuración"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Configuración"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Métodos de entrada activos"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Usar idiomas del sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configuración de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Elegir los métodos de introducción activos"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuración del teclado en pantalla"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar automáticamente la ampliación de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualizar la ampliación de pantalla al cambiar de aplicaciones"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Cortar con el botón de encendido"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Decir contraseñas"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Puntero del mouse grande"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combinar canales al reproducir audio"</string>
@@ -1833,7 +1829,11 @@
     <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">"Tiempo restante: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Carga completa en <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Uso desde la última carga completa"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Uso de la pantalla"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo de la pantalla"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Escaneo de redes móviles"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Uso de apps desde la última carga completa"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Uso del dispositivo desde la última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se desconectó"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso de la batería desde que se restableció"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> de uso de la batería"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Se usó durante %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s de la batería total"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Desglose de uso desde la última carga completa"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Tiempo restante estimado"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tiempo restante para completar la carga"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"La estimación puede cambiar según el uso"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desconectó"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Durante la última desconexión para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Función \"Siempre activada\" inhabilitada"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"La opción no es compatible con esta app"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Solo permitir conexiones mediante VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"¿Requerir una conexión VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Bloqueo activo"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Bloqueo inactivo"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona el perfil de la VPN con la que deseas establecer una conexión ininterrumpida. El tráfico de red solo se permitirá cuando estés conectado a esta VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Los perfiles restringidos no pueden agregar cuentas."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Borrar a <xliff:g id="USER_NAME">%1$s</xliff:g> del disp."</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Configuración de pantalla bloqueada"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Agregar usuarios desde la pantalla bloqueada"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Usuario nuevo"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Perfil nuevo"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"¿Deseas borrarte a ti mismo?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"¿Activar llamadas telefónicas y SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Se compartirá el historial de llamadas y SMS con este usuario."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Información de emergencia"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Información sobre <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Información y contactos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. a aplicación"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Mostrar %d elementos ocultos</item>
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Internet y red"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, datos móviles, uso de datos, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Internet y red"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, móvil, uso de datos, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, transmisión"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps y notificaciones"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, conexión de red"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensaje de texto, enviar sms, mensajes, centro de mensajes"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"celular, operador de telefonía celular, inalámbrico, datos, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, móvil, operador de telefonía celular, inalámbrico, datos, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, llamar, llamada"</string>
     <string name="keywords_home" msgid="3626170808219458848">"selector"</string>
     <string name="keywords_display" msgid="8910345814565493016">"pantalla, pantalla táctil"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Activar los sonidos"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Preferencias de No interrumpir"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permitir solo prioridad"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas de automatización"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Programar modo No molestar"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Tono de notificación laboral"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Tono de la alarma laboral"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Igual al del perfil personal"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"¿Reemplazar sonidos de perfil?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"¿Usar los sonidos del perfil personal?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Reemplazar"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Se reemplazarán los sonidos actuales de tu perfil de trabajo por los de tu perfil personal"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Se usarán los sonidos de tu perfil personal en lugar de los del perfil de trabajo"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Tonos"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Otros sonidos y vibraciones"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Preferencias de notificaciones"</string>
@@ -2897,11 +2898,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"No se otorgaron permisos"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"No se solicitaron permisos"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Todas las aplicaciones"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Habilitadas"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Apps instaladas"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Apps instantáneas"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Trabajo"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL de dominio"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
@@ -2926,8 +2927,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Predeterminada para el trabajo"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Asistencia y entrada de voz"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplicación de asistencia"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ninguna"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Elegir aplicación de asistencia"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"¿Deseas que <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> sea tu asistente?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"El asistente podrá leer información sobre las aplicaciones en uso en el sistema, incluida la información visible en la pantalla o accesible en las aplicaciones."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Aceptar"</string>
@@ -2957,6 +2956,8 @@
     <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">"Optimización de la batería"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas las apps"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar apps adicionales"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sin optimizar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Sin optimizar"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizando el uso de la batería"</string>
@@ -3137,6 +3138,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar el cambio de Telephony Monitor, reinicia el dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizaciones automáticas del sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL enlazados (requiere reinicio)"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
@@ -3314,6 +3316,8 @@
     <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 que está en la parte posterior de tu 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 que está en la parte posterior de tu 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 que está en la parte posterior de tu dispositivo."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto de asistencia"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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 cargador de inicio está desbloqueado"</string>
@@ -3375,12 +3379,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Se estableció el proxy HTTP global"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"El administrador puede bloquear el dispositivo y restablecer la contraseña"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"El administrador puede borrar todos los datos del dispositivo"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">El administrador estableció la cantidad máxima de intentos para ingresar la contraseña en <xliff:g id="COUNT_1">%d</xliff:g> antes de que se borren todos los datos del dispositivo</item>
+      <item quantity="one">El administrador estableció la cantidad máxima de intentos para ingresar la contraseña en <xliff:g id="COUNT_0">%d</xliff:g> antes de que se borren todos los datos del dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">El administrador estableció la cantidad máxima de intentos para ingresar la contraseña en <xliff:g id="COUNT_1">%d</xliff:g> antes que se borren los datos del perfil de trabajo</item>
+      <item quantity="one">El administrador estableció la cantidad máxima de intentos para ingresar la contraseña en <xliff:g id="COUNT_0">%d</xliff:g> antes de que se borren los datos del perfil de trabajo</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este dispositivo es administrado."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> administra este dispositivo."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Más información"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos y videos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música y audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Juegos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Otras apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Archivos"</string>
@@ -3391,9 +3405,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Administrador de almacenamiento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desactivado"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Juegos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Archivos de audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(se desinstaló para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(se inhabilitó para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App de autocompletar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 59b1fcd..3539647 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Seguridad y bloqueo de pantalla"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Cifrado y credenciales"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacidad"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Inhabilitado por el administrador"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Estado de seguridad"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Ubicación, huella digital"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Igual que el bloqueo de pantalla del dispositivo"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y quitar aplicaciones instaladas"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Información de la aplicación"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrar aplicaciones y configurar accesos directos de inicio rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ajustes de aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Orígenes desconocidos"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Seleccionar opciones de filtrado"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Todas"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Inhabilitadas"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Todas las aplicaciones"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Aplicaciones inhabilitadas"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descargadas"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En ejecución"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamiento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"En tarjeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Inhabilitada"</string>
     <string name="not_installed" msgid="2797554494953450291">"No instalada para este usuario"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instalada"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hay aplicaciones."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Almacenamiento interno"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"almacenamiento interno"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Configurar métodos de entrada"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Ajustes"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Ajustes"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Métodos de introducción activos"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Usar idiomas del sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Ajustes de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Elegir métodos entrada activos"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ajustes de teclado en pantalla"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar ampliación automáticamente"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualizar ampliación de la pantalla al cambiar aplicaciones"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"El botón de encendido cuelga"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Decir contraseñas"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Puntero del ratón grande"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combinar canales al reproducir audio"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Uso desde la última carga completa"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Uso de la pantalla"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo de la pantalla"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Búsqueda de redes móviles"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Uso de la aplicación desde la última carga completa"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Uso del dispositivo desde la última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se cargó"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso de la batería desde que se restableció"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> usando batería"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Utilizada durante %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s de la batería total"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Análisis de uso desde la última carga completa"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Tiempo restante estimado"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tiempo restante para completar la carga"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"El tiempo estimado puede variar según el uso"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desenchufó"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde la última vez que se desenchufó para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Siempre activa inhabilitado"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"No compatible con esta aplicación"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Permitir únicamente conexiones a través de VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"¿Requerir una conexión VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Bloqueo activo"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Bloqueo inactivo"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona un perfil de VPN para permanecer conectado de forma continua. Solo se permitirá el tráfico de red cuando estés conectado a esta red VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Los perfiles restringidos no pueden añadir cuentas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar a <xliff:g id="USER_NAME">%1$s</xliff:g> de este dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Ajustes de pantalla de bloqueo"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Añadir usuarios en la pantalla de bloqueo"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nuevo usuario"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Perfil nuevo"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"¿Eliminarte a ti mismo?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"¿Activar llamadas y SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"El historial de SMS y de llamadas se compartirán con este usuario."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Información de emergencia"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Información sobre <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Información y contactos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ampliar ajustes de aplicación"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Mostrar %d elementos ocultos</item>
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Redes e Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, datos móviles, uso de datos, punto de acceso"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Red e Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, móvil, uso de datos, punto de acceso"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, enviar"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicaciones y notificaciones"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, conexión de red"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensaje de texto, texto, mensajes mensajería"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"celular, operador móvil, inalámbrico, datos, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"móvil, operador móvil, conexión inalámbrica, datos, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, llamada, llamadas"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"pantalla, pantalla táctil"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Sonidos de encendido"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Preferencias de No molestar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permitir solo con prioridad"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Programar No molestar"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Tono de notificación de trabajo predeterminado"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Tono de alarma de trabajo predeterminado"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Igual que el perfil personal"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"¿Sustituir sonidos del perfil de trabajo?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"¿Usar sonidos del perfil personal?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Sustituir"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Se sustituirán los sonidos actuales del perfil de trabajo por los sonidos del perfil personal"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Se utilizarán los sonidos del perfil personal en lugar de los sonidos actuales del perfil de trabajo"</string>
     <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="7447797716856573587">"Preferencias de notificaciones"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"No se han concedido permisos"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"No se han solicitado permisos"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Todas las aplicaciones"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Habilitadas"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Aplicaciones instaladas"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Aplicaciones instantáneas"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Trabajo"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URLs de dominio"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Opciones avanzadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar aplicaciones"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Predeterminadas para trabajo"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Asistencia y entrada voz"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplicación de asistencia"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ninguno"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Elegir aplicación de asistencia"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"¿Quieres que <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> sea tu asistente?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"El asistente podrá consultar información sobre las aplicaciones en uso del sistema, como información visible en la pantalla o a la que se pueda acceder a través de las aplicaciones."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Aceptar"</string>
@@ -2959,6 +2958,8 @@
     <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">"Optimización de batería"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas las aplicaciones"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar aplicaciones extra"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sin optimizar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"No optimizada"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizando el uso de la batería"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar el cambio al monitor de telefonía, reinicia el dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizaciones del sistema automáticas"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Enlace de HAL (hay que reiniciar)"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Gesto de asistencia"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Sí"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"No"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"El gestor de arranque ya está desbloqueado"</string>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Se ha definido el proxy HTTP global"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"El administrador puede bloquear el dispositivo y cambiar la contraseña"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"El administrador puede eliminar todos los datos del dispositivo"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">El administrador ha establecido un máximo de <xliff:g id="COUNT_1">%d</xliff:g> intentos para introducir la contraseña antes de eliminar todos los datos del dispositivo</item>
+      <item quantity="one">El administrador ha establecido un máximo de <xliff:g id="COUNT_0">%d</xliff:g> intento para introducir la contraseña antes de eliminar todos los datos del dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">El administrador ha establecido un máximo de <xliff:g id="COUNT_1">%d</xliff:g> intentos antes de eliminar los datos del perfil de trabajo</item>
+      <item quantity="one">El administrador ha establecido un máximo de <xliff:g id="COUNT_0">%d</xliff:g> intento antes de eliminar los datos del perfil de trabajo</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este es un dispositivo administrado."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> administra este dispositivo."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Más información"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos y vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música y audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Juegos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Otras aplicaciones"</string>
     <string name="storage_files" msgid="8581083146777364063">"Archivos"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Administrador de Almacenamiento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desactivado"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Juegos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Archivos de audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(opción desinstalada para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(opción inhabilitada para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplicación para autocompletar"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8d0e381..7b1cc15 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Asukoht"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontod"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Turvalisus ja ekraanilukk"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Krüpteerimine ja mandaat"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Määrake Minu asukoht, ekraani avamine, SIM-kaardi lukk, mandaadi talletuslukk"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Määrake oma asukoht, ekraani avamine, mandaadi talletuslukk"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Paroolid"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privaatsus"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Administraator on keelanud"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Turvalisuse olek"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Asukoht, sõrmejälg"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"WiFi valimine"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"WiFi sisselülitamine ..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"WiFi väljalülitamine ..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Kuva kõik võrgud"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Viga"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz riba pole selles riigis saadaval"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Lennurežiimis"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetoothi jagamine"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Jagamine"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Leviala ja jagamine"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Leviala on sees, jagamine"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Leviala on sees"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Jagamine"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kui andmeside mahu säästja on sisse lülitatud, siis ei saa jagada ega kasutada teisaldatavat leviala"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB jagamine"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Sama mis seadme ekraanilukk"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Halda rakendusi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installitud rakenduste haldamine ja eemaldamine"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Rakenduse teave"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Rakenduste haldamine, kiirkäivituse otseteede seadistamine"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Rakenduse seaded"</string>
     <string name="install_applications" msgid="4872012136210802181">"Tundmatud allikad"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Halda ruumi"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filtrivalikute valimine"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Kõik"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Keelatud"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Kõik rakendused"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Keelatud rakendused"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Allalaaditud"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Töös"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-mäluseade"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD-kaardil"</string>
     <string name="disabled" msgid="9206776641295849915">"Keelatud"</string>
     <string name="not_installed" msgid="2797554494953450291">"Pole selle kasutaja jaoks installitud"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Installitud"</string>
     <string name="no_applications" msgid="7336588977497084921">"Rakendusi pole."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Sisemälu"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"sisemine salvestusruum"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Sisestusmeetodite seadistamine"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Seaded"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Seaded"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktiivsed sisestusmeetodid"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Süsteemi keelte kasutamine"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Üksuse <xliff:g id="IME_NAME">%1$s</xliff:g> seaded"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Aktiivsete sisestusmeetodite valim."</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekraaniklaviatuuri seaded"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekraanisuurenduse värskendus"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ekraanisuurenduse kasutus rakenduste vahetamisel"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Toitenupp lõpetab kõne"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Paroolide ettelugemine"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Suur hiirekursor"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monoheli"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Heli esitamisel ühendatakse kanalid"</string>
@@ -1837,7 +1829,11 @@
     <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">"Jäänud on <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> laadimise lõpuni"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Kasutus alates viimasest täislaadimisest"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Ekraanikasutus"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Ekraani energiatarve"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobiilivõrgustiku skannimine"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Rakenduse kasutus pärast viimast täislaadimist"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Seadme kasutus pärast viimast täislaadimist"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akukasutus alates lahutamisest"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akukasutus alates lähtestamisest"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> akutoitel"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Liigselt arvestatud energiatarbimine"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Kasutatud %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s akumahust"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Kasutuse jaotus pärast viimast täislaadimist"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Hinnanguline järelejäänud aeg"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Täielikult täis laadimiseni jäänud aeg"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Prognoos võib kasutuse põhjal muutuda"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> alates lahutamisest"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Alates viimasest lahutamisest <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kasutus kokku"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Funktsioon Alati sees on inaktiivne"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Rakendus ei toeta seda"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Luba ühendused ainult VPN-i kaudu"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Kas vajate VPN-i ühendust?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Lukustus on aktiivne"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Lukustus on inaktiivne"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Valige VPN-i profiil, millega olla alati ühendatud. Võrguliiklus on lubatud ainult siis, kui olete ühendatud selle VPN-iga."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Piiratud profiilid ei saa kontosid lisada"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Kustuta seadmest <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Lukustuskuva seaded"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Kasutajate lisamine lukustuskuval"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Uus kasutaja"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Uus profiil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Kas soovite kustutada iseenda?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Kas lülitada telefonikõned ja SMS-id sisse?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Selle kasutajaga jagatakse kõne- ja SMS-ajalugu."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Hädaabiteave"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Teave kasutaja <xliff:g id="USER_NAME">%1$s</xliff:g> kohta"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Kasutaja <xliff:g id="USER_NAME">%1$s</xliff:g> teave ja kontaktid"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Rakenduste ja sisu lubamine"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Piirangutega rakendused"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Laienda rakenduste seadeid"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">Kuva %d peidetud üksust</item>
       <item quantity="one">Kuva %d peidetud üksus</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Võrk ja Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"WiFi, mobiilne andmeside, andmekasutus, leviala"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Võrk ja Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"WiFi, mobiil, andmekasutus, leviala"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Ühendatud seadmed"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, ülekandmine"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Rakendused ja märguanded"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Kasutaja ja kontod"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Vaikerakendused"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Keeled, varundamine, värskendused, teave telefoni kohta"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Keeled, varundamine, värskendused, teave seadme kohta"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Seaded"</string>
     <string name="search_menu" msgid="6283419262313758339">"Otsingu seaded"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Otsinguseaded"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Tulemused"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, võrguühendus"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekstsõnum, SMS-i saatmine, sõnumid, sõnumside"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobiil, mobiilioperaator, traadita, andmed, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobiilne, mobiil, mobiilioperaator, juhtmeta, andmed, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, kõne, helistamine"</string>
     <string name="keywords_home" msgid="3626170808219458848">"käivitaja"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekraan, puuteekraan"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Märguanne"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibratsioon"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Sisselülitamise helid"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Funkt. Mitte segada eelistused"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioriteetne lubab ainult"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automaatsed reeglid"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Ajakava Mitte segada määramine"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Töömärguande vaiketoon"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Tööalarmi vaikehelin"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Sama mis isiklikul profiilil"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Kas asendada tööprofiili helid?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Kas kasutada isikliku profiili helisid?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Asenda"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Teie praegused tööprofiili helid asendatakse isikliku profiili helidega"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Teie tööprofiili praeguste helide asemel kasutatakse teie isikliku profiili helisid"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Helinad"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Muud helid ja vibratsioonid"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Märguannete eelistused"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Lube ei antud"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Lube ei taotletud"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Kõik rakendused"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Lubatud"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Installitud rakendused"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Installimata avat. rakendused"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Isiklik"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Töö"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeeritud"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domeeni URL-idega"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Täpsemad"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Rakenduste seadistamine"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tundmatu rakendus"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Vaikimisi töö jaoks"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Abirakendus ja häälsisend"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Abirakendus"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Puudub"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Abirakenduse valimine"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Kas soovite rakenduse <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> muuta abirakenduseks?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Abimees saab teie süsteemis kasutatavate rakenduste kohta teavet vaadata (sh teie ekraanil kuvatud või rakendustes juurdepääsetav teave)."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Nõustu"</string>
@@ -2966,6 +2958,8 @@
     <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">"Aku optimeerimine"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Teated kasutuse kohta"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Kõigi rakenduste kuvamine"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Lisarakenduste peitmine"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Pole optimeeritud"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Pole optimeeritud"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akukasutuse optimeerimine"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Külm värvitemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kasutatakse külmemaid ekraanivärve"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Värvi muutmise rakendamiseks lülitage ekraan välja"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Teenuse Telephony Monitor muudatuse rakendamiseks taaskäivitage seade"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automaatsed süsteemivärskendused"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Virnastatud HAL-id (vajalik on taaskäivitamine)"</string>
     <string name="usage" msgid="2977875522080448986">"Kasutus"</string>
@@ -3323,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Märguannete kontrollimiseks pühkige telefoni tagaküljel oleval sõrmejäljeanduril alla."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Märguannete kontrollimiseks pühkige tahvelarvuti tagaküljel oleval sõrmejäljeanduril alla."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Märguannete kontrollimiseks pühkige seadme tagaküljel oleval sõrmejäljeanduril alla."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Abiliigutus"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Sees"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Väljas"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Buudilaadur on juba avatud"</string>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Üldine HTTP-puhverserver on seadistatud"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administraator saab seadme lukustada ja parooli lähtestada"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administraator saab kustutada kõik seadme andmed"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administraator määras, et enne kõigi seadmes olevate andmete kustutamist saab parooli sisestada <xliff:g id="COUNT_1">%d</xliff:g> korda</item>
+      <item quantity="one">Administraator määras, et enne kõigi seadmes olevate andmete kustutamist saab parooli sisestada <xliff:g id="COUNT_0">%d</xliff:g> korra</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administraator määras, et enne tööprofiili andmete andmete kustutamist saab parooli sisestada <xliff:g id="COUNT_1">%d</xliff:g> korda</item>
+      <item quantity="one">Administraator määras, et enne tööprofiili andmete andmete kustutamist saab parooli sisestada <xliff:g id="COUNT_0">%d</xliff:g> korra</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Seda seadet hallatakse."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Seda seadet haldab <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Lisateave"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotod ja videod"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muusika ja heli"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Mängud"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Muud rakendused"</string>
     <string name="storage_files" msgid="8581083146777364063">"Failid"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Salvestusruumi haldur: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Väljas"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Sees"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Mängud"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Helifailid"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muusika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstall. kasutaja <xliff:g id="USER">%s</xliff:g> jaoks)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(keelatud kasutaja <xliff:g id="USER">%s</xliff:g> jaoks)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Automaattäite rakendus"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 124c078..5cf16da 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Kokapena"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontuak"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Segurtasuna eta pantailaren blokeoa"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptatzea eta kredentzialak"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ezarri Nire kokapena, pantailaren desblokeoa, SIM txartelaren blokeoa, kredentzialen biltegiaren blokeoa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ezarri Nire kokapena, pantailaren desblokeoa, kredentzialen biltegiaren blokeoa."</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Pasahitzak"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Pribatutasuna"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Administratzaileak desgaitu du"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Segurtasunaren egoera"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Kokapena, hatz-marka"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Gailuaren pantailaren blokeo bera"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Kudeatu aplikazioak"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Kudeatu eta kendu instalatutako aplikazioak"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Aplikazioaren informazioa"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Kudeatu aplikazioak, konfiguratu abiarazte bizkorrerako laster-teklak"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Aplikazioaren ezarpenak"</string>
     <string name="install_applications" msgid="4872012136210802181">"Iturburu ezezagunak"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Kudeatu tokia"</string>
     <string name="filter" msgid="2018011724373033887">"Iragazi"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Aukeratu iragazkiaren aukerak"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Guztiak"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Desgaituta"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Aplikazio guztiak"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Desgaitutako aplikazioak"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Deskargatutakoak"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Abian"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB memoria"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD txartelean"</string>
     <string name="disabled" msgid="9206776641295849915">"Desgaituta"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ez dago instalatuta erabiltzaile honentzat"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instalatuta"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ez dago aplikaziorik."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Barneko memoria"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"barneko memoria"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Konfiguratu idazketa-metodoak"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Ezarpenak"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Ezarpenak"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Idazketa-metodo aktiboak"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Erabili sistemaren hizkuntzak"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ezarpenak"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Aukeratu idazketa-metodo aktiboak"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Pantailako teklatuaren ezarpenak"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Eguneratu auto. pantaila-handiagotzea"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Eguneratu handiagotzea aplik. batetik bestera pasatzean."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Amaitu deiak etengailuarekin"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Esan pasahitzak"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Saguaren erakusle handia"</string>
     <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>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Azkenekoz guztiz kargatu zenetik emandako erabilera"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Pantailaren erabilera"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Pantailaren kontsumoa"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Sare mugikorra bilatzen"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Aplikazioaren erabilera gailua guztiz kargatuz geroztik"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Gailuaren erabilera hura guztiz kargatuz geroztik"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateriaren erabilera entxufea atera ondoren"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Azken aldiz berrezarri ondoren erabilitako bateria"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> baterian"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uste baino energia gutxiago erabili da."</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Erabilitako denbora: %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"Bateria guztiaren %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Kargatu zen azken aldiaz geroztik emandako erabilerari buruzko datuak"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Geratzen den denbora, gutxi gorabehera"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Guztiz kargatzeko beharko duen denbora"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Estimazioak gorabeherak izan ditzake erabileraren arabera"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> entxufea atera zenetik"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Azken aldiz entxufea atera ondoren (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Inaktibo dago \"beti aktibatuta\" aukera"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Aplikazio honek ez du onartzen"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Onartu VPN bidezko konexioak soilik"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN konexioak erabiltzera derrigortu?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Blokeoa aktibatuta"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Blokeoa desaktibatuta"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Hautatu beti konektatuta egoteko VPN profila. VPN horrekin konektatuta zaudenean soilik onartuko da sare-trafikoa."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profil murriztuek ezin dituzte kontuak gehitu"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Ezabatu <xliff:g id="USER_NAME">%1$s</xliff:g> gailutik"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Pantaila blokeatuaren ezarpenak"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Gehitu erabiltzaileak pantaila blokeatutik"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Erabiltzaile berria"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Profil berria"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Zeure burua ezabatu nahi duzu?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefono-deiak eta SMSak aktibatu nahi dituzu?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Deien eta SMS mezuen historia erabiltzaile honekin partekatuko da."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Larrialdietarako informazioa"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> erabiltzaileari buruzko informazioa"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> erabiltzailearen datuak eta kontaktuak"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Baimendu aplikazioak eta edukia"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Murrizketak dituzten aplikazioak"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Zabaldu aplikazio-ezarpenak"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Erakutsi %d elementu ezkutu</item>
       <item quantity="one">Erakutsi %d elementu ezkutu</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Sareak eta Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mugikorra, datuen erabilera, sare publikoa"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Sareak eta Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, sare mugikorrak, datuen erabilera, sare publikoa"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Konektatutako gailuak"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, igorpenak"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikazioak eta jakinarazpenak"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Emaitzak"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, sare, konexio"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"testu-mezua, testu-mezuak, mezuak, bidali"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mugikorra, operadorea, eramailea, hari gabeko datuak, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"sare mugikorrak, operadorea, hari gabeko konexioak, datuak, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, dei, deitu"</string>
     <string name="keywords_home" msgid="3626170808219458848">"abiarazlea"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ukipen-pantaila, pantaila"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alertak"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dar-dar"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Pizteko soinuak"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"\"Ez molestatu\" moduaren hobespenak"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Lehentasunezkoak soilik"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Arau automatikoak"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Zehaztu Ez molestatu ordutegia"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Laneko jakinarazpenen tonu lehenetsia"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Laneko alarmaren tonu lehenetsia"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Profil pertsonalaren berberak"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Laneko profilaren soinua ordeztu?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Profil pertsonaleko soinuak erabili?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Ordeztu"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Laneko profilaren soinuak profil pertsonaleko soinuekin ordeztuko dira"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Profil pertsonaleko soinuak erabiliko dira laneko profilekoen ordez"</string>
     <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="7447797716856573587">"Jakinarazpenen hobespenak"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Ez du baimenik"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Ez du baimenik eskatu"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Aplikazio guztiak"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Gaitutakoak"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Instalatutako aplikazioak"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Zuzeneko aplikazioak"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Pertsonalak"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Lanekoak"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeatutakoak"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domeinuaren URLekin"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Ezarpen aurreratuak"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguratu aplikazioak"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikazio ezezaguna"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Lanerako aplikazio lehenetsiak"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Laguntza eta ahots-idazketa"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Laguntza-aplikazioa"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Bat ere ez"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Aukeratu laguntza-aplikazioa"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> laguntzaile gisa ezarri nahi duzu?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Zure sistemak darabiltzan aplikazioei buruzko informazioa irakurri ahal izango du laguntzaileak, besteak beste, pantailan ikusgai duzun edo aplikazioetatik atzi daitekeen informazioa."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Onartu"</string>
@@ -2959,6 +2958,8 @@
     <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="show_all_apps" msgid="1742726460081356745">"Erakutsi aplikazio guztiak"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ezkutatu aplikazio gehigarriak"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Optimizaziorik gabe"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Optimizaziorik gabe"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Bateria-optimizazioa aplikatzen da"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kolore hotzak"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Erabili kolore hotzagoak pantailan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Kolorea aldatzeko, itzal ezazu pantaila"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefono-gainbegiratzailean egindako aldaketa aplikatzeko, berrabiarazi gailua"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Sistemaren eguneratze automatikoak"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Hardwarearen abstrakzio-geruza (HAL) artxibatuak (berrabiarazi egin behar da)"</string>
     <string name="usage" msgid="2977875522080448986">"Erabilera"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Laguntza aktibatzeko keinua"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"HTTP proxy orokorra ezarri da"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratzaileak gailua blokea eta pasahitza berrezar ditzake"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratzaileak gailuko datu guztiak ezaba ditzake"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Pasahitza idazteko gehienez <xliff:g id="COUNT_1">%d</xliff:g> saiakera egin daitezkeela zehaztu du administratzaileak; ondoren, ezabatu egingo dira gailuko datu guztiak.</item>
+      <item quantity="one">Pasahitza idazteko gehienez <xliff:g id="COUNT_0">%d</xliff:g> saiakera egin daitekeela zehaztu du administratzaileak; ondoren, ezabatu egingo dira gailuko datu guztiak.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Pasahitza idazteko gehienez <xliff:g id="COUNT_1">%d</xliff:g> saiakera egin daitezkeela zehaztu du administratzaileak; ondoren, ezabatu egingo dira laneko profileko datu guztiak.</item>
+      <item quantity="one">Pasahitza idazteko gehienez <xliff:g id="COUNT_0">%d</xliff:g> saiakera egin daitekeela zehaztu du administratzaileak; ondoren, ezabatu egingo dira laneko profileko datu guztiak.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Gailu kudeatu bat da hau."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundeak kudeatzen du gailu hau."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Lortu informazio gehiago"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Argazkiak eta bideoak"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musika eta audioa"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jokoak"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Beste aplikazio batzuk"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fitxategiak"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Memoria-kudeatzailea: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desaktibatuta"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktibatuta"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jokoak"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio-fitxategiak"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> - desinstalatuta)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> - desgaituta)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Betetze automatikoen aplikazioa"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 342f423..9edaac2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"مکان"</string>
     <string name="account_settings_title" msgid="626177544686329806">"حساب‌ها"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"امنیت و قفل صفحه"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"رمزگذاری و اعتبارنامه"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل حافظه اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تنظیم مکان من، بازگشایی قفل صفحه، قفل حافظه اطلاعات کاربری"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"گذرواژه‌ها"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"حریم خصوصی"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"توسط سرپرست غیرفعال شده است"</string>
     <string name="security_status_title" msgid="5848766673665944640">"وضعیت امنیتی"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"مکان، اثرانگشت"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"‏انتخاب Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"‏روشن کردن Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"‏خاموش کردن Wi-Fi…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"دیدن همه شبکه‌ها"</string>
     <string name="wifi_error" msgid="3207971103917128179">"خطا"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"باند ۵ گیگاهرتزی در این کشور در دسترس نیست"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"در حالت هواپیما"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"اتصال اینترنت با تلفن همراه بلوتوث"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"اتصال به اینترنت با تلفن همراه"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"نقطه اتصال وتترینگ"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"نقطه اتصال روشن، اتصال به اینترنت با تلفن همراه"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"نقطه اتصال روشن"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"اتصال به اینترنت با تلفن همراه"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"هنگامی که محافظ صفحه روشن است نمی‌توانید از نقاط اتصال قابل حمل یا اتصال به اینترنت با تلفن همراه استفاده کنید"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏اتصال داده با سیم USB"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"یکسان با قفل صفحه دستگاه"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"مدیریت برنامه‌ها"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"مدیریت و حذف برنامه‌های نصب شده"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"اطلاعات برنامه"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"مدیریت برنامه‌ها، تنظیم میان‌برهای راه‌اندازی سریع"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"تنظیمات برنامه"</string>
     <string name="install_applications" msgid="4872012136210802181">"منابع ناشناس"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"مدیریت فضا"</string>
     <string name="filter" msgid="2018011724373033887">"فیلتر"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"انتخاب گزینه‌های فیلتر"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"همه"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"غیرفعال شد"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"همه برنامه‌ها"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"برنامه‌های غیرفعال‌شده"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"دانلودشده"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"در حال اجرا"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏حافظهٔ USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏در کارت SD"</string>
     <string name="disabled" msgid="9206776641295849915">"غیر فعال شد"</string>
     <string name="not_installed" msgid="2797554494953450291">"برای این کاربر نصب نشده است"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"نصب‌شده"</string>
     <string name="no_applications" msgid="7336588977497084921">"برنامه‌ای موجود نیست."</string>
     <string name="internal_storage" msgid="1584700623164275282">"حافظهٔ داخلی"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"حافظه داخلی"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"تنظیم روش‌های ورودی"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"تنظیمات"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"تنظیمات"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"روش‌های ورودی فعال"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"استفاده از زبان‌های سیستم"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> تنظیمات"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"انتخاب روش‌های ورودی فعال"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"تنظیمات صفحه‌کلید روی صفحه"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"به‌روزرسانی خودکار بزرگ‌نمایی صفحه"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"به‌روزرسانی بزرگ‌نمایی صفحه در انتقال‌های برنامه"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"قطع تماس با دکمه روشن/خاموش"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"‏گفتن گذرواژه‎ها"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"اشاره‌گر موشواره بزرگ"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"صدای مونو"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ترکیب کانال‌ها هنگام پخش صدا"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"استفاده از زمان آخرین شارژ کامل"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"استفاده صفحه‌نمایش"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"مصرف صفحه‌نمایش"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"اسکن شبکه تلفن همراه"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"مصرف برنامه از آخرین شارژ کامل"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"مصرف دستگاه از آخرین شارژ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"استفاده از باتری از زمان جدا شدن"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"استفاده از باتری از زمان بازنشانی"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> در باتری"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"نیروی مصرفی بیش از حد محاسبه شده"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> میلی‌آمپرساعت"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"‏استفاده‌ به مدت %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"‏%1$s از کل شارژ باتری"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"تفکیک مصرف شارژ از آخرین شارژ کامل"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"زمان باقی‌مانده تخمینی"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"زمان شارژ کامل"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"ممکن است تخمین بنابر استفاده تغییر کند"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"غیرفعال‌کردن «همیشه روشن»"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"توسط این برنامه پشتیبانی نمی‌شود"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"‏اتصالات فقط ازطریق VPN مجاز باشد"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"‏به اتصال VPN‌ نیاز است؟"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"قفل همه فعال است"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"قفل همه غیرفعال است"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‏یک نمایه VPN انتخاب کنید تا همیشه متصل بمانید. فقط درصورتی‌که به این VPN متصل باشید ترافیک شبکه مجاز خواهد بود."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"نمایه‌های محدود نمی‌توانند حسابی را اضافه کنند"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"حذف <xliff:g id="USER_NAME">%1$s</xliff:g> از این دستگاه"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"تنظیمات قفل صفحه"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"افزودن کاربران از صفحه قفل"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"کاربر جدید"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"نمایه جدید"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"حذف خودتان؟"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"تماس‌های تلفنی و پیامک روشن شوند؟"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"سابقه پیامک و تماس، با این کاربر به اشتراک گذاشته می‌شود."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"اطلاعات اضطراری"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"اطلاعات درباره <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"اطلاعات و مخاطبین <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"برنامه‌ها و محتوا مجازاند"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"برنامه‌های دارای محدودیت"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسعه تنظیمات برای برنامه"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="one">‏نمایش %d مورد پنهان</item>
       <item quantity="other">‏نمایش %d مورد پنهان</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"شبکه و اینترنت"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"‏Wi-Fi، شبکه تلفن همراه، مصرف داده، نقطه اتصال"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"شبکه و اینترنت"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"‏Wi-Fi، دستگاه همراه، مصرف داده، نقطه اتصال"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"دستگاه‌های متصل"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"‏بلوتوث، NFC، ارسال محتوا"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"برنامه‌ها و اعلان‌ها"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"حساب‌های کاربر"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"برنامه‌های پیش‌فرض"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"زبان، پشتیبان‌گیری، به‌روزرسانی، درباره تلفن"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"زبان، پشتیبان‌گیری، به‌روزرسانی، درباره دستگاه"</string>
     <string name="search_results_title" msgid="1796252422574886932">"تنظیمات"</string>
     <string name="search_menu" msgid="6283419262313758339">"تنظیمات جستجو"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"تنظیمات جستجو"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"نتایج"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"‏wifi،‏ wi-fi، اتصال شبکه"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"پیام نوشتاری، ارسال پیامک، پیام‌ها، پیام‌رسانی"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"‏شبکه تلفن همراه، شرکت مخابراتی تلفن همراه، بی‌سیم، داده 4g،‏ 3g،‏ 2g،‏ lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"‏شبکه همراه، دستگاه همراه، شرکت مخابراتی تلفن همراه، بی‌سیم، داده 4g،‏ 3g،‏ 2g،‏ lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"‏wifi،‏ wi-fi،‏ تماس، تماس گرفتن"</string>
     <string name="keywords_home" msgid="3626170808219458848">"راه‌انداز"</string>
     <string name="keywords_display" msgid="8910345814565493016">"صفحه، صفحه لمسی"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"هشدار"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"لرزش"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"صدای راه‌اندازی"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"تنظیمات برگزیده «مزاحم نشوید»"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"فقط اولویت‌دار مجاز است"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"قوانین خودکار"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"تنظیم زمان‌بندی «مزاحم نشوید»"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"آهنگ اعلان کار پیش‌فرض"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"آهنگ زنگ هشدار کار پیش‌فرض"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"مانند نمایه شخصی"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"صداهای نمایه کاری‌تان جایگزین شوند؟"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"از صداهای نمایه شخصی استفاده شود؟"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"جایگزینی"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"صداهای نمایه کاری کنونی‌تان با صداهای نمایه شخصی‌تان جایگزین می‌شوند"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"به‌جای صداهای نمایه کاری فعلی، از صداهای نمایه شخصی‌تان استفاده خواهد شد."</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"آهنگ‌های زنگ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"صداها و لرزش‌های دیگر"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"تنظیمات برگزیده اعلان"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"اجازه‌ای داده نشده"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"اجازه‌ای درخواست نشده"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"همه برنامه‌ها"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"فعال"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"برنامه‌های نصب‌شده"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"برنامه‌های فوری"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"شخصی"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"کاری"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"مسدود شده"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"با نشانی‌های وب دامنه"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"پیشرفته"</string>
     <string name="configure_apps" msgid="6685680790825882528">"پیکربندی برنامه‌ها"</string>
     <string name="unknown_app" msgid="5275921288718717656">"برنامه ناشناس"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"پیش‌فرض برای کار"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"همیار و ورودی گفتاری"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"برنامه همیار"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"هیچ‌کدام"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"انتخاب برنامه همیار"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> همیار شما شود؟"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"«دستیار» می‌تواند اطلاعات مربوط به برنامه‌های در حال استفاده در سیستم شما را بخواند، از جمله اطلاعاتی که در صفحه نمایش شما قابل مشاهده است یا در برنامه‌ها قابل دسترسی است."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"موافقم"</string>
@@ -2966,6 +2958,8 @@
     <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">"بهینه‌سازی مصرف باتری"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"هشدارهای استفاده"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"نمایش همه برنامه‌ها"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"پنهان کردن برنامه‌های اضافی"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"بهینه‌نشده"</string>
     <string name="high_power_on" msgid="6216293998227583810">"بهینه نشده"</string>
     <string name="high_power_off" msgid="3393904131961263278">"بهینه‌سازی مصرف باتری"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"دمای رنگ سرد"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استفاده از رنگ‌های سردتر نمایشگر"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"برای اعمال تغییر رنگ، صفحه را خاموش کنید"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"‏برای اعمال تغییر Telephony Monitor، دستگاه را راه‌اندازی مجدد کنید"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"به‌روزرسانی‌های خودکار سیستم"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"‏Binderized HALs (به راه‌اندازی مجدد نیاز دارد)"</string>
     <string name="usage" msgid="2977875522080448986">"میزان مصرف"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"اشاره دستیار"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏تنظیم پروکسی HTTP جهانی"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"سرپرست می‌تواند دستگاه را قفل و گذرواژه را بازنشانی کند"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"سرپرست می‌تواند همه داده‌های دستگاه را پاک کند"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <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="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"این دستگاه مدیریت می‌شود."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"این دستگاه توسط <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> مدیریت می‌شود."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"بیشتر بدانید"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"عکس و ویدیو"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"موسیقی و صوتی"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"بازی‌ها"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"سایر برنامه‌ها"</string>
     <string name="storage_files" msgid="8581083146777364063">"فایل‌ها"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"مدیریت حافظه: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"خاموش"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"روشن"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"بازی"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"فایل‌های صوتی"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"موسیقی"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(برای کاربر <xliff:g id="USER">%s</xliff:g> حذف نصب شد)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(برای کاربر <xliff:g id="USER">%s</xliff:g> غیرفعال شد)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"برنامه تکمیل خودکار"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f0afcf6..e3391e7 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Sijainti"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Tilit"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Tietoturva, näytön lukitus"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Salaus ja kirjautumistiedot"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Aseta Oma sijainti, näytön lukituksen poisto, käyttöoikeustietojen tallennustilan lukitus"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Salasanat"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Tietosuoja"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Järjestelmänvalvojan käytöstä poistama"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Suojaustila"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Sijainti, sormenjälki"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Sama kuin laitteen näytön lukitus"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hallinnoi sovelluksia"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hallinnoi ja poista asennettuja sovelluksia"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Sovelluksen tiedot"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Hallinnoi sovelluksia, ota käyttöön pikakuvakkeita"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Sovellusasetukset"</string>
     <string name="install_applications" msgid="4872012136210802181">"Tuntemattomat lähteet"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Hallinnoi tallennustilaa"</string>
     <string name="filter" msgid="2018011724373033887">"Suodata"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Valitse suodatinvaihtoehdot"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Kaikki"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Ei käytössä"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Kaikki sovellukset"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Käytöstä poistetut sovellukset"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Ladattu"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Käynnissä"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-tallennustila"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD-kortilla"</string>
     <string name="disabled" msgid="9206776641295849915">"Pois käytöstä"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ei asennettu tälle käyttäjälle"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Asennettu"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ei sovelluksia."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Sisäinen tallennustila"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"sisäinen tallennustila"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Määritä syöttötavat"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Asetukset"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Asetukset"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktiiviset syöttötavat"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Käytä järjestelmän kieliä"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-asetukset"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Valitse aktiiviset syöttötavat"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Näyttönäppäimistön asetukset"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Päivitä näytön suurennus automaatt."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Päivitä näytön suurennus sovellussiirtymissä"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Puhelun katkaisu virtapainikkeella"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Puhu salasanat"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Suuri hiiren osoitin"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monoääni"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Yhdistä kanavat ääntä toistettaessa."</string>
@@ -1833,7 +1829,11 @@
     <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> jäljellä"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> latausaikaa jäljellä"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Kulutus täyteen lataamisen jälkeen"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Näytön käyttö"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Näytön virrankulutus"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobiiliverkkojen haku"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Sovellusten käyttö edellisen täyden latauksen jälkeen"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Laitteen käyttö edellisen täyden latauksen jälkeen"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akun käyttö laturin irrottamisen jälkeen"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akun käyttö tilastojen tyhjentämisen jälkeen"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> akkuvirralla"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Yliarvioitu virrankulutus"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Käytetty %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s kaikesta akun kulutuksesta"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Käytön erittely täyden latauksen jälkeen"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Arvioitu jäljellä oleva aika"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Aikaa täyteen lataukseen"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Arvio voi muuttua käytön mukaan."</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> laturin irrottamisen jälkeen"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Laturin irrottamisen jälkeen (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Aina käytössä on epäaktiivinen"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Tämä sovellus ei tue toimintoa."</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Salli vain VPN-yhteydet"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Vaaditaanko VPN-yhteyttä?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Lukittu-tila käytössä"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Lukittu-tila ei käytössä"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Valitse VPN-profiili, johon muodostettu yhteys on aina käytössä. Verkkoliikenne sallitaan vain tämän VPN-yhteyden ollessa käytössä."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Rajoitetut profiilit eivät voi lisätä tilejä"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Poista <xliff:g id="USER_NAME">%1$s</xliff:g> laitteesta"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Lukitusnäytön asetukset"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Lisää käyttäjiä lukitusnäytöllä"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Uusi käyttäjä"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Uusi profiili"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Haluatko poistaa itsesi?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Otetaanko puhelut ja tekstiviestit käyttöön?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Soitto- ja tekstiviestihistoria jaetaan tämän käyttäjän kanssa."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Hätätilannetiedot"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Tietoja: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Käyttäjän <xliff:g id="USER_NAME">%1$s</xliff:g> tiedot ja yhteystiedot"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Sovellusten ja sisällön salliminen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Rajoitetut sovellukset"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Laajenna sovelluksen asetuksia"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Näytä %d piilotettua kohdetta</item>
       <item quantity="one">Näytä %d piilotettu kohde</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Verkko ja internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobiiliyhteys, datan käyttö, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Verkko ja internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobiiliyhteys, datan käyttö, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Yhdistetyt laitteet"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, suoratoisto"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Sovellukset ja ilmoitukset"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Tulokset"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, verkkoyhteys"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekstiviesti, tekstiviestien lähetys, viestit, viestien lähetys"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"matkapuhelin, kännykkä, operaattori, langaton, tiedonsiirto, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"matkapuhelin, mobiili, puhelinoperaattori, langaton, tiedonsiirto, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, puhelu, soittaa"</string>
     <string name="keywords_home" msgid="3626170808219458848">"käynnistysohjelma"</string>
     <string name="keywords_display" msgid="8910345814565493016">"näyttö, kosketusnäyttö"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Ilmoitus"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Värinä"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Käynnistysäänet"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Älä häiritse ‑asetukset"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Sallittavat tärkeät ilmoitukset"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automaattiset säännöt"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Aseta Älä häiritse ‑ajat"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Työilmoituksen oletusääni"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Työherätyksen oletusääni"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Sama kuin henkilökohtaisessa profiilissa"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Korvataanko työprofiiliäänet?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Käytetäänkö henkilökohtaisen profiilin ääniä?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Korvaa"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Työprofiilin nykyiset äänet korvataan henkilökohtaisen profiilin äänillä."</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Henkilökohtaisen profiilisi ääniä käytetään työprofiilin äänien sijaan."</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Soittoäänet"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Muut äänet ja värinä"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Ilmoitusasetukset"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Käyttöoikeuksia ei ole myönnetty"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Käyttöoikeuksia ei ole pyydetty"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Kaikki sovellukset"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Käytössä"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Asennetut sovellukset"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Pikasovellukset"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Henkilökohtaiset"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Työ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Estetyt"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Sis. verkkotun. URL-osoitteita"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Lisäasetukset"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Sovellusten konfigurointi"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tuntematon sovellus"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Työkäytön oletus"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Avustus ja äänisyöte"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Avustajasovellus"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ei mitään"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Valitse avustajasovellus"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Haluatko, että <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> on avustajasi?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Assistentti voi lukea tietoja järjestelmässäsi käytössä olevista sovelluksista, mukaan lukien tiedot, jotka näkyvät näytölläsi tai jotka ovat käytettävissä sovelluksissa."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Hyväksyn"</string>
@@ -2959,6 +2958,8 @@
     <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">"Akun käytön optimointi"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Käyttöilmoitukset"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Näytä kaikki sovellukset"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Piilota ylimääräiset"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ei optimointia"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ei optimointia"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akun käyttöä optimoidaan."</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Viileä värilämpötila"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Käytä viileämpiä värilämpötiloja"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ota värin muutos käyttöön sammuttamalla näyttö."</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Käynnistä laite uudelleen, niin puhelinpalvelujen seurannan muutokset astuvat voimaan."</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automaattiset järjestelmäpäivitykset"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Sido HALit yhteen (vaatii uudelleenkäynnistystä)"</string>
     <string name="usage" msgid="2977875522080448986">"Käyttö"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Voit katsoa ilmoitukset pyyhkäisemällä puhelimen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Voit katsoa ilmoitukset pyyhkäisemällä tabletin takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Voit katsoa ilmoitukset pyyhkäisemällä laitteen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Apuele"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Käytössä"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Ei käytössä"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Käynnistysohjelman lukitus on jo avattu."</string>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Yleinen HTTP-välityspalvelin asetettu"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Järjestelmänvalvoja voi lukita laitteen ja vaihtaa salasanan."</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Järjestelmänvalvoja voi poistaa kaikki laitteen tiedot."</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Järjestelmänvalvoja on päättänyt, että <xliff:g id="COUNT_1">%d</xliff:g> salasanan kirjoitusyrityksen jälkeen kaikki laitteen tiedot poistetaan.</item>
+      <item quantity="one">Järjestelmänvalvoja on päättänyt, että <xliff:g id="COUNT_0">%d</xliff:g> salasanan kirjoitusyrityksen jälkeen kaikki laitteen tiedot poistetaan.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Järjestelmänvalvoja on päättänyt, että <xliff:g id="COUNT_1">%d</xliff:g> salasanan kirjoitusyrityksen jälkeen työprofiilin tiedot poistetaan.</item>
+      <item quantity="one">Järjestelmänvalvoja on päättänyt, että <xliff:g id="COUNT_0">%d</xliff:g> salasanan kirjoitusyrityksen jälkeen työprofiilin tiedot poistetaan.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Tämä on hallinnoitu laite."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Tätä laitetta hallitsee <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Lisätietoja"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Kuvat ja videot"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musiikki ja audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Pelit"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Muut sovellukset"</string>
     <string name="storage_files" msgid="8581083146777364063">"Tiedostot"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Tallennustilan hallinta: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Poissa"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Päällä"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Pelit"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Äänitiedostot"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musiikki"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(poistettu käyttäjältä <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(poistettu käytöstä: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Automaattisen täytön sovellus"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 836a55b..7de6868 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Position"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Sécurité et verrouillage d\'écran"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Cryptage et authentifiants"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Confidentialité"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Désactivé par l\'administrateur"</string>
     <string name="security_status_title" msgid="5848766673665944640">"État de la sécurité"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Position, empreintes digitales"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Sélectionner le Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activation du Wi-Fi en cours…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Désactivation du Wi-Fi en cours…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Afficher tous les réseaux"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Erreur"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"La bande de 5 GHz n\'est pas disponible dans ce pays"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"En mode Avion"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Via Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Partage de connexion"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Pt accès et part. de connex."</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Point d\'accès activé, partage de connexion"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Point d\'accès activé"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Partage de connexion"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Impossible de partager la connexion ou d\'utiliser des points d\'accès mobiles lorsque la fonction Économiseur de données est activée"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Partage de connexion par USB"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Identique au verrouillage de l\'écran de l\'appareil"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gérer et supprimer les applications installées"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Détails de l\'application"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gérer les applications, configurer des raccourcis de lancement rapide"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Paramètres de l\'application"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sources inconnues"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Gérer l\'espace"</string>
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Sélectionner les options du filtre"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Tous"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Désactivées"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Toutes les applications"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Applications désactivées"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Téléchargée"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Diffusion en cours"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Mémoire de stockage USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sur la carte SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Désactivés"</string>
     <string name="not_installed" msgid="2797554494953450291">"Pas installée pour cet utilisateur"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Installée"</string>
     <string name="no_applications" msgid="7336588977497084921">"Aucune application"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Mémoire de stockage interne"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"stockage interne"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Configurer les modes de saisie"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Paramètres"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Paramètres"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Modes de saisie actifs"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Utiliser les langues du système"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Paramètres <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Sélectionner modes de saisie actifs"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Paramètres du clavier à l\'écran"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Mise à jour auto de la loupe"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Mettre à jour la loupe si transition entre applis"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Marche/arrêt pour raccrocher"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Énoncer les mots de passe"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Grand curseur de souris"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combiner les chaînes lors de la lecture audio"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Usage depuis la dernière charge complète"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Utilisation de l\'écran"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux cellulaires"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Utilisation des applis depuis la dernière charge complète"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Utilisation de l\'appareil depuis la dernière charge complète"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilisation de la batterie depuis la dernière réinitialisation"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> de la batterie"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilisation surestimée de la pile"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Utilisée pendant %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s de la pile"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Détails de l\'utilisation depuis la dernière charge complète"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Durée restante estimée"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Temps restant avant la charge complète"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"La durée estimée peut changer en fonction de l\'utilisation"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Depuis le dernier débranchement (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Utilisation totale"</string>
@@ -2268,7 +2264,7 @@
     <string name="data_usage_metered_mobile" msgid="2326986339431119372">"Réseaux cellulaires"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Réseaux Wi-Fi mesurés"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Pour sélectionner les réseaux mesurés, activez le Wi‑Fi."</string>
-    <string name="data_usage_disclaimer" msgid="6887858149980673444">"Le suivi de consommation du f. de services peut différer de celui de l\'appareil."</string>
+    <string name="data_usage_disclaimer" msgid="6887858149980673444">"Le suivi de consommation du fournisseur de service peut différer de celui de l\'appareil."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Appel d\'urgence"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retour à l\'appel"</string>
     <string name="vpn_name" msgid="4689699885361002297">"nom"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Fonction « Toujours actif » inactive"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Cette fonction n\'est pas prise en charge dans cette application"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Autoriser uniquement les connexions par RPV"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Exiger une connexion RPV?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Verrouillage actif"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Verrouillage inactif"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Sélectionnez un profil VPN auquel rester connecté en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté à ce VPN."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Les profils limités ne peuvent pas ajouter de compte."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Supp. <xliff:g id="USER_NAME">%1$s</xliff:g> de l\'appareil"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Paramètres de l\'écran de verrouillage"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ajouter des utilisateurs à l\'écran de verrouillage"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nouvel utilisateur"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nouveau profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vous supprimer?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activer les appels téléphoniques et les textos?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historique des appels et des textos sera partagé avec cet utilisateur."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Coordonnées d\'urgence"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Renseignements sur <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Information et contacts pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="one">Afficher %d élément masqué</item>
       <item quantity="other">Afficher %d éléments masqués</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Réseau et Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, cellulaire, utilisation des données, point d\'accès sans fil"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Réseau et Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, cellulaire, utilisation des données, point d\'accès sans fil"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Appareils connectés"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, diffuser"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applications et notifications"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Utilisateurs et comptes"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Applications par défaut"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Langues, sauvegarde, mises à jour, à propos du téléphone"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Langues, sauvegardes, mises à jour, à propos de l\'appareil"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
     <string name="search_menu" msgid="6283419262313758339">"Paramètres de recherche"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Paramètres de recherche"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Résultats"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, connexion réseau"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"message texte, envoyer des messages, messages, messagerie"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"cellulaire, fournisseur de services, sans fil, données, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellulaire, mobile, fournisseur de services, sans fil, données, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, appel, appeler"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanceur d\'applications"</string>
     <string name="keywords_display" msgid="8910345814565493016">"écran, tactile"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerte"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreur"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Activation par les sons"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Préférences Ne pas déranger"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priorités seulement"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Définir horaires Ne pas déranger"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Sonnerie notif. prof. par déf."</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Sonn. alarme prof. par défaut"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Mêmes que le profil personnel"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Remplacer sons du profil prof.?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Utiliser les sons du profil personnel?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Remplacer"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Les sons actuels de votre profil professionnel seront remplacés par ceux de votre profil personnel."</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Les sons de votre profil personnel remplaceront ceux de votre profil professionnel"</string>
     <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="7447797716856573587">"Préférences de notification"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Aucune autorisation accordée"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Aucune autorisation demandée"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Toutes les applications"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Activé"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Applications installées"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Applications instantanées"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personnel"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Travail"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqué"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Avec les URL de domaine"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurer les applications"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Par déf. pour util. professionn."</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistance et entrée vocale"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Application d\'assistance"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Aucun"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Sélectionner l\'appli d\'assistance"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Définir <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> comme assistant?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"L\'assistant pourra accéder aux données des applications en cours d\'utilisation sur votre système, y compris les données visibles à l\'écran ou accessibles au sein des applications."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"J\'accepte"</string>
@@ -2966,6 +2958,8 @@
     <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">"Optimisation de la pile"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'utilisation"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Afficher toutes les applis"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Masquer applis supplémentaires"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Non optimisée"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Non optimisée"</string>
     <string name="high_power_off" msgid="3393904131961263278">"L\'utilisation de la pile est optimisée"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pour appliquer les changements de TelephonyMonitor, redémarrez l\'appareil"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mises à jour automatiques du système"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (redémarrage nécessaire)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilisation"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Geste d\'assistance"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Le serveur mandataire HTTP global a été défini"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"L\'administrateur peut verrouiller l\'appareil et réinitialiser le mot de passe"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"L\'administrateur peut supprimer toutes les données de l\'appareil"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">L\'administrateur a défini le nombre maximal autorisé de tentatives d’entrée du mot de passe à <xliff:g id="COUNT_1">%d</xliff:g>. Après cela, toutes les données de l\'appareil seront supprimées.</item>
+      <item quantity="other">L\'administrateur a défini le nombre maximal autorisé de tentatives d’entrée du mot de passe à <xliff:g id="COUNT_1">%d</xliff:g>. Après cela, toutes les données de l\'appareil seront supprimées.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">L\'administrateur a défini le nombre maximal autorisé de tentatives d’entrée du mot de passe à <xliff:g id="COUNT_1">%d</xliff:g>. Après cela, les données du profil professionnel seront supprimées.</item>
+      <item quantity="other">L\'administrateur a défini le nombre maximal autorisé de tentatives d’entrée du mot de passe à <xliff:g id="COUNT_1">%d</xliff:g>. Après cela, les données du profil professionnel seront supprimées.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Cet appareil est géré."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Cet appareil est géré par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"En savoir plus"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Photos et vidéos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musique et audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jeux"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Autres applications"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fichiers"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestionnaire de stockage : <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Désactivé"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activé"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jeux"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fichiers audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musique"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(désinst. pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Application de remplissage automatique"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d96d7f1..7a67986 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Localisation"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Sécurité et écran de verrouillage"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Chiffrement et identifiants"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Confidentialité"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Désactivé par l\'administrateur"</string>
     <string name="security_status_title" msgid="5848766673665944640">"État de la sécurité"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Position, empreinte digitale"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Sélectionner le Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activation du Wi-Fi en cours…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Désactivation du Wi-Fi en cours…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Afficher tous les réseaux"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Erreur"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Bande 5 GHz non disponible dans ce pays."</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"En mode Avion"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Partage connexion Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Partage de connexion"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Point d\'accès et partage connexion"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Point d\'accès activé, partage de connexion"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Point d\'accès activé"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Partage de connexion"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Impossible de partager la connexion ou d\'utiliser des points d\'accès mobiles lorsque la sauvegarde des données est activée"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Via USB"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Identique au verrouillage de l\'écran de l\'appareil"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gérer et supprimer les applications installées"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Infos sur l\'appli"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gérer les applications, configurer des raccourcis de lancement rapide"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Paramètres des applications"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sources inconnues"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Gérer l\'espace"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrer"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Sélectionner les options du filtre"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Toutes"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Désactivées"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Toutes les applications"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Applications désactivées"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Téléchargées"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En cours"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Stockage USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sur la carte SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Désactivée"</string>
     <string name="not_installed" msgid="2797554494953450291">"Non installé pour cet utilisateur"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Installée"</string>
     <string name="no_applications" msgid="7336588977497084921">"Aucune application"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Stockage interne"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"mémoire de stockage interne"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Configurer les méthodes de saisie"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Paramètres"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Paramètres"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Modes de saisie actifs"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Utiliser les langues du système"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Paramètres <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Sélectionner modes de saisie actifs"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Paramètres du clavier virtuel"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Mise à jour auto de la loupe"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Mettre à jour la loupe si transition entre applis"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Bouton Marche/Arrêt pour raccrocher"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Énoncer les mots de passe"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Grand curseur de souris"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combiner les chaînes lors de la lecture audio"</string>
@@ -1837,7 +1829,11 @@
     <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 chargement complet"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Utilisation depuis dernière charge complète"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Utilisation de l\'écran"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux mobiles"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Utilisation des applications depuis dernière charge complète"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Utilisation de l\'appareil depuis la dernière charge complète"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilisation de la batterie depuis la dernière réinitialisation"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Sur batterie : <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consommation surestimée"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Utilisée pendant %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s de la batterie"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Informations détaillées sur l\'utilisation depuis la dernière charge complète"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Temps restant estimé"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Durée de charge restante"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"L\'estimation peut changer en fonction de l\'utilisation"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Depuis le dernier débranchement (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Utilisation totale"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"VPN toujours actif : désactivé"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Non compatible avec cette application"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Autoriser uniquement les connexions via VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Exiger une connexion VPN ?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Blocage actif"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Blocage inactif"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Sélectionnez un profil VPN auquel rester connecté en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté à ce VPN."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Les profils limités ne peuvent pas ajouter de compte."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Supp. <xliff:g id="USER_NAME">%1$s</xliff:g> de l\'appareil"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Paramètres de l\'écran de verrouillage"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ajouter utilisateurs depuis écran de verrouillage"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nouvel utilisateur"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nouveau profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Supprimer cet utilisateur ?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activer les appels téléphoniques et les SMS ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historique des appels et des SMS sera partagé avec cet utilisateur."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informations d\'urgence"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informations sur <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informations et contacts pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="one">Afficher %d élément masqué</item>
       <item quantity="other">Afficher %d éléments masqués</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Réseau et Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, réseaux mobiles, consommation des données, point d\'accès"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Réseau et Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, consommation des données, point d\'accès"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Appareils connectés"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, diffuser"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applications et notifications"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Utilisateur et comptes"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Applications par défaut"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Langues, sauvegarde, mises à jour, à propos du téléphone"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Langues, sauvegarde, mises à jour, à propos de l\'appareil"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
     <string name="search_menu" msgid="6283419262313758339">"Paramètres de recherche"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Paramètres de recherche"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Résultats"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, connexion réseau"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, SMS/MMS, messages, message"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"cellulaire, opérateur mobile, données sans fil, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellulaire, mobile, opérateur mobile, sans fil, données, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, appel, appels"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanceur d\'applications"</string>
     <string name="keywords_display" msgid="8910345814565493016">"écran, écran tactile"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerte"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreur"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Sons de mise en route"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Préférences \"Ne pas déranger\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritaires uniquement"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Définir horaires Ne pas déranger"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Sonnerie notif. travail par déf."</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Sonnerie alarme travail par déf."</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Mêmes sons que pour le profil professionnel"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Remplacer sons du profil pro ?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Utiliser les sons du profil personnel ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Remplacer"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Les sons actuels de votre profil professionnel seront remplacés par ceux de votre profil personnel."</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Les sons actuels de votre profil professionnel seront remplacés par ceux de votre profil personnel"</string>
     <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="7447797716856573587">"Préférences de notification"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Aucune autorisation accordée"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Aucune autorisation demandée"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Toutes les applis"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Activées"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Applications installées"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Applis instantanées"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personnelles"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Professionnelles"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloquées"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Avec des URL de domaine"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurer les applis"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Par défaut pour utilisation pro"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistance et saisie vocale"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Application d\'assistance"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Aucune"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Sélectionner l\'appli d\'assistance"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Définir <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> comme application d\'assistance ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"L\'assistant pourra accéder aux informations relatives aux applications en cours d\'utilisation sur votre système, y compris aux informations visibles à l\'écran ou accessibles au sein des applications."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Accepter"</string>
@@ -2966,6 +2958,8 @@
     <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">"Optimisation de la batterie"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'utilisation"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Afficher toutes les applications"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Masquer applis supplémentaires"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Non optimisées"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Non optimisée"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Utilisation de la batterie optimisée"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran."</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pour appliquer la modification effectuée par Telephony Monitor, redémarrez l\'appareil"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mises à jour automatiques du système"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL avec mécanisme Binder (nécessite un redémarrage)"</string>
     <string name="usage" msgid="2977875522080448986">"Consommation"</string>
@@ -3323,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière du téléphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à 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 lecteur d\'empreinte digitale à l\'arrière de l\'appareil."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Geste d\'assistance"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Activés"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Désactivés"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader déjà déverrouillé"</string>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global défini"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"L\'administrateur peut verrouiller l\'appareil et réinitialiser le mot de passe"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"L\'administrateur peut supprimer toutes les données de l\'appareil"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">L\'administrateur a défini le nombre maximal autorisé de tentatives de saisie du mot de passe sur <xliff:g id="COUNT_1">%d</xliff:g>. Toutes les données de l\'appareil sont ensuite supprimées</item>
+      <item quantity="other">L\'administrateur a défini le nombre maximal autorisé de tentatives de saisie du mot de passe sur <xliff:g id="COUNT_1">%d</xliff:g>. Toutes les données de l\'appareil sont ensuite supprimées</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">L\'administrateur a défini le nombre maximal autorisé de tentatives de saisie du mot de passe sur <xliff:g id="COUNT_1">%d</xliff:g>. Les données du profil professionnel sont ensuite supprimées</item>
+      <item quantity="other">L\'administrateur a défini le nombre maximal autorisé de tentatives de saisie du mot de passe sur <xliff:g id="COUNT_1">%d</xliff:g>. Les données du profil professionnel sont ensuite supprimées</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Cet appareil est géré."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Cet appareil est géré par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"En savoir plus"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Photos et vidéos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musique et audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jeux"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Autres applications"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fichiers"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestionnaire d\'espace de stockage : <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Désactivé"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activé"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jeux"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fichiers audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musique"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(désinstallé pour utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Application de saisie automatique"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f0d7ba3..98f8cbd 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Localización"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Seguranza e bloqueo da pantalla"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptación e credenciais"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Define A miña localización, o desbloqueo da pantalla, o bloqueo da tarxeta SIM e o bloqueo do almacenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Define A miña localización, o desbloqueo da pantalla e o bloqueo do almacenamento de credenciais"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Contrasinais"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Desactivado polo administrador"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Estado da seguranza"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Localización, impresión dixital"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Seleccionar wifi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activando a wifi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Desactivando a wifi..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Ver todas as redes"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Erro"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"A banda de 5 GHz non está dispoñible neste país"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"No modo avión"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Ancoraxe de Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ancoraxe á rede"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Wifi e conex. compartida"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Zona wifi e conexión compartida activadas"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Zona wifi activada"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Conexión compartida activada"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Non se pode compartir a conexión nin utilizar zonas wifi portátiles mentres o economizador de datos estea activado"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Ancoraxe de USB"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"O mesmo que o bloqueo da pantalla do dispositivo"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Xestionar aplicacións"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Xestiona e elimina as aplicacións instaladas"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Información da aplicación"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Xestiona aplicacións e configura atallos de inicio rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuración da aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes descoñecidas"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Xestionar espazo"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Escoller opcións de filtro"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Todas"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Desactivadas"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Todas as aplicacións"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Aplicacións desactivadas"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descargadas"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En execución"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na tarxeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desactivada"</string>
     <string name="not_installed" msgid="2797554494953450291">"Sen instalar para este usuario"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Aplicación instalada"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ningunha aplicación"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Almacenamento interno"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"almacenamento interno"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Configurar métodos de entrada"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Configuración"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Configuración"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Métodos de entrada activos"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Usar idiomas do sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configuración de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Escoller métodos de entrada activos"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuración do teclado en pantalla"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar aumento automaticamente"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualizar aumento pantalla en transicións de apps"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"O botón de acendido colga"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Pronunciar contrasinais"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Punteiro do rato grande"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio en mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combina canles ao reproducir audio"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Uso desde a última carga completa"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Uso da pantalla"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da pantalla"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Busca da rede de telefonía móbil"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Uso de aplicacións desde a última carga completa"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Uso do dispositivo desde a última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da batería desde que se desconectou"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso da batería desde o restablecemento"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> utilizando a batería"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Reconto excesivo do uso de enerxía"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Tempo de uso da batería: %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s da batería total"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Análise detallado do uso desde a última carga completa"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Tempo restante estimado"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tempo ata acadar a carga completa"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"A estimación pode cambiar en función do uso"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desconectou"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Uso da batería desde a última desconexión: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Cifras totais de uso"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"A opción Sempre activado non está activa"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Opción non admitida nesta aplicación"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Permitir só conexións a través da VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Requirir conexión VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Bloqueo activo"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Bloqueo inactivo"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona un perfil de VPN ao que permanecer sempre conectado. Só se permitirá tráfico de rede cando esteas conectado a esta VPN."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Os perfís restrinxidos non poden engadir contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar a <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Configuración da pantalla de bloqueo"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Engadir usuarios desde a pantalla de bloqueo"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo usuario"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Queres eliminarte a ti mesmo?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activar chamadas telefónicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O historial de chamadas e SMS compartirase con este usuario."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Información de emerxencia"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Información acerca de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Información e contactos para <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicacións e contido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacións con restricións"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ampliar axustes aplicación"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">Mostrar %d elementos ocultos</item>
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Rede e Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wifi, móbil, uso de datos, zona wifi"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"wifi, móbil, uso de datos, zona wifi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, emitir"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacións e notificacións"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Usuario e contas"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicacións predeterminadas"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Idiomas, copia de seguranza, actualizacións, acerca do teléfono"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Idiomas, copia de seguranza, actualizacións, acerca do dispositivo"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuración"</string>
     <string name="search_menu" msgid="6283419262313758339">"Configuración de busca"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Configuración de busca"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, rede, conexión"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensaxe de texto, mensaxes de texto, mensaxes, mensaxería"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"móbil, operador móbil, sen fíos, datos, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"móbil, operador móbil, sen fíos, datos, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, chamada, chamando"</string>
     <string name="keywords_home" msgid="3626170808219458848">"iniciador"</string>
     <string name="keywords_display" msgid="8910345814565493016">"pantalla, pantalla táctil"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Sons de acendido"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Preferencias de Non molestar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Só permite prioridade"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Normas automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Define o modo Non molestar"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Ton notificac. pred. traballo"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Ton alarma pred. do traballo"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Igual que no perfil persoal"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Substit. sons perfil traballo?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Queres usar os sons do perfil persoal?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Substituír"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Os sons actuais do perfil do traballo substituiranse cos sons do teu perfil persoal"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Utilizaranse os sons do teu perfil persoal en lugar dos sons do perfil de traballo actual"</string>
     <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="7447797716856573587">"Preferencias de notificacións"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Non se outorgou ningún permiso"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Non se solicitou ningún permiso"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Todas as aplicacións"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Activadas"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Aplicacións instaladas"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Aplicacións instantáneas"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Persoais"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Do traballo"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL de dominio"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar aplicacións"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación descoñecida"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Predeterminado para o traballo"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Asistente e entrada de voz"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplicación do asistente"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ningún"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Escolle a aplicación de asistencia"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Queres que <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> sexa o teu asistente?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"O asistente poderá ler información sobre as aplicacións en uso no teu sistema, incluída a información visible na túa pantalla ou á que se pode acceder desde as aplicacións."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Aceptar"</string>
@@ -2966,6 +2958,8 @@
     <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">"Optimización da batería"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas as aplicacións"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar aplicacións adicionais"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sen optimizar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Sen optimizar"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizando o uso da batería"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fría"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliza cores de visualización máis frías"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar o cambio de cor, apaga a pantalla"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar o cambio do monitor de telefonía, reinicia o dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizacións automáticas do sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (require reinicio)"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Asistencia cos xestos"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Configurouse o proxy HTTP global"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"O administrador pode bloquear o dispositivo e restablecer o contrasinal"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O administrador pode eliminar todos os datos do dispositivo"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">O administrador definiu o número máximo de intentos de introducir o contrasinal en <xliff:g id="COUNT_1">%d</xliff:g> antes de eliminar todos os datos do dispositivo</item>
+      <item quantity="one">O administrador definiu o número máximo de intentos de introducir o contrasinal en <xliff:g id="COUNT_0">%d</xliff:g> antes de eliminar todos os datos do dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">O administrador definiu o número máximo de intentos de introducir o contrasinal en <xliff:g id="COUNT_1">%d</xliff:g> antes de eliminar os datos do perfil de traballo</item>
+      <item quantity="one">O administrador definiu o número máximo de intentos de introducir o contrasinal en <xliff:g id="COUNT_0">%d</xliff:g> antes de eliminar os datos do perfil de traballo</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este é un dispositivo xestionado."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo está xestionado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Máis información"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos e vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música e audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Xogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outras aplicacións"</string>
     <string name="storage_files" msgid="8581083146777364063">"Ficheiros"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Xestor de almacenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"desactiv."</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"activado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Xogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ficheiros de audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalado polo usuario <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desactivado polo usuario <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplicación de autocompletar"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8b54ce5..df6c711 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"સ્થાન"</string>
     <string name="account_settings_title" msgid="626177544686329806">"એકાઉન્ટ્સ"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"સુરક્ષા અને સ્ક્રીન લૉક"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"એન્ક્રિપ્શન અને ઓળખપત્રો"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"મારું સ્થાન, સ્ક્રીન અનલૉક, SIM કાર્ડ લૉક, ઓળખપત્ર સંગ્રહ લૉક સેટ કરો"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"મારું સ્થાન, સ્ક્રીન અનલૉક, ઓળખપત્ર સંગ્રહ લૉક સેટ કરો"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"પાસવર્ડ્સ"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"ગોપનીયતા"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"વ્યવસ્થાપક દ્વારા અક્ષમ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"સુરક્ષાની સ્થિતિ"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"સ્થાન, ફિંગરપ્રિન્ટ"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi પસંદ કરો"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi ચાલુ કરી રહ્યું છે…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi બંધ થઈ રહ્યું છે…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"તમામ નેટવર્ક જુઓ"</string>
     <string name="wifi_error" msgid="3207971103917128179">"ભૂલ"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"આ દેશમાં 5 GHz બેન્ડ ઉપલબ્ધ નથી"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"એરપ્લેન મોડમાં"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth ટિથરિંગ"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ટિથરિંગ"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"હોટસ્પોટ અને ટિથરિંગ"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"હોટસ્પોટ ચાલુ છે, ટિથરિંગ"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"હોટસ્પોટ ચાલુ છે"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ટિથરિંગ"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ડેટા સેવર ચાલુ હોય તે વખતે ટીથર કરી શકતાં નથી અથવા તો પોર્ટેબલ હોટસ્પોટ્સનો ઉપયોગ કરી શકતાં નથી"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ટિથરિંગ"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ઉપકરણ સ્ક્રીન લૉકની સમાન"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"એપ્લિકેશન્સનું સંચાલન કરો"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સનું સંચાલન કરો અને દૂર કરો"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"ઍપ્લિકેશનની માહિતી"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"ઍપ્લિકેશનો સંચાલિત કરો, ઝડપી લોંચ શોર્ટકટ્સ સેટ કરો"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"ઍપ્લિકેશન સેટિંગ્સ"</string>
     <string name="install_applications" msgid="4872012136210802181">"અજાણ્યા સ્ત્રોતો"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"સ્થાન સંચાલિત કરો"</string>
     <string name="filter" msgid="2018011724373033887">"ફિલ્ટર"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ફિલ્ટર વિકલ્પો પસંદ કરો"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"તમામ"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"અક્ષમ કરેલ"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"બધી ઍપ્લિકેશનો"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"અક્ષમ કરેલી ઍપ્લિકેશનો"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ડાઉનલોડ કરેલા"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ચાલે છે"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB સંગ્રહ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD કાર્ડ પર"</string>
     <string name="disabled" msgid="9206776641295849915">"અક્ષમ કર્યો"</string>
     <string name="not_installed" msgid="2797554494953450291">"આ વપરાશકર્તા માટે ઇન્સ્ટોલ કરેલ નથી"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"ઇન્સ્ટોલ કરેલી છે"</string>
     <string name="no_applications" msgid="7336588977497084921">"કોઈ ઍપ્લિકેશનો નથી."</string>
     <string name="internal_storage" msgid="1584700623164275282">"આંતરિક સંગ્રહ"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"આંતરિક સંગ્રહ"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"ઇનપુટ પદ્ધતિઓ સેટ કરો"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"સેટિંગ્સ"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"સેટિંગ્સ"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"ઇનપુટ પદ્ધતિઓ સક્રિય કરો"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"સિસ્ટમ ભાષાઓનો ઉપયોગ કરો"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> સેટિંગ્સ"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"સક્રિય ઇનપુટ પદ્ધતિઓ પસંદ કરો"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ઓનસ્ક્રીન કીબોર્ડ સેટિંગ્સ"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"સ્ક્રીન વિસ્તૃતીકરણ સ્વતઃ અપડેટ કરો"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ઍપ્લિકેશન સંક્રમણો પર સ્ક્રીન વિસ્તૃતીકરણને અપડેટ કરો"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"પાવર બટન કૉલને સમાપ્ત કરે છે"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"પાસવર્ડ્સ બોલો"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"મોટું માઉસ પોઇન્ટર"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"મૉનો ઑડિઓ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ઑડિઓ ચલાવતી વખતે ચૅનલ્સ ભેગી કરો"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"છેલ્લા પૂર્ણ ચાર્જ પછીનો ઉપયોગ"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"સ્ક્રીન દ્વારા વપરાશ"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"સ્ક્રીન દ્વારા વપરાશ"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"મોબાઇલ નેટવર્ક સ્કૅન કરવામાં"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"છેલ્લે સંપૂર્ણ ચાર્જ કર્યાં પછી ઍપ્લિકેશન દ્વારા વપરાશ"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"છેલ્લે સંપૂર્ણ ચાર્જ પછી ઉપકરણ દ્વારા કરાયેલ વપરાશ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"અનપ્લગ થયું ત્યારથી બૅટરી ઉપયોગ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"રીસેટ પછીનો બૅટરી ઉપયોગ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"બૅટરી પર <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"વધુ-ગણાયેલ પાવર ઉપયોગ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s સુધી વપરાઈ"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"કુલ બૅટરીમાંથી %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"છેલ્લા પૂર્ણ ચાર્જ પછીના વપરાશનું વિશ્લેષણ"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"અંદાજિત બાકી સમય"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"સંપૂર્ણ ચાર્જ થવામાં બાકી સમય"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"વપરાશના આધારે અનુમાન બદલાઈ શકે છે"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"હંમેશા-ચાલુ નિષ્ક્રિય છે"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"આ ઍપ્લિકેશન દ્વારા સમર્થિત નથી"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"VPN મારફતે જ કનેક્શન્સની મંજૂરી આપો"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN કનેક્શનની જરૂર છે?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"લોકડાઉન સક્રિય"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"લોકડાઉન નિષ્ક્રિય"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"હંમેશા તેની સાથે કનેક્ટ રહેવા માટે એક VPN પ્રોફાઇલ પસંદ કરો. આ VPN સાથે કનેક્ટ હશે માત્ર ત્યારે જ નેટવર્ક ટ્રાફિકને મંજૂરી આપવામાં આવશે."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"પ્રતિબંધિત પ્રોફાઇલ્સ એકાઉન્ટ્સ ઉમેરી શકતી નથી"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"આ ઉપકરણમાંથી <xliff:g id="USER_NAME">%1$s</xliff:g> ને કાઢી નાખો"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"લૉક સ્ક્રીન સેટિંગ્સ"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"લૉક સ્ક્રીનમાંથી વપરાશકર્તાઓને ઉમેરો"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"નવો વપરાશકર્તા"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"નવી પ્રોફાઇલ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"તમને પોતાને કાઢી નાખીએ?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ફોન કૉલ્સ અને SMS ચાલુ કરીએ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"કૉલ અને SMS ઇતિહાસ આ વપરાશકર્તા સાથે શેર કરવામાં આવશે."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"કટોકટી માહિતી"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> વિશેની માહિતી"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> માટે માહિતી અને સંપર્કો"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ઍપ્લિકેશનો અને સામગ્રીને મંજૂરી આપો"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"પ્રતિબંધો ધરાવતી ઍપ્લિકેશનો"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ઍપ્લિકેશન માટે સેટિંગ્સ વિસ્તૃત કરો"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="one">%d છુપાયેલ આઇટમ બતાવો</item>
       <item quantity="other">%d છુપાયેલ આઇટમ બતાવો</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"નેટવર્ક અને ઇન્ટરનેટ"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, સેલ્યુલર, ડેટા વપરાશ, હોટસ્પોટ"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"નેટવર્ક અને ઇન્ટરનેટ"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, મોબાઇલ, ડેટા વપરાશ, હોટસ્પોટ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"કનેક્ટ થયેલ ઉપકરણો"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, કાસ્ટ કરો"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ઍપ્લિકેશનો અને સૂચનાઓ"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"વપરાશકર્તા અને એકાઉન્ટ્સ"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"ડિફૉલ્ટ ઍપ્લિકેશનો"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"ભાષાઓ, બૅકઅપ, અપડેટ, ફોન વિશે"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"ભાષાઓ, બૅકઅપ, અપડેટ, ઉપકરણ વિશે"</string>
     <string name="search_results_title" msgid="1796252422574886932">"સેટિંગ્સ"</string>
     <string name="search_menu" msgid="6283419262313758339">"શોધ સેટિંગ્સ"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"શોધ સેટિંગ્સ"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"પરિણામો"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, નેટવર્ક કનેક્શન"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ટેક્સ્ટ સંદેશ, ટેક્સ્ટિંગ, સંદેશા, મેસેજિંગ"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"સેલ્યુલર, સેલ કેરીઅર, વાયરલેસ, ડેટા, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"સેલ્યુલર, મોબાઇલ, સેલ કૅરિઅર, વાયરલેસ, ડેટા, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, કૉલ, કૉલિંગ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"લોન્ચર"</string>
     <string name="keywords_display" msgid="8910345814565493016">"સ્ક્રીન, ટચસ્ક્રીન"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"ચેતવણી"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"વાઇબ્રેટ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ચાલુ થવા પર વાગનાર ધ્વનિ"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"ખલેલ પાડશો નહીં પસંદગીઓ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ફક્ત પ્રાધાન્યતાને મંજૂરી"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"સ્વયંચાલિત નિયમો"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"ખલેલ પાડશો નહીં સૂચિ સેટ કરો"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ડિફૉલ્ટ કાર્ય સૂચના ટોન"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ડિફૉલ્ટ કાર્ય એલાર્મ રિંગટોન"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"વ્યક્તિગત પ્રોફાઇલની જેમ જ"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"કાર્ય પ્રોફાઇલ ધ્વનિઓ બદલીએ?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"વ્યક્તિગત પ્રોફાઇલ ધ્વનિનો ઉપયોગ કરીએ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"બદલો"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"તમારી વર્તમાન કાર્ય પ્રોફાઇલ ધ્વનિઓ તમારી વ્યક્તિગત પ્રોફાઇલ ધ્વનિઓ સાથે બદલવામાં આવશે"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"તમારી વર્તમાન કાર્ય પ્રોફાઇલના ધ્વનિને બદલે તમારી વ્યક્તિગત પ્રોફાઇલના ધ્વનિ ઉપયોગમાં લેવાશે"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"રિંગટોન"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"અન્ય ધ્વનિ અને વાઇબ્રેશન"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"સૂચના પસંદગીઓ"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"કોઈ પરવાનગીઓ આપેલ નથી"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"કોઈ પરવાનગીઓની વિનંતી કરેલ નથી"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"બધી ઍપ્લિકેશનો"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"સક્ષમ કરેલ"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ઇન્સ્ટૉલ કરેલી ઍપ્લિકેશનો"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ઝટપટ ઍપ્લિકેશનો"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"વ્યક્તિગત"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"કાર્યાલય"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"અવરોધિત"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ડોમેન URL સાથે"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"વિગતવાર"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ઍપ્લિકેશનો ગોઠવો"</string>
     <string name="unknown_app" msgid="5275921288718717656">"અજાણી ઍપ્લિકેશન"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"કાર્ય માટે ડિફોલ્ટ"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"મદદ અને વૉઇસ ઇનપુટ"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"મદદ ઍપ્લિકેશન"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"કોઈ નહીં"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"મદદ ઍપ્લિકેશન પસંદ કરો"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ને તમારા સહાયક બનાવીએ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"તમારા સ્ક્રીન પર દૃશ્યક્ષમ અથવા ઍપ્લિકેશનો અંતર્ગત ઍક્સેસ કરી શકાય તેવી માહિતી સહિત તમારી સિસ્ટમ પર ઉપયોગમાં હોય તેવી ઍપ્લિકેશનો વિશેની માહિતી વાંચવામાં સહાયક સમર્થ હશે."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"સંમત છું"</string>
@@ -2966,6 +2958,8 @@
     <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">"બૅટરી ઓપ્ટિમાઇઝેશન"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"વપરાશ સંબંધી ચેતવણીઓ"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"બધી ઍપ્લિકેશનો બતાવો"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"વધારાની ઍપ્લિકેશનો છુપાવો"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ઓપ્ટિમાઇઝ કરેલ નથી"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ઓપ્ટિમાઇઝ કરેલ નથી"</string>
     <string name="high_power_off" msgid="3393904131961263278">"બૅટરી વપરાશને ઓપ્ટિમાઇઝ કરી રહ્યું છે"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"કૂલ રંગ તાપમાન"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"વધુ કૂલ પ્રદર્શન રંગોનો ઉપયોગ કરો"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"રંગ ફેરફાર લાગુ કરવા માટે, સ્ક્રીન બંધ કરો"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor ના ફેરફારો લાગુ કરવા, ઉપકરણને રીબૂટ કરો"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"સ્વચાલિત સિસ્ટમ અપડેટ્સ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HAL (રીબૂટ આવશ્યક)"</string>
     <string name="usage" msgid="2977875522080448986">"વપરાશ"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"સહાય હાવભાવ"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"વૈશ્વિક HTTP પ્રોક્સી સેટ કરી"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"વ્યવસ્થાપક ઉપકરણને લૉક કરી શકે છે અને પાસવર્ડ ફરીથી સેટ કરી શકે છે"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"વ્યવસ્થાપક ઉપકરણમાંનો બધો ડેટા કાઢી નાખી શકે છે"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <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="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"આ ઉપકરણ સંચાલિત છે."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"આ ઉપકરણનું સંચાલન <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા થાય છે"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"વધુ જાણો"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ફોટા અને વિડિઓઝ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"સંગીત અને ઑડિઓ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"રમતો"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"અન્ય ઍપ્લિકેશનો"</string>
     <string name="storage_files" msgid="8581083146777364063">"ફાઇલો"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"સ્ટોરેજ સંચાલક: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"બંધ"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ચાલુ"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"રમતો"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ઑડિઓ ફાઇલો"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"સંગીત"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> માટે અનઇન્સ્ટૉલ કરેલ)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(વપરાશકર્તા <xliff:g id="USER">%s</xliff:g> માટે અક્ષમ કરેલ)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"સ્વતઃભરણ ઍપ્લિકેશન"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index bca5fa5..63cce3f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाते"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"सुरक्षा और स्क्रीन लॉक"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"एन्क्रिप्शन और क्रेडेंशियल"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरा स्‍थान, स्‍क्रीन अनलॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"पासवर्ड"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"निजता"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"व्यवस्थापक के द्वारा अक्षम किया गया"</string>
     <string name="security_status_title" msgid="5848766673665944640">"सुरक्षा स्थिति"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"स्थान, फ़िंगरप्रिंट"</string>
@@ -670,7 +671,7 @@
     <string name="wifi_starting" msgid="6732377932749942954">"वाई-फ़ाई  चालू हो रहा है…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"वाई-फ़ाई  बंद हो रहा है…"</string>
     <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"सभी नेटवर्क देखें"</string>
-    <string name="wifi_error" msgid="3207971103917128179">"त्रुटि"</string>
+    <string name="wifi_error" msgid="3207971103917128179">"गड़बड़ी"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz बैंड इस देश में उपलब्‍ध नहीं है"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"हवाई जहाज़ मोड में"</string>
     <string name="wifi_notify_open_networks" msgid="76298880708051981">"खुले नेटवर्क का नोटिफ़िकेशन"</string>
@@ -824,7 +825,7 @@
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्‍पॉट को चालू किया जा रहा है…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्‍पॉट को बंद किया जा रहा है…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"पोर्टेबल हॉटस्‍पॉट <xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"पोर्टेबल वाई-फ़ाई  हॉटस्‍पॉट त्रुटि"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"पोर्टेबल वाई-फ़ाई  हॉटस्‍पॉट गड़बड़ी"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"वाई-फ़ाई  हॉटस्‍पॉट सेट करें"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"वाई-फ़ाई हॉटस्पॉट सेटअप"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK पोर्टेबल वाई-फ़ाई हॉटस्पॉट"</string>
@@ -1134,16 +1135,16 @@
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"इस <xliff:g id="NAME_0">^1</xliff:g> को सुरक्षित रूप से निकाल लिया गया है, लेकिन वह अभी भी उपलब्‍ध है. \n\nइस <xliff:g id="NAME_1">^1</xliff:g> का उपयोग करने के लिए, आपको पहले उसे माउंट करना होगा."</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"यह <xliff:g id="NAME_0">^1</xliff:g> दूषित है. \n\nइस <xliff:g id="NAME_1">^1</xliff:g> का उपयोग करने के लिए, आपको पहले उसे सेट करना होगा."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"यह डिवाइस इस <xliff:g id="NAME_0">^1</xliff:g> का समर्थन नहीं करता. \n\nइस डिवाइस के साथ इस <xliff:g id="NAME_1">^1</xliff:g> का उपयोग करने के लिए, आपको पहले उसे सेट करना होगा."</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"फ़ॉर्मेट करने के बाद, आप इस <xliff:g id="NAME_0">^1</xliff:g> का उपयोग अन्य डिवाइस में कर सकते हैं. \n\nइस <xliff:g id="NAME_1">^1</xliff:g> में मौजूद संपूर्ण डेटा मिटा दिया जाएगा. सबसे पहले बैकअप लेने पर विचार करें. \n\n"<b>"फ़ोटो और अन्य मीडिया का बैकअप लें"</b>" \nअपनी मीडिया फ़ाइलों को इस डिवाइस की वैकल्पिक मेमोरी में ले जाएं या USB केबल का उपयोग करके उन्हें किसी कंप्यूटर में ट्रांसफर करें. \n\n"<b>"ऐप्स का बैकअप लें"</b>" \nइस <xliff:g id="NAME_6">^1</xliff:g> में संग्रहीत सभी ऐप्स को अनइंस्टॉल कर दिया जाएगा और उनका डेटा मिटा दिया जाएगा. इन ऐप्स को बनाए रखने के लिए, उन्हें इस डिवाइस की वैकल्पिक मेमोरी में ले जाएं."</string>
-    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"जब आप इस <xliff:g id="NAME_0">^1</xliff:g> को निकालते हैं, तो इस पर संग्रहीत ऐप्‍स काम करना बंद कर देंगे और इस पर संग्रहीत मीडिया फ़ाइलें इसे पुन: लगाए जाने तक उपलब्‍ध नहीं होंगी."</b>" \n\nइस <xliff:g id="NAME_1">^1</xliff:g> को केवल इसी डिवाइस पर काम करने के लिए प्रारूपित किया गया है. यह किसी भी अन्‍य पर काम नहीं करेगा."</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"इस <xliff:g id="NAME">^1</xliff:g> में मौजूद ऐप्‍स, फ़ोटो या डेटा का उपयोग करने के लिए, उसे पुन: लगाएं. \n\nवैकल्‍पिक रूप से, यदि डिवाइस उपलब्‍ध नहीं हो तो आप इस मेमोरी को भूल जाना चुन सकते हैं. \n\nयदि आप भूल जाना चुनते हैं, तो डिवाइस में मौजूद सभी डेटा हमेशा के लिए खो जाएगा. \n\nआप बाद में ऐप्‍स पुन: इंस्‍टॉल कर सकते हैं, लेकिन इस डिवाइस पर संग्रहीत किया गया उनका डेटा खो जाएगा."</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"फ़ॉर्मेट करने के बाद, आप इस <xliff:g id="NAME_0">^1</xliff:g> का उपयोग अन्य डिवाइस में कर सकते हैं. \n\nइस <xliff:g id="NAME_1">^1</xliff:g> में मौजूद संपूर्ण डेटा मिटा दिया जाएगा. सबसे पहले बैकअप लेने पर विचार करें. \n\n"<b>"फ़ोटो और अन्य मीडिया का बैकअप लें"</b>" \nअपनी मीडिया फ़ाइलों को इस डिवाइस की वैकल्पिक मेमोरी में ले जाएं या USB केबल का उपयोग करके उन्हें किसी कंप्यूटर में ट्रांसफर करें. \n\n"<b>"ऐप्स का बैकअप लें"</b>" \nइस <xliff:g id="NAME_6">^1</xliff:g> में संग्रहित सभी ऐप्स को अनइंस्टॉल कर दिया जाएगा और उनका डेटा मिटा दिया जाएगा. इन ऐप्स को बनाए रखने के लिए, उन्हें इस डिवाइस की वैकल्पिक मेमोरी में ले जाएं."</string>
+    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"जब आप इस <xliff:g id="NAME_0">^1</xliff:g> को निकालते हैं, तो इस पर संग्रहित ऐप्‍स काम करना बंद कर देंगे और इस पर संग्रहित मीडिया फ़ाइलें इसे पुन: लगाए जाने तक उपलब्‍ध नहीं होंगी."</b>" \n\nइस <xliff:g id="NAME_1">^1</xliff:g> को केवल इसी डिवाइस पर काम करने के लिए प्रारूपित किया गया है. यह किसी भी अन्‍य पर काम नहीं करेगा."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"इस <xliff:g id="NAME">^1</xliff:g> में मौजूद ऐप्‍स, फ़ोटो या डेटा का उपयोग करने के लिए, उसे पुन: लगाएं. \n\nवैकल्‍पिक रूप से, यदि डिवाइस उपलब्‍ध नहीं हो तो आप इस मेमोरी को भूल जाना चुन सकते हैं. \n\nयदि आप भूल जाना चुनते हैं, तो डिवाइस में मौजूद सभी डेटा हमेशा के लिए खो जाएगा. \n\nआप बाद में ऐप्‍स पुन: इंस्‍टॉल कर सकते हैं, लेकिन इस डिवाइस पर संग्रहित किया गया उनका डेटा खो जाएगा."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> को भूल जाएं?"</string>
-    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"इस <xliff:g id="NAME">^1</xliff:g> पर संग्रहीत सभी ऐप्‍स, फ़ोटो और डेटा हमेशा के लिए खो जाएंगे."</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"इस <xliff:g id="NAME">^1</xliff:g> पर संग्रहित सभी ऐप्‍स, फ़ोटो और डेटा हमेशा के लिए खो जाएंगे."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"ऐप्स"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"चित्र"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"वीडियो"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"ऑडियो"</string>
-    <string name="storage_detail_cached" msgid="8547136365247818567">"संग्रहीत डेटा"</string>
+    <string name="storage_detail_cached" msgid="8547136365247818567">"संग्रहित डेटा"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"अन्य"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्‍सप्‍लोर करें"</string>
@@ -1154,11 +1155,11 @@
     <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_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>
-    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"इसके लिए <xliff:g id="NAME_0">^1</xliff:g> को प्रारूपित किए जाने की आवश्‍यकता है. \n\n"<b>"प्रारूपित करने से वर्तमान में <xliff:g id="NAME_1">^1</xliff:g> पर संग्रहीत सभी डेटा मिट जाता है."</b>" डेटा खोने से बचाने के लिए, उसका बैक अप लेने पर विचार करें."</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"इसके लिए <xliff:g id="NAME_0">^1</xliff:g> को प्रारूपित किए जाने की आवश्‍यकता है. \n\n"<b>"प्रारूपित करने से वर्तमान में <xliff:g id="NAME_1">^1</xliff:g> पर संग्रहित सभी डेटा मिट जाता है."</b>" डेटा खोने से बचाने के लिए, उसका बैक अप लेने पर विचार करें."</string>
     <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"मिटाएं और फ़ॉर्मेट करें"</string>
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट किया जा रहा है…"</string>
     <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट करते समय ना निकालें."</string>
@@ -1271,7 +1272,7 @@
     <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB मेमोरी के उपयोग में होने पर टेदर नहीं हो सकता"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB कनेक्ट नहीं किया गया"</string>
     <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"चालू करने के लिए कनेक्ट करें"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB टेदरिंग त्रुटि"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB टेदरिंग गड़बड़ी"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ब्लूटूथ टेदरिंग"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="4328374808439440517">"इस टेबलेट का इंटरनेट कनेक्‍शन शेयर किया जा रहा है"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="7451579908917710359">"इस फ़ोन के इंटरनेट कनेक्‍शन को शेयर किया जा रहा है"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"डिवाइस स्क्रीन लॉक के समान"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"ऐप्स  प्रबंधित करें"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"इंस्‍टॉल किए गए ऐप्स प्रबंधित करें और निकालें"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"ऐप की जानकारी"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"ऐप्स प्रबंधित करें, त्‍वरित लॉन्‍च शॉर्टकट सेट करें"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"ऐप्स सेटिंग"</string>
     <string name="install_applications" msgid="4872012136210802181">"अज्ञात स्रोत"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"स्‍थान प्रबंधित करें"</string>
     <string name="filter" msgid="2018011724373033887">"फ़िल्टर"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"फ़िल्‍टर विकल्‍प चुनें"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"सभी"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"अक्षम"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"सभी ऐप"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"अक्षम किए गए ऐप"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"डाउनलोड किए गए"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"चल रहे ऐप्स"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB मेमोरी"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD कार्ड पर"</string>
     <string name="disabled" msgid="9206776641295849915">"अक्षम किया गया"</string>
     <string name="not_installed" msgid="2797554494953450291">"इस उपयोगकर्ता के लिए इंस्‍टॉल नहीं किया गया"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"इंस्‍टॉल किया गया"</string>
     <string name="no_applications" msgid="7336588977497084921">"कोई ऐप्स नहीं."</string>
     <string name="internal_storage" msgid="1584700623164275282">"मोबाइल मेमोरी"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"आंतरिक मेमोरी"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"इनपुट पद्धति सेट करें"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"सेटिंग"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"सेटिंग"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"टाइप करने की सक्रीय पद्धतियां"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"सिस्टम की भाषाओं का उपयोग करें"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> सेटिंग"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"सक्रिय इनपुट पद्धतियां चुनें"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ऑनस्‍क्रीन कीबोर्ड सेटिंग"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"स्क्रीन आवर्धन का नई जानकारी अपने आप पाएं"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ऐप्स  संक्रमणों पर स्क्रीन आवर्धन का नई जानकारी पाएं"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"पावर बटन कॉल बंद करता है"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"पासवर्ड बोलें"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"बड़ा माउस सूचक"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"मोनो ऑडियो"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ऑडियो चलाते समय चैनल संयोजित करें"</string>
@@ -1822,7 +1818,7 @@
     <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_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_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>
     <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"खोज बॉक्स प्रदर्शित है"</string>
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"खोज बॉक्स छुपा हुआ है"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"आखरी चार्ज से अब तक का उपयोग"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"स्क्रीन का उपयोग"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रीन के लिए खपत"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कैनिंग"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"पिछली बार पूरा चार्ज होने के बाद से अब तक का ऐप उपयोग"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"पिछली बार पूरा चार्ज होने के बाद से अब तक का डिवाइस उपयोग"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्‍लग होने के बाद से बैटरी का उपयोग"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"रीसेट के बाद से बैटरी उपयोग"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"बैटरी पर <xliff:g id="TIME">%1$s</xliff:g> और है"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"पावर का अत्यधिक उपयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s के लिए उपयोग किया गया"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"पूरी बैटरी का %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"पिछली बार पूरी तरह चार्ज होने के बाद से अब तक के उपयोग का विश्लेषण"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"अनुमानित बचा हुआ समय"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"पूरी तरह से चार्ज होने के लिए समय"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"उपयोग के आधार पर अनुमान बदल सकता है"</string>
     <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>
@@ -2023,7 +2025,7 @@
     <string name="trusted_credentials" msgid="4266945289534242402">"विश्वसनीय प्रमाणिकता"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"विश्वस्त CA प्रमाणपत्र दिखाएं"</string>
     <string name="user_credentials" msgid="3719013347787187083">"उपयोगकर्ता प्रमाणिकता"</string>
-    <string name="user_credentials_summary" msgid="7271228342106080167">"संग्रहीत प्रमाणिकता देखें और बदलाव करें"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"संग्रहित प्रमाणिकता देखें और बदलाव करें"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"अतिरिक्त सेटिंग"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"मेमोरी का प्रकार"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेयर-समर्थित"</string>
@@ -2056,11 +2058,11 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"अपने आप डेटा रिस्टोर करें"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"किसी ऐप्स को पुन: इंस्‍टॉल करने पर, बैकअप ली गई सेटिंग और डेटा पुनर्स्‍थापित करें"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"बैकअप सेवा निष्‍क्रिय है."</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"वर्तमान में कोई भी खाता बैकअप डेटा संग्रहीत नहीं कर रहा है"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"वर्तमान में कोई भी खाता बैकअप डेटा संग्रहित नहीं कर रहा है"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"अपने वाई-फ़ाई  पासवर्ड, बुकमार्क, अन्य सेटिंग और ऐप्स डेटा को सुरक्षित रखें, साथ ही Google सर्वर से सभी प्रतियां मिटाएं?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"डिवाइस डेटा (जैसे वाई-फ़ाई पासवर्ड और कॉल इतिहास) और ऐप डेटा (जैसे सेटिंग और ऐप्स द्वारा संग्रहीत फ़ाइलों) का बैक अप लेना बंद करें, साथ ही रिमोट सर्वर से सभी प्रतियां मिटाएं?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"दूरस्थ रूप से अपने आप डिवाइस डेटा (जैसे वाई-फ़ाई पासवर्ड और कॉल इतिहास) और ऐप डेटा (जैसे ऐप्स द्वारा संग्रहीत सेटिंग और फ़ाइलों) का बैक अप लें.\n\nजब आप स्वचालित बैकअप चालू करते हैं, तो डिवाइस और ऐप डेटा को दूरस्थ रूप से समय-समय पर सहेजा जाता है. ऐप डेटा कोई भी ऐसा डेटा हो सकता है जिसे किसी ऐप द्वारा सहेजा गया है (डेवलपर सेटिंग के आधार पर), जिसमें संभावित रूप से संवेदनशील डेटा जैसे संपर्क, संदेश और फ़ोटो शामिल हैं."</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"डिवाइस डेटा (जैसे वाई-फ़ाई पासवर्ड और कॉल इतिहास) और ऐप डेटा (जैसे सेटिंग और ऐप्स द्वारा संग्रहित फ़ाइलों) का बैक अप लेना बंद करें, साथ ही रिमोट सर्वर से सभी प्रतियां मिटाएं?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"दूरस्थ रूप से अपने आप डिवाइस डेटा (जैसे वाई-फ़ाई पासवर्ड और कॉल इतिहास) और ऐप डेटा (जैसे ऐप्स द्वारा संग्रहित सेटिंग और फ़ाइलों) का बैक अप लें.\n\nजब आप स्वचालित बैकअप चालू करते हैं, तो डिवाइस और ऐप डेटा को दूरस्थ रूप से समय-समय पर सहेजा जाता है. ऐप डेटा कोई भी ऐसा डेटा हो सकता है जिसे किसी ऐप द्वारा सहेजा गया है (डेवलपर सेटिंग के आधार पर), जिसमें संभावित रूप से संवेदनशील डेटा जैसे संपर्क, संदेश और फ़ोटो शामिल हैं."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"डिवाइस की व्‍यवस्‍थापन सेटिंग"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"डिवाइस नियंत्रक"</string>
     <string name="remove_device_admin" msgid="7736174723276745230">"इस डिवाइस व्यवस्थापक को निष्क्रिय करें"</string>
@@ -2077,7 +2079,7 @@
     <string name="device_admin_warning" msgid="2026747446313628233">"इस व्‍यवस्‍थापक को सक्रिय करने से <xliff:g id="APP_NAME">%1$s</xliff:g> ऐप्स निम्न कार्य कर सकेगा:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"यह व्‍यवस्‍थापक सक्रिय है और ऐप्स <xliff:g id="APP_NAME">%1$s</xliff:g> को निम्‍न कार्य करने देता है:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"प्रोफाइल प्रबंधक सक्रिय करें?"</string>
-    <string name="adding_profile_owner_warning" msgid="8081841501073689534">"आगे बढ़ने से, आपके उपयोगकर्ता को आपके व्यवस्थापक द्वारा प्रबंधित किया जाएगा जो आपके व्यक्तिगत डेटा के अलावा संबद्ध डेटा भी संग्रहीत कर सकेगा.\n\nआपके व्यवस्थापक के पास नेटवर्क गतिविधि और आपके डिवाइस की स्थान जानकारी सहित इस उपयोगकर्ता से संबद्ध सेटिंग, एक्सेस, ऐप्स और डेटा की निगरानी करने की क्षमता होती है."</string>
+    <string name="adding_profile_owner_warning" msgid="8081841501073689534">"आगे बढ़ने से, आपके उपयोगकर्ता को आपके व्यवस्थापक द्वारा प्रबंधित किया जाएगा जो आपके व्यक्तिगत डेटा के अलावा संबद्ध डेटा भी संग्रहित कर सकेगा.\n\nआपके व्यवस्थापक के पास नेटवर्क गतिविधि और आपके डिवाइस की स्थान जानकारी सहित इस उपयोगकर्ता से संबद्ध सेटिंग, एक्सेस, ऐप्स और डेटा की निगरानी करने की क्षमता होती है."</string>
     <string name="admin_disabled_other_options" msgid="4564776259414246934">"अन्य विकल्पों को आपके व्यवस्थापक द्वारा अक्षम किया गया है."</string>
     <string name="admin_more_details" msgid="7901420667346456102">"अधिक विवरण"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"शीर्षक-रहित"</string>
@@ -2116,7 +2118,7 @@
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"अब समन्वयित हो रहा है"</string>
-    <string name="accessibility_sync_error" msgid="8703299118794272041">"समन्वयन त्रुटि."</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"समन्वयन गड़बड़ी."</string>
     <string name="sync_failed" msgid="1696499856374109647">"समन्‍वयन विफल"</string>
     <string name="sync_active" msgid="8476943765960863040">"समन्‍वयन सक्रिय"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"समन्वयित करें"</string>
@@ -2133,7 +2135,7 @@
     <string name="sync_automatically" msgid="1682730255435062059">"ऐप्स  डेटा स्‍वत: समन्‍वयित करें"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"समन्वयन चालू है"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"समन्वयन बंद है"</string>
-    <string name="sync_error" msgid="5060969083117872149">"समन्वयन त्रुटि"</string>
+    <string name="sync_error" msgid="5060969083117872149">"समन्वयन गड़बड़ी"</string>
     <string name="last_synced" msgid="4242919465367022234">"अंतिम समन्‍वयन <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g> को किया गया"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"समन्वयित हो रहा है…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"बैक अप सेटिंग"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"हमेशा चालू, निष्क्रिय है"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"यह ऐप्लिकेशन समर्थन नहीं करता है"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"कनेक्शन की अनुमति केवल VPN के माध्यम से है"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN कनेक्शन ज़रूरी है?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"लॉकडाउन सक्रिय"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"लॉकडाउन निष्‍क्रिय"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"वह VPN प्रोफ़ाइल चुनें जिससे हमेशा कनेक्ट रहना है. नेटवर्क ट्रैफ़िक की अनुमति केवल इस VPN से कनेक्ट रहने पर ही दी जाएगी."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"प्रतिबंधित प्रोफ़ाइल खाते नहीं जोड़ सकती हैं"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"इस डिवाइस से <xliff:g id="USER_NAME">%1$s</xliff:g> को हटाएं"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"लॉक स्‍क्रीन सेटिंग"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"लॉक स्क्रीन से उपयोगकर्ताओं को जोड़ें"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"नया उपयोगकर्ता"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"नई प्रोफ़ाइल"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"स्वयं को हटाएं?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फ़ोन कॉल और SMS चालू करें?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"कॉल और SMS इतिहास इस उपयोगकर्ता के साथ साझा किया जाएगा."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आपातकालीन जानकारी"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> के बारे में जानकारी"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> की जानकारी और संपर्क"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ऐप्स  और सामग्री की अनुमति दें"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंधों वाले ऐप्स"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ऐप्स  सेटिंग विस्तृत करें"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="one">छिपे हुए %d आइटम दिखाएं</item>
       <item quantity="other">छिपे हुए %d आइटम दिखाएं</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"नेटवर्क और इंटरनेट"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"वाई-फ़ाई, सेल्युलर, डेटा उपयोग, हॉटस्पॉट"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क और इंटरनेट"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"वाई-फ़ाई, मोबाइल, डेटा उपयोग, हॉटस्पॉट"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"कनेक्ट किए गए डिवाइस"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"ब्लूटूथ, NFC, कास्ट"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ऐप्लिकेशन और नोटिफ़िकेशन"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"परिणाम"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"वाईफ़ाई, वाई-फ़ाई नेटवर्क कनेक्शन"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"पाठ संदेश पाठ संदेश भेजना मेसेज सेवा"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"सेल्युलर सेल वाहक वायरलेस डेटा 4g 3g 2g lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"सेल्युलर, मोबाइल, सेल वाहक, वायरलेस, डेटा, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"वाईफ़ाई, वाई-फ़ाई, कॉल, कॉलिंग"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लॉन्चर"</string>
     <string name="keywords_display" msgid="8910345814565493016">"स्क्रीन, टचस्क्रीन"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"नोटिफिकेशन"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"कंपन"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"चालू होने की ध्वनि"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"परेशान न करें की प्राथमिकताएं"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"प्राथमिकता इनकी अनुमति देती है"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"स्वचालित नियम"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"परेशान न करें शेड्यूल सेट करें"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"डिफ़ॉल्‍ट कार्य नोटिफ़िकेशन टोन"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"डिफ़ॉल्‍ट कार्य अलार्म रिंगटोन"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"व्यक्तिगत प्रोफ़ाइल के समान"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"कार्य प्रोफाइल ध्वनियां बदलें?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"व्यक्तिगत प्रोफ़ाइल की ध्वनियों का उपयोग करना चाहते हैं?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"बदलें"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"आपकी वर्तमान कार्य प्रोफ़ाइल की ध्वनियां आपकी व्यक्तिगत प्रोफ़ाइल की ध्वनियों से बदल दी जाएंगी"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"आपकी अभी वाली कार्य प्रोफ़ाइल की ध्वनियों के बजाय आपकी व्यक्तिगत प्रोफ़ाइल की ध्वनियों का उपयोग किया जाएगा"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"रिंगटोन"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"अन्य ध्‍वनियां और कंपन"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"नोटिफ़िकेशन प्राथमिकताएं"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"कोई अनुमति नहीं दी गई"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"किसी अनुमति का अनुरोध नहीं किया गया"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"सभी ऐप्स"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"सक्षम"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"इंस्‍टॉल किए गए ऐप"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"झटपट ऐप"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्यस्‍थल"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"अवरोधित"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URL के साथ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"अतिरिक्‍त सेटिंग"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ऐप्स कॉन्‍फ़िगर करें"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात ऐप"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"कार्य के लिए डिफ़ॉल्ट"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"सहायक और वॉइस इनपुट"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"सहायक ऐप"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"कोई नहीं"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"सहायक ऐप चुनें"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> को आपका सहायक बनाएं?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"सहायक, आपके सिस्‍टम पर उपयोग किए जा रहे ऐप्‍स के बारे में जानकारी पढ़ सकेगा, जिसमें आपके स्‍क्रीन पर दृश्‍यमान जानकारी या ऐप्‍स में ऐक्‍सेस करने योग्‍य जानकारी शामिल होगी."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"सहमत"</string>
@@ -2959,6 +2958,8 @@
     <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">"बैटरी ऑप्‍टिमाइज़ेशन"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"उपयोग संबंधी सूचनाएं"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"सभी ऐप दिखाएं"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"अतिरिक्त ऐप छिपाएं"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ऑप्‍टिमाइज़ नहीं किया गया"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ऑप्‍टिमाइज़ नहीं किया गया"</string>
     <string name="high_power_off" msgid="3393904131961263278">"बैटरी उपयोग ऑप्‍टिमाइज़ किया जा रहा है"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"शीतल रंग तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"अधिक शीतल प्रदर्शन रंगों का उपयोग करें"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदलाव लागू करने के लिए, स्‍क्रीन बंद करें"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलीफ़ोनी मॉनिटर बदलाव लागू करने के लिए, डिवाइस को रीबूट करें"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वचालित सिस्टम अपडेट"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"बाइंड किए गए HAL (फिर से बूट करना ज़रूरी है)"</string>
     <string name="usage" msgid="2977875522080448986">"उपयोग"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"सहायक हावभाव"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"वैश्विक HTTP प्रॉक्सी सेट है"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"व्यवस्थापक डिवाइस को लॉक कर सकता है और पासवर्ड को रीसेट कर सकता है"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"व्यवस्थापक डिवाइस का सभी डेटा हटा सकता है"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <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="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"यह डिवाइस प्रबंधित है."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> इस डिवाइस को प्रबंधित करता है."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"अधिक जानें"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"फ़ोटो और वीडियो"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"संगीत और ऑडियो"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"गेम"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"अन्य ऐप्लिकेशन"</string>
     <string name="storage_files" msgid="8581083146777364063">"फ़ाइलें"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"जगह प्रबंधक: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"बंद"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"चालू"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"गेम"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ऑडियो फ़ाइलें"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"संगीत"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए अनइंस्टॉल है)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए अक्षम है)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ऑटोमैटिक भरने का ऐप्लिकेशन"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 328144b..6bab86f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -332,9 +332,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Sigurnost i zaključavanje zaslona"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripcija i vjerodajnice"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Zaporke"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privatnost"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Onemogućio administrator"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Sigurnosni status"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Lokacija, otisak prsta"</string>
@@ -1436,8 +1437,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Isto kao i zaključavanje zaslona na uređaju"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljanje aplikacijama"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje instaliranim aplikacijama i njihovo uklanjanje"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informacije o aplikaciji"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Upravljanje aplikacijama, postavljanje prečaca za brzo pokretanje"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Postavke aplikacije"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nepoznati izvori"</string>
@@ -1498,16 +1498,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
     <string name="filter" msgid="2018011724373033887">"Filtar"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Odabir opcije filtra"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Sve"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Onemogućeno"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Sve aplikacije"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Onemogućene aplikacije"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Preuzeto"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Pokrenuto"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Memorija USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na SD kartici"</string>
     <string name="disabled" msgid="9206776641295849915">"Onemogućeno"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nije instalirano za korisnika"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instalirano"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nema aplikacija."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Unutarnja pohrana"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"interna pohrana"</string>
@@ -1685,8 +1684,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Postavljanje načina unosa"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Postavke"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Postavke"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktivni načini unosa"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Upotrijebi jezike sustava"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> postavke"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Odabir aktivnih načina unosa"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Postavke zaslonske tipkovnice"</string>
@@ -1730,7 +1727,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Autom. ažuriranje uvećanja zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ažuriranje uvećanja zaslona pri izmjeni aplikacija"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tipka za uklj. prekida poziv"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Izgovori zaporke"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Veliki pokazivač miša"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monoaudio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
@@ -1850,7 +1846,11 @@
     <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 je <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 dovršetka punjenja"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Upotreba od posljednje napunjenosti"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Upotreba zaslona"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja za zaslon"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Pretraživanje mobilnih mreža"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Upotreba aplikacija od posljednjeg potpunog punjenja"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Upotreba uređaja od posljednjeg potpunog punjenja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Upotreba baterije nakon isključivanja"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Upotreba baterije od poništavanja"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na bateriji"</string>
@@ -1940,8 +1940,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Previše obračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Korišteno %1$s"</string>
-    <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Raščlamba potrošnje od posljednjeg potpunog punjenja"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ukupne potrošnje baterije"</string>
+    <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Razrada potrošnje od posljednjeg potpunog punjenja"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Procijenjeno preostalo vrijeme"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Vrijeme do potpunog punjenja"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Procjena se može mijenjati ovisno o upotrebi"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kod posljednjeg isključivanja za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2333,6 +2335,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Značajka Uvijek uključeno nije aktivna"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ova aplikacija ne podržava tu opciju"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Dopusti veze samo putem VPN-a"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Zahtijevati VPN vezu?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Zaključavanje aktivno"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Zaključavanje neaktivno"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Odaberite VPN profil s kojim ćete uvijek biti povezani. Mrežni promet bit će dopušten samo kada ste povezani s tom VPN mrežom."</string>
@@ -2422,8 +2425,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ograničeni profili ne mogu dodavati račune"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g>: brisanje s uređaja"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Postavke zaključavanja zaslona"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Dodavanje korisnika sa zaključanog zaslona"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novi korisnik"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novi profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Izbrisati sebe?"</string>
@@ -2451,7 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Želite li uključiti telefonske pozive i SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Povijest poziva i SMS-ova dijelit će se s tim korisnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije u hitnom slučaju"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informacije o korisniku <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informacije i kontakti za korisnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dopuštanje aplikacija i sadržaja"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije s ograničenjima"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi postavke za aplikaciju"</string>
@@ -2572,8 +2574,8 @@
       <item quantity="few">Prikaži %d skrivene stavke</item>
       <item quantity="other">Prikaži %d skrivenih stavki</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Mreža i internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobilna mreža, upotreba podataka, žarišna točka"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Mreža i internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilna mreža, upotreba podataka, žarišna točka"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, emitiranje"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavijesti"</string>
@@ -2589,7 +2591,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Rezultati"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"Wi-Fi, wi-fi, mrežna veza"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekstna poruka, slanje SMS-a, poruke, slanje poruka"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobilno, mobilni operater, bežično, podaci, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilno, mobilna mreža, mobilni operater, bežično, podaci, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"Wi-Fi, wi-fi, poziv, pozivanje"</string>
     <string name="keywords_home" msgid="3626170808219458848">"pokretač"</string>
     <string name="keywords_display" msgid="8910345814565493016">"zaslon, dodirni zaslon"</string>
@@ -2665,8 +2667,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozorenje"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibriranje"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Uključi zvukove"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Postavke načina Ne uznemiravaj"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritetni način dopušta samo sljedeće"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Postavi raspored za Ne ometaj"</string>
@@ -2683,9 +2684,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Zadani zvuk radne obavijesti"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Zadana melodija radnog alarma"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Isto kao osobni profil"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Zamjena zvuka radnog profila?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Želite li upotrebljavati zvukove osobnog profila?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Zamijeni"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Trenutačni zvukovi radnog profila zamijenit će se zvukovima osobnog profila"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Zvukovi vašeg osobnog profila upotrebljavat će se umjesto trenutačnih zvukova vašeg radnog profila"</string>
     <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="7447797716856573587">"Postavke obavijesti"</string>
@@ -2927,11 +2928,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nije odobreno nijedno dopuštenje"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nije zatraženo nijedno dopuštenje"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Sve aplikacije"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Omogućeno"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Instalirane aplikacije"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant aplikacije"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobno"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Posao"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirano"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S URL-ovima domena"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Napredno"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguranje aplikacija"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
@@ -2957,8 +2958,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Zadano za posao"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Pomoćnik i glasovni unos"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplikacija-pomoćnik"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ništa"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Odaberite aplikaciju Pomoćnik"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Želite li da <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> bude vaš pomoćnik?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Pomoćnik će moći čitati podatke o aplikacijama koje se upotrebljavaju u vašem sustavu, uključujući podatke vidljive na zaslonu ili podatke kojima se može pristupiti u aplikacijama."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Slažem se"</string>
@@ -2988,6 +2987,8 @@
     <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">"Optimizacija baterije"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozorenja o upotrebi"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Pokaži sve aplikacije"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nije optimizirano"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nije optimizirano"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimiziranje upotrebe baterije"</string>
@@ -3170,6 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Upotrebljavaj hladnije boje prikaza"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primijenili promjenu boje, isključite zaslon"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Da biste primijenili promjenu koju je izvršio TelephonyMonitor, ponovo pokrenite uređaj."</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatska ažuriranja sustava"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Uvezani (binderized) HAL-ovi (zahtijeva ponovno pokretanje)"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
@@ -3351,6 +3353,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da biste provjerili obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani telefona."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da biste provjerili obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da biste provjerili obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani uređaja."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Pomoćni pokret"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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">"Početni program za pokretanje već je otključan"</string>
@@ -3418,12 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Postavljen je globalni HTTP proxy"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrator može zaključati uređaj i poništiti zaporku"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator može izbrisati sve podatke na uređaju"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja svih podataka s uređaja</item>
+      <item quantity="few">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja svih podataka s uređaja</item>
+      <item quantity="other">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja svih podataka s uređaja</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja podataka radnog profila</item>
+      <item quantity="few">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja podataka radnog profila</item>
+      <item quantity="other">Administrator je postavio maksimalan broj pokušaja unosa zaporke na <xliff:g id="COUNT_1">%d</xliff:g> prije brisanja podataka radnog profila</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Ovo je upravljani uređaj."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saznajte više"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotografije i videozapisi"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Glazba i zvuk"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ostale aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
@@ -3434,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj pohrane: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Isključeno"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Uključeno"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiodatoteke"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Glazba"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacija za automatsko popunjavanje"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 93712db..4ed0167 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Tartózkodási hely"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Fiókok"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Biztonság és képernyőzár"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Titkosítás és hitelesítési adatok"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM-kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Jelszavak"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Adatvédelem"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Letiltva a rendszergazda által"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Biztonsági állapot"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Tartózkodási hely, ujjlenyomat"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fi-hálózat kiválasztása"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Bekapcsolja a Wi-Fit?"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi kikapcsolása..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Összes hálózat megjelenítése"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Hiba"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Az 5 GHz-es sáv nem áll rendelkezésre ebben az országban"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Repülési üzemmódban"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth megosztása"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Megosztás"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Hotspot és netmegosztás"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot és internetmegosztás bekapcsolva"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Hotspot bekapcsolva"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Internetmegosztás"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Ha az Adatforgalom-csökkentő be van kapcsolva, nem lehet használni az internetmegosztás és a hordozható hotspot funkciókat"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB megosztás"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Ugyanaz, mint az eszköz képernyőzára"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Alkalmazások kezelése"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Telepített alkalmazások kezelése és eltávolítása"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Alkalmazásinformáció"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Alkalmazások kezelése, gyorsindító parancsikonok létrehozása"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Alkalmazásbeállítások"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ismeretlen források"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Tárhely kezelése"</string>
     <string name="filter" msgid="2018011724373033887">"Szűrő"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Válasszon szűrési lehetőségeket"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Összes"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Nincs engedélyezve"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Az összes alkalmazás"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Letiltott alkalmazások"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Letöltött"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Futó"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-tár"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Az SD-kártyán"</string>
     <string name="disabled" msgid="9206776641295849915">"Letiltva"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nincs telepítve e felh.-hoz"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Telepítve"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nincsenek alkalmazások."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Belső tárhely"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"belső tárhely"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Beviteli módok beállítása"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Beállítások"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Beállítások"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktív beviteli módok"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Rendszernyelvek használata"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> beállításai"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Válasszon aktív beviteli módokat"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Képernyőbillentyűzet beállításai"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Képernyőnagyítás automatikus frissítése"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Nagyítás frissítése az alkalmazások közti átmeneteknél"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Bekapcs. gomb megszakítja a hívást"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Jelszavak kimondása"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Nagy egérmutató"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monó hang"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Csatornák kombinálása hang lejátszásakor"</string>
@@ -1837,7 +1829,11 @@
     <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> van hátra"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> a feltöltéshez"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Használat az utolsó teljes feltöltés óta"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Képernyőhasználat"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"A képernyő energiafogyasztása"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobilhálózat keresése"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Alkalmazáshasználat a legutolsó teljes feltöltés óta"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Eszközhasználat a legutolsó teljes feltöltés óta"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkumulátorhasználat a legutolsó töltés óta"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akkumulátorhasználat a visszaállítás óta"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> akkumulátorról"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Túlbecsült energiafogyasztás"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Használat időtartama: %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"Az akkumulátor teljes töltöttségi szintjének %1$s-a"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Akkumulátorhasználati statisztikák az utolsó teljes feltöltés óta"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Becsült hátralévő idő"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"A teljes feltöltésig hátralévő idő"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Előfordulhat, hogy a használattól függően a becslés módosul"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> az utolsó töltés óta"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Töltés nélkül eltöltött idő: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Használat összesen"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"A „mindig bekapcsolt” mód inaktív"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ez az alkalmazás nem támogatja"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Csak VPN-en keresztül engedje a kapcsolatokat"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Kötelezővé teszi a VPN-kapcsolatot?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Lezárás aktív"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Lezárás inaktív"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Válasszon ki egy VPN-profilt, amelyhez mindig csatlakozni szeretne. A hálózati forgalom csak akkor lesz engedélyezve, ha ehhez a VPN-hez csatlakozik."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Korlátozott profilok nem adhatnak hozzá fiókokat"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> törlése"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Lezárási képernyő beállításai"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Felhasználók hozzáadása a lezárási képernyőről"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Új felhasználó"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Új profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Törli önmagát?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Engedélyezi a hívásokat és SMS-eket?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"A rendszer megosztja az SMS- és híváslistát ezzel a felhasználóval."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Segélyhívási információk"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Információk róla: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Adatok és névjegyek: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Alkalmazások és tartalmak engedélyezése"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Alkalmazások korlátozásokkal"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Alkalmazásbeállítás megnyitása"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">%d rejtett elem megjelenítése</item>
       <item quantity="one">%d rejtett elem megjelenítése</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Hálózat és internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobil, adathasználat, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Hálózat és internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, adathasználat, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Társított eszközök"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, átküldés"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Alkalmazások és értesítések"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Felhasználó és fiókok"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Alapértelmezett alkalmazások"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Nyelvek, biztonsági másolat, frissítések, a telefonról"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Nyelvek, biztonsági másolat, frissítések, az eszközről"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Beállítások"</string>
     <string name="search_menu" msgid="6283419262313758339">"Keresési beállítások"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Keresési beállítások"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Találatok"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, hálózati kapcsolat"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"szöveges üzenet, szöveges üzenet küldése, üzenetek, üzenetváltás"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobil, mobilszolgáltató, vezeték nélküli, adat, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilhálózat, mobil, mobilszolgáltató, vezeték nélküli, adat, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, hív, hívás"</string>
     <string name="keywords_home" msgid="3626170808219458848">"indító"</string>
     <string name="keywords_display" msgid="8910345814565493016">"képernyő, érintőképernyő"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Figyelmeztetés"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Rezgés"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Indítási hangok"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"A „Ne zavarjanak” beállításai"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Csak a prioritást élvezők"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatikus szabályok"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"A „Ne zavarjanak” ütemezése"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Munkaprofil alapértelmezett értesítési hangja"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Munkaprofil alapértelmezett riasztási hangja"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Ugyanaz, mint a személyes profilban"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Lecseréli a munkaprofil hangbeállításait?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Szeretné a személyes profil hangbeállításait használni?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Csere"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"A munkaprofil jelenlegi hangbeállításait lecseréljük a személyes profilban lévőkkel"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"A rendszer az Ön személyes profiljának hangbeállításait fogja használni a munkaprofil jelenlegi hangbeállításai helyett"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Csengőhangok"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Egyéb hangok és rezgések"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Értesítési beállítások"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nincsenek megadott engedélyek"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nincsenek kért engedélyek"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Az összes alkalmazás"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Engedélyezve"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Telepített alkalmazások"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Azonnali alkalmazások"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Személyes"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Munkahelyi"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Letiltva"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domain URL-ekkel"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Speciális"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Alkalmazások konfigurálása"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ismeretlen alkalmazás"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Munkahelyi alapértelmezett"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Segédalkalmazás és hangbevitel"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Segédalkalmazás"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Nincs"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Segédalkalmazás kiválasztása"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Legyen <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> a segédalkalmazása?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"A segéd hozzáfér majd a rendszer éppen használatban lévő alkalmazásainak információihoz, beleértve a képernyőn megjelenő vagy az alkalmazásokban elérhető információkat is."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Elfogadom"</string>
@@ -2966,6 +2958,8 @@
     <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">"Akkumulátoroptimalizálás"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Használati értesítések"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Összes alkalmazás mutatása"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"További alkalmazások elrejtése"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nincs optimalizálva"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nincs optimalizálva"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akkumulátorhasználat optimalizálása"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hideg színhőmérséklet"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Hidegebb színhőmérséklet használata a kijelzőn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"A színmódosítások alkalmazásához kapcsolja ki a képernyőt"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"A telefonos szolgáltatások figyelésének módosításához indítsa újra az eszközt"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatikus rendszerfrissítések"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binder osztályú HAL-ok (újraindítás szükséges)"</string>
     <string name="usage" msgid="2977875522080448986">"Használat"</string>
@@ -3323,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Megtekintheti értesítéseit, ha ujját lefelé húzza a telefonja hátulján található ujjlenyomat-érzékelőn."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Megtekintheti értesítéseit, ha ujját lefelé húzza a táblagépe hátulján található ujjlenyomat-érzékelőn."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Megtekintheti értesítéseit, ha ujját lefelé húzza az eszköze hátulján található ujjlenyomat-érzékelőn."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Segítő kézmozdulat"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Bekapcsolva"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Kikapcsolva"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"A rendszerbetöltő már fel van oldva"</string>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globális HTTP proxy beállítva"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"A rendszergazda zárolhatja az eszközt, és módosíthatja a jelszót"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"A rendszergazda törölheti az összes adatot az eszközről"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">A rendszergazda beállításának megfelelően a rendszer legfeljebb <xliff:g id="COUNT_1">%d</xliff:g> jelszómegadási próbálkozást enged, mielőtt törölné az összes eszközadatot</item>
+      <item quantity="one">A rendszergazda beállításának megfelelően a rendszer legfeljebb <xliff:g id="COUNT_0">%d</xliff:g> jelszómegadási próbálkozást enged, mielőtt törölné az összes eszközadatot</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">A rendszergazda beállításának megfelelően a rendszer legfeljebb <xliff:g id="COUNT_1">%d</xliff:g> jelszómegadási próbálkozást enged, mielőtt törölné a munkaprofil adatait</item>
+      <item quantity="one">A rendszergazda beállításának megfelelően a rendszer legfeljebb <xliff:g id="COUNT_0">%d</xliff:g> jelszómegadási próbálkozást enged, mielőtt törölné a munkaprofil adatait</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Ez az eszköz felügyelt."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Az eszközt a következő szervezet kezeli: <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"További információ"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fényképek és videók"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Zene és hang"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Játékok"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Egyéb alkalmazások"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fájlok"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Tárhelykezelő: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Ki"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Be"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Játékok"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Hangfájlok"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Zenék"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(eltávolítva <xliff:g id="USER">%s</xliff:g> esetében)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(letiltva <xliff:g id="USER">%s</xliff:g> számára)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Automatikus kitöltést végző alkalmazás"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 7dd09b7..1a258d0 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Տեղադրություն"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Հաշիվներ"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Անվտանգություն և էկրանի կողպում"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Գաղտնագրում և հավատարմագրեր"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Կարգավորել Իմ տեղադրությունը, էկրանի ապակողպումը, SIM քարտի կողպումը, վկայագրերի պահոցի կողպումը"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Կարգավորել իմ տեղադրությունը, էկրանի ապակողպումը, հավատարմագրային պահոցի կողպումը"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Գաղտնաբառեր"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Գաղտնիություն"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Կասեցված է ադմինիստրատորի կողմից"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Անվտանգության կարգավիճակը"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Տեղադրություն, մատնահետք"</string>
@@ -880,7 +881,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="7457951997970419085">"Չի աջակցում աշխատանքային պրոֆիլներ"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Ծանուցման լռելյայն ձայնը"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Մեդիա"</string>
@@ -1136,7 +1137,7 @@
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"Այս սարքը չի աջակցում <xliff:g id="NAME_0">^1</xliff:g>-ը: \n\nԱյս <xliff:g id="NAME_1">^1</xliff:g>-ը այս սարքի հետ օգտագործելու համար անհրաժեշտ է նախ կարգավորել այն:"</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"Ձևաչափումից հետո այս <xliff:g id="NAME_0">^1</xliff:g>-ը կարող եք օգտագործել այլ սարքերում: \n\nԱյս <xliff:g id="NAME_1">^1</xliff:g>-ի վրայի բոլոր տվյալները կջնջվեն: Ուստի, չմոռանաք նախ պահուստավորել: \n\n"<b>"Պահուստավորեք լուսանկարներն ու այլ մեդիա ֆայլերը"</b>" \nՏեղափոխեք մեդիա ֆայլերը այս սարքի մեկ այլ պահեստ կամ որևէ համակարգիչ USB մալուխի միջոցով: \n\n"<b>"Պահուստավորեք հավելվածները"</b>" \nԱյս <xliff:g id="NAME_6">^1</xliff:g>-ի վրայի բոլոր հավելվածները ապատեղադրվելու են, իսկ նրանց տվյալները ջնջվելու են: Հավելվածները պահպանելու համար տեղափոխեք դրանք այս սարքի մեկ այլ պահեստ:"</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Եթե հանեք այս <xliff:g id="NAME_0">^1</xliff:g>-ը, նրա վրա պահեստավորված հավելվածներն այլևս չեն աշխատի, իսկ մեդիա ֆայլերը հասանելի չեն լինի մինչև նորից չզետեղեք այն:"</b>" \n\nԱյս <xliff:g id="NAME_1">^1</xliff:g>-ը ձևաչափված է միայն այս սարքի վրա աշխատելու համար: Այն չի աշխատի այլ սարքերի վրա:"</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Այս <xliff:g id="NAME">^1</xliff:g>-ում առկա հավելվածները, լուսանկարները կամ տվյալները օգտագործելու համար հանեք և նորից զետեղեք այն: \n\nԻնչպես նաև, կարող եք հեռացնել այս պահեստը, եթե սարքն անհասանելի է: \n\nԵթե նախընտրեք հեռացնել այն, սարքի վրայի բոլոր տվյալները մշտապես կկորեն: \n\nԿարող եք հետագայում նորից տեղադրել հավելվածները, բայց այս սարքի վրա պահեստավորված նրանց տվյալները կկորեն:"</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Այս <xliff:g id="NAME">^1</xliff:g>-ում առկա հավելվածները, լուսանկարները կամ տվյալները օգտագործելու համար հանեք և նորից զետեղեք այն: \n\nԻնչպես նաև, կարող եք հեռացնել այս պահեստը, եթե սարքն անհասանելի է: \n\nԵթե նախընտրեք հեռացնել այն, սարքի վրայի բոլոր տվյալները մշտապես կկորչեն: \n\nԿարող եք հետագայում նորից տեղադրել հավելվածները, բայց այս սարքի վրա պահեստավորված նրանց տվյալները կկորչեն:"</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Մոռանա՞լ <xliff:g id="NAME">^1</xliff:g> սարքը:"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"Այս <xliff:g id="NAME">^1</xliff:g> սարքում պահվող բոլոր հավելվածները, լուսանկարները և տվյալները ընդմիշտ ջնջվելու են:"</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"Հավելվածներ"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Նույնը, ինչ սարքի էկրանի փականը"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Կարգավորել հավելվածները"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Կառավարել և հեռացնել տեղադրված ծրագրերը"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Հավելվածի մասին տեղեկություններ"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Կառավարել հավելվածները, կարգավորել արագ գործարկման դյուրանցումները"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ծրագրային կարգավորումներ"</string>
     <string name="install_applications" msgid="4872012136210802181">"Անհայտ աղբյուրներ"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Կառավարել տարածքը"</string>
     <string name="filter" msgid="2018011724373033887">"Զտիչ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Ընտրել զտիչի ընտրանքները"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Բոլորը"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Անջատված"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Բոլոր հավելվածները"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Անջատված հավելվածները"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Ներբեռնված"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Աշխատեցվում է"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB կրիչ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD քարտի վրա"</string>
     <string name="disabled" msgid="9206776641295849915">"Կասեցված է"</string>
     <string name="not_installed" msgid="2797554494953450291">"Տեղադրված չէ այս օգտատիրոջ"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Տեղադրված է"</string>
     <string name="no_applications" msgid="7336588977497084921">"Հավելվածներ չկան"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Ներքին պահոց"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ներքին հիշողություն"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Կարգավորել մուտքագրման մեթոդները"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Կարգավորումներ"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Կարգավորումներ"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Մուտքագրման ակտիվ տարբերակներ"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Օգտագործել համակարգի լեզուները"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> կարգավորումներ"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Ընտրել մուտքագրման ակտիվ եղանակներ"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Էկրանի վրայի ստեղնաշարի կարգավորումներ"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ինքնուրույն թարմացնել էկրանի խոշորությունը"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Թարմացնել էկրանի խոշորությունը ծրագրի տարանցումների վրա"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Հոսանքի կոճակը ավարտում է զանգը"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Արտասանել գաղտնաբառերը"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Մկնիկի խոշոր նշիչ"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Մոնո ձայն"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Ձայնանյութ նվագարկելիս միավորել ալիքները"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Վերջին լիցքավորումից հետո օգտագործումը"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Էկրանի օգտագործում"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Էկրան"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Բջջային ցանցի որոնում"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Հավելվածի օգտագործումը վերջին ամբողջական լիցքավորումից հետո"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Սարքի օգտագործումը վերջին ամբողջական լիցքավորումից հետո"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Մարտկոցի օգտագործման չափը անջատումից հետո"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Մարտկոցի օգտագործման չափը վերակայումից հետո"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> մարտկոցի վրա"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Մարտկոցի գերօգտագործում"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Օգտագործվել է %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"Մարտկոցի լիցքի %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Օգտագործման մանրամասները վերջին ամբողջական լիցքավորումից հետո"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Մոտավոր մնացած ժամանակը"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Լրիվ լիցքավորման ժամանակը"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Մոտավոր ժամանակը կարող է փոխվել օգտագործումից կախված"</string>
     <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>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Միշտ միացված ընտրանքն անջատված է"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Չի աջակցվում այս հավելվածում"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Թույլատրել կապակցումը միայն VPN-ի միջոցով"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN միացում պահանջե՞լ։"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Արգելափակումն ակտիվացված է"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Արգելափակումն ակտիվացված չէ"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Ընտրել VPN պրոֆիլ` այդ պրոֆիլին միշտ միացված լինելու համար: Ցանցային շրջանառությունը թույլատրված կլինի միայն VPN-ին միացված ժամանակ:"</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Սահմանափակված պրոֆիլները չեն կարող հաշիվներ ավելացնել"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Ջնջել <xliff:g id="USER_NAME">%1$s</xliff:g>-ին այս սարքից"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Էկրանի կողպման կարգավորումները"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ավելացնել օգտվողներ կողպէկրանից"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Նոր օգտատեր"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Նոր պրոֆիլ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Ջնջե՞լ ձեզ:"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Միացնե՞լ հեռախոսազանգերն ու SMS-ները:"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Զանգերի և SMS-ների պատմությունը հասանելի կլինի այս օգտատիրոջը:"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Անհետաձգելի բուժօգնության տվյալներ"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Տեղեկություններ <xliff:g id="USER_NAME">%1$s</xliff:g> օգտվողի մասին"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> օգտվողի տվյալները և կոնտակտները"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Թույլատրել ծրագրերը և բովանդակությունը"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Սահմանափակումներով ծրագրեր"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ընդլայնել ծրագրի կարգավորումները"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="one">Show %d hidden items</item>
       <item quantity="other">Ցույց տալ %d թաքնված տարրեր</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Ցանց և ինտերնետ"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, բջջային, տվյալների օգտագործում, թեժ կետ"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Ցանց և ինտերնետ"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, շարժական, տվյալների օգտագործում, թեժ կետ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Կապակցված սարքեր"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, հեռարձակում"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Հավելվածներ և ծանուցումներ"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Արդյունքներ"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, ցանցային կապ"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"տեքստային հաղորդագրություն, կարճ հաղորդագրությունների ուղարկում, հաղորդագրություններ, հաղորդակցում"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"բջջային, բջջային օպերատոր, անլար, տվյալներ, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"բջջային, շարժական, բջջային օպերատոր, անլար, տվյալներ, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, զանգ, զանգեր"</string>
     <string name="keywords_home" msgid="3626170808219458848">"թողարկիչ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"էկրան, հպէկրան"</string>
@@ -2621,8 +2623,8 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Զանգի համար ակտիվացված է թրթռումը"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Զանգի ձայնն անջատված է"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Զանգի ուժգնությունը 80%-ի դեպքում"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Մեդիանյութերի ձայնի բարձրությունը"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Զարթուցիչի ձայնի բարձրությունը"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Մեդիանյութերի ձայնի ուժգնությունը"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Զարթուցիչի ձայնի ուժգնությունը"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Զանգի բարձրությունը"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ծանուցման ձայնի բարձրություն"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Հեռախոսի զանգերանգ"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Զգուշացում"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Թրթռալ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Միացման ձայներ"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Չանհանգստացնելու ռեժիմի կարգավորումներ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Միայն կարևորները"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Ինքնաշխատ կանոններ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Կարգավորեք Չընդհատելու ժամանակացույցը"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Ծանուցման կանխադրված զանգերանգը"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Զարթուցիչի կանխադրված զանգերանգը"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Նույնը, ինչ անձնական պրոֆիլի համար"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Փոխարինե՞լ աշխատանքային պրոֆիլի ձայները:"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Օգտագործե՞լ անձնական պրոֆիլի ձայները"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Փոխարինել"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Աշխատանքային պրոֆիլի ընթացիկ ձայները կփոխարինվեն անձնական հաշվի ձայներով"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Ձեր ընթացիկ աշխատանքային պրոֆիլի ձայների փոխարեն կօգտագործվեն ձեր անձնական հաշվի ձայները"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Զանգերանգներ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Այլ ձայներ և թրթռում"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Ծանուցումների կարգավորումներ"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Թույլտվություններ չեն շնորհվել"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Թույլտվություններ չեն հայցվել"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Բոլոր հավելվածները"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Միացված"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Տեղադրված հավելվածները"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Ակնթարթորեն գործարկվող հավելվածները"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Անձնական"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Աշխատանքային"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Արգելափակված"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Տիրույթի URL-ներով"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Լրացուցիչ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Հավելվածների կազմաձևում"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Անհայտ հավելված"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Կանխադրված՝ աշխատանքի համար"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Հուշումներ և ձայնային ներածում"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Օգնական հավելված"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ոչ մեկը"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Ընտրեք Օգնական հավելված"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Սահմանե՞լ <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> հավելվածը որպես օգնական:"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Օգնականը կարողանալու է կարդալ համակարգում աշխատեցվող հավելվածների վերաբերյալ տեղեկությունները, այդ թվում նաև էկրանին ցուցադրվող կամ հավելվածներից ստացվող տեղեկությունները:"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Ընդունել"</string>
@@ -2959,6 +2958,8 @@
     <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">"Մարտկոցի օպտիմալացում"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Օգտագործման զգուշացումներ"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Ցուցադրել բոլոր հավելվածները"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Թաքցնել լրացուցիչ հավելվածները"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Չօպտիմալացված"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Չօպտիմալացված"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Մարտկոցի սպառման օպտիմալացում"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Գույնի սառը ջերմաստիճան"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Օգտագործել էկրանի ավելի սառը գույներ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Գույնի փոփոխությունը կիրառելու համար անջատեք էկրանը"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor-ի փոփոխությունը կիրառելու համար վերագործարկեք սարքը"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Ավտոմատ համակարգային թարմացումներ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Բինդերացված HAL-ներ (պահանջում է վերագործարկում)"</string>
     <string name="usage" msgid="2977875522080448986">"Օգտագործում"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Օժանդակ ժեստ"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ընդհանուր HTTP պրոքսին կարգավորված է"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Ադմինիստրատորը կարող է կողպել սարքը և վերակայել գաղտնաբառը"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Ադմինիստրատորը կարող է ջնջել սարքի բոլոր տվյալները"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting all device data</item>
+      <item quantity="other">Ադմինիստրատորը սահմանել է գաղտնաբառը մուտքագրելու առավելագույնը <xliff:g id="COUNT_1">%d</xliff:g> փորձ, որից հետո սարքի բոլոր տվյալները կջնջվեն</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Admin set maximum password attempts to <xliff:g id="COUNT_1">%d</xliff:g> before deleting work profile data</item>
+      <item quantity="other">Ադմինիստրատորը սահմանել է գաղտնաբառը մուտքագրելու առավելագույնը <xliff:g id="COUNT_1">%d</xliff:g> փորձ, որից հետո աշխատանքային պրոֆիլի բոլոր տվյալները կջնջվեն</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Այս սարքը կառավարվում է։"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Այս սարքի կառավարիչն է <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> կազմակերպությունը։"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Իմանալ ավելին"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Լուսանկարներ և տեսանյութեր"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Երաժշտություն և աուդիո"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Խաղեր"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Այլ հավելվածներ"</string>
     <string name="storage_files" msgid="8581083146777364063">"Ֆայլեր"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Հիշողության կառավարիչ՝ <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Անջատված է"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Միացված է"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Խաղեր"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ձայնային ֆայլեր"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Երաժշտություն"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(հեռացված է <xliff:g id="USER">%s</xliff:g> օգտվողի համար)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(անջատված է <xliff:g id="USER">%s</xliff:g> օգտվողի համար)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Ինքնալրացման հավելված"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bdb1087..d6919d5 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akun"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Keamanan &amp; kunci layar"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripsi &amp; kredensial"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setel Lokasiku, pembuka kunci layar, kunci penyimpanan kredensial"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Sandi"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privasi"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Dinonaktifkan oleh administrator"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Status keamanan"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Lokasi, sidik jari"</string>
@@ -1255,9 +1256,9 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"Harap tunggu..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Setelan panggilan"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Siapkan kotak pesan, penerusan panggilan, nada tunggu, nomor penelepon"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Penambatan USB"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portabel"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Penambatan bluetooth"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Menambatkan"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Hotspot &amp; Tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot aktif, tethering"</string>
@@ -1265,14 +1266,14 @@
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Tethering"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Tidak dapat tethering atau menggunakan hotspot portabel saat Penghemat Data aktif"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"Penambatan USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB tersambung, periksa untuk menambatkan"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Tertambat"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Tidak bisa menambatkan ketika penyimpanan USB sedang digunakan"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB tidak tersambung"</string>
     <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Sambungkan untuk mengaktifkan"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Kesalahan penambatan USB"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Penambatan bluetooth"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering bluetooth"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="4328374808439440517">"Berbagi sambungan Internet tablet ini"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="7451579908917710359">"Berbagi sambungan Internet ponsel ini"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="7296104766087335891">"Berbagi sambungan Internet tablet ini dengan 1 perangkat"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Sama dengan kunci layar perangkat"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Kelola aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Mengelola dan menghapus apl terpasang"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Info aplikasi"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Kelola apl, siapkan pintasan peluncuran cepat"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Setelan apl"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sumber tidak dikenal"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Kelola ruang"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Pilih opsi filter"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Semua"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Dinonaktifkan"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Semua aplikasi"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Aplikasi yang dinonaktifkan"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Terdownload"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Menjalankan"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Penyimpanan USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pada kartu SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Dinonaktifkan"</string>
     <string name="not_installed" msgid="2797554494953450291">"Tidak dipasang untuk pengguna ini"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Terinstal"</string>
     <string name="no_applications" msgid="7336588977497084921">"Tidak ada aplikasi."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Penyimpanan internal"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"penyimpanan internal"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Menyiapkan metode masukan"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Setelan"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Setelan"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metode masukan aktif"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Gunakan bahasa sistem"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> setelan"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Pilih metode masukan aktif"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Setelan keyboard layar"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Perbarui otomatis pembesaran layar"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Perbarui pembesaran layar di transisi aplikasi"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tombol daya - tutup telepon"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Ucapkan sandi"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Penunjuk mouse besar"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Gabungkan saluran saat memutar audio"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Digunakan sejak isi daya penuh terakhir"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Penggunaan layar"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumsi layar"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Pemindaian jaringan seluler"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Penggunaan aplikasi sejak pengisian daya baterai terakhir hingga penuh"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Penggunaan perangkat sejak pengisian daya baterai terakhir hingga penuh"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Penggunaan baterai sejak dicabut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Penggunaan baterai sejak penyetelan ulang"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Memakai baterai: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan daya yang dihitung berlebih"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Digunakan selama %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s dari baterai keseluruhan"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Uraian penggunaan sejak pengisian daya baterai terakhir hingga penuh"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Perkiraan sisa waktu"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Sisa waktu hingga terisi penuh dayanya"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Perkiraan mungkin berubah berdasarkan penggunaan"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak dicabut"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ketika terakhir dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Fitur selalu aktif tidak aktif"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Tidak didukung oleh aplikasi ini"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Hanya izinkan sambungan melalui VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Perlu sambungan VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Gembok total aktif"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Gembok total tidak aktif"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pilih profil VPN untuk tetap tersambung. Lalu lintas jaringan hanya akan diperbolehkan jika tersambung ke VPN ini."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profil yang dibatasi tidak dapat menambahkan akun"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Hapus <xliff:g id="USER_NAME">%1$s</xliff:g> di perangkat"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Setelan layar kunci"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Tambahkan pengguna dari layar kunci"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Pengguna baru"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Profil baru"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Hapus diri Anda sendiri?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Aktifkan panggilan telepon &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Riwayat panggilan dan SMS akan dibagikan dengan pengguna ini."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informasi darurat"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informasi tentang <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Info &amp; kontak untuk <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Izinkan aplikasi dan konten"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan batasan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Luaskan setelan untuk aplikasi"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Tampilkan %d item tersembunyi</item>
       <item quantity="one">Tampilkan %d item tersembunyi</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Jaringan &amp; internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, seluler, penggunaan data, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Jaringan &amp; Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, penggunaan data, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Perangkat yang terhubung"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikasi &amp; notifikasi"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Hasil"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, sambungan jaringan"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, teks, pesan, perpesanan"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"seluler, operator sel, nirkabel, data, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"seluler, mobile, operator sel, nirkabel, data, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, telepon, menelepon"</string>
     <string name="keywords_home" msgid="3626170808219458848">"peluncur"</string>
     <string name="keywords_display" msgid="8910345814565493016">"layar, layar sentuh"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Lansiran"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Getar"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Aktifkan suara"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Preferensi Jangan ganggu"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Hanya izinkan prioritas"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Aturan otomatis"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Setel jadwal Jangan Ganggu"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Nada notifikasi kerja default"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Nada dering alarm kerja default"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Sama dengan profil pribadi"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Ganti suara profil kerja?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Gunakan suara profil pribadi?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Ganti"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Suara profil kerja saat ini akan diganti dengan suara profil pribadi"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Suara profil pribadi akan digunakan alih-alih suara profil kerja saat ini"</string>
     <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="7447797716856573587">"Preferensi notifikasi"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Tidak ada izin yang diberikan"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Tidak ada izin yang diminta"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Semua aplikasi"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Diaktifkan"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Aplikasi terinstal"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Aplikasi instan"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Pribadi"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Kantor"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Diblokir"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Dengan URL domain"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Lanjutan"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurasi aplikasi"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikasi tak dikenal"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Default untuk kerja"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Bantuan &amp; masukan suara"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplikasi bantuan"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Tidak ada"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Pilih aplikasi Bantuan"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Jadikan <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> sebagai asisten?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Asisten dapat membaca informasi tentang aplikasi yang sedang digunakan di sistem, termasuk informasi yang terlihat di layar atau dapat diakses dalam aplikasi."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Setuju"</string>
@@ -2959,6 +2958,8 @@
     <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">"Pengoptimalan baterai"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Lansiran penggunaan"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Tampilkan semua aplikasi"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Sembunyikan aplikasi ekstra"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Tidak dioptimalkan"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Tidak dioptimalkan"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Mengoptimalkan penggunaan baterai"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Suhu foto sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan suhu tampilan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk menerapkan perubahan warna, nonaktifkan layar"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Untuk menerapkah perubahan monitor telefoni, reboot perangkat"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Pemutakhiran sistem otomatis"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL Terbinder (perlu reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Penggunaan"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Untuk memeriksa notifikasi, gesek 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, gesek 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, gesek ke bawah pada sensor sidik jari di bagian belakang perangkat."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Gestur panduan"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global disetel"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Admin dapat mengunci perangkat dan menyetel ulang sandi"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Admin dapat menghapus semua data perangkat"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Admin menyetel upaya memasukkan sandi maksimum <xliff:g id="COUNT_1">%d</xliff:g> sebelum menghapus semua data perangkat</item>
+      <item quantity="one">Admin menyetel upaya memasukkan sandi maksimum <xliff:g id="COUNT_0">%d</xliff:g> sebelum menghapus semua data perangkat</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Admin menyetel upaya memasukkan sandi maksimum <xliff:g id="COUNT_1">%d</xliff:g> sebelum menghapus data profil kerja</item>
+      <item quantity="one">Admin menyetel upaya memasukkan sandi maksimum <xliff:g id="COUNT_0">%d</xliff:g> sebelum menghapus data profil kerja</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Perangkat ini dikelola."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Perangkat ini dikelola oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Pelajari lebih lanjut"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto &amp; Video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musik &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Game"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Aplikasi lainnya"</string>
     <string name="storage_files" msgid="8581083146777364063">"File"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Pengelola Penyimpanan: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Nonaktif"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktif"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Game"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"File audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(di-uninstal untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dinonaktifkan untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikasi IsiOtomatis"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 4fa003d..0a93b76 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Staðsetning"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Reikningar"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Öryggi og skjálás"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Dulkóðun og skilríki"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Stilla staðsetninguna mína, opnun skjás, SIM-kortalás, lás skilríkjageymslu"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stilla staðsetninguna mína, opnun skjás, lás skilríkjageymslu"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Aðgangsorð"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Persónuvernd"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Stjórnandi gerði óvirkt"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Öryggisstaða"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Staðsetning, fingrafar"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Sami skjálás og í tæki"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Stjórna forritum"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Stjórna og fjarlægja upsett forrit"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Upplýsingar um forrit"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Stjórna forritum, setja upp flýtileiðir"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Forritastillingar"</string>
     <string name="install_applications" msgid="4872012136210802181">"Óþekktur uppruni"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Stjórna plássi"</string>
     <string name="filter" msgid="2018011724373033887">"Sía"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Veldu síuvalkosti"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Öll"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Óvirk"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Öll forrit"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Óvirk forrit"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Sótt"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Í gangi"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-geymsla"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Á SD-korti"</string>
     <string name="disabled" msgid="9206776641295849915">"Óvirkt"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ekki uppsett fyrir þennan notanda"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Uppsett"</string>
     <string name="no_applications" msgid="7336588977497084921">"Engin forrit."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Innbyggð geymsla"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"innbyggð geymsla"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Setja upp innsláttaraðferðir"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Stillingar"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Stillingar"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Virkar innsláttaraðferðir"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Nota kerfistungumál"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Stillingar fyrir <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Veldu virkar innsláttaraðferðir"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Stillingar skjályklaborðs"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Uppfæra skjástækkun sjálfkrafa"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Uppfæra skjástækkun þegar skipt er milli forrita"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Aflrofi lýkur símtali"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Segja aðgangsorð upphátt"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Stór músarbendill"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Einóma hljóð"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Sameina rásir þegar hljóð er spilað"</string>
@@ -1833,7 +1829,11 @@
     <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> eftir"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> þar til fullri hleðslu er náð"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Notkun frá síðustu fullu hleðslu"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Skjánotkun"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Orkunotkun skjásins"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Leit að farsímaneti"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Notkun forrita frá síðustu fullu hleðslu"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Notkun tækis frá síðustu fullu hleðslu"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Rafhlöðunotkun frá síðustu hleðslu"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Rafhlöðunotkun frá endurstillingu"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> á rafhlöðu"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oftalin orkunotkun"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Notað í %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s af heildarrafhlöðu"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Notkunargreining frá síðustu fullu hleðslu"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Áætlaður tími eftir"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tími þar til hleðsla er full"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Áætlun gæti breyst miðað við notkun"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> síðan tekið var úr sambandi"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Frá síðustu hleðslu í <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"„Alltaf kveikt“ er óvirkt"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ekki stutt af þessu forriti"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Leyfa aðeins tengingar með VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Krefjast VPN-tengingar?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Læsing er virk"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Læsing er óvirk"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Veldu VPN-snið sem alltaf á að vera tengt. Netumferð er aðeins leyfð þegar tenging við þetta VPN er virk."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Takmarkaðir prófílar geta ekki bætt reikningum við"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eyða <xliff:g id="USER_NAME">%1$s</xliff:g> úr þessu tæki"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Stillingar fyrir læstan skjá"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Bæta við notendum af lásskjánum"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nýr notandi"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nýtt snið"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Eyða sjálfum/sjálfri þér?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Kveikja á símtölum og SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Símtala- og SMS-ferli verður deilt með þessum notanda."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Neyðarupplýsingar"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Upplýsingar um <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Upplýsingar og tengiliðir fyrir <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Leyfa forrit og innihald þeirra"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Forrit með takmörkunum"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Stækka stillingar forrits"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="one">Sýna %d falið atriði</item>
       <item quantity="other">Sýna %d falin atriði</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Netkerfi og internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, farsímakerfi, gagnanotkun, heitur reitur"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Netkerfi og internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, farsími, gagnanotkun, heitur reitur"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Tengd tæki"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, senda út"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Forrit og tilkynningar"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Niðurstöður"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, nettenging"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"skilaboð, textaskilaboð, SMS-skilaboð, SMS"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"farsími, farsímakerfi þráðlaust, gögn, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"farsími, farsímakerfi, þráðlaust, gögn, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi símtal, símtal"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ræsiforrit"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skjár, snertiskjár"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Viðvörun"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Titringur"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Ræsingarhljóð"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Stillingar fyrir „Ónáðið ekki“"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Aðeins forgangsheimildir"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sjálfvirkar reglur"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Stilla „Ónáðið ekki“ áætlun"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Sjálfg. vinnutilkynningartónn"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Sjálfg. vinnuhringing vekjara"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Sama og í persónulegum prófíl"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Skipta út hljóðum vinnuprófíls?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Nota hljóð úr persónulegum prófíl?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Skipta út"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Núverandi hljóðum vinnuprófílsins verður skipt út fyrir hljóð úr persónulega prófílnum"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Hljóð persónulega prófílsins þíns verða notuð í staðinn fyrir núverandi hljóð úr vinnusniðinu þínu"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Hringitónar"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Önnur hljóð og titringur"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Tilkynningastillingar"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Engar heimildir veittar"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Engar heimildarbeiðnir"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Öll forrit"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Virkt"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Uppsett forrit"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Skyndiforrit"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Persónulegt"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Vinna"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Á bannlista"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Með vefslóðum léns"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Ítarlegt"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Stillingar forrita"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Óþekkt forrit"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Sjálfgefið fyrir vinnu"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Aðstoð og raddinntak"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aðstoðarforrit"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ekkert"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Veldu aðstoðarforrit"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Viltu gera <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> að aðstoðarforriti?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Hjálparinn mun geta séð upplýsingar um forrit í notkun í kerfinu þínu, þar á meðal upplýsingar sem sjást á skjánum eða eru aðgengilegar úr forritum."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Samþykkja"</string>
@@ -2959,6 +2958,8 @@
     <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">"Rafhlöðusparnaður"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Notkunartilkynningar"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Sýna öll forrit"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Fela aukaforrit"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Enginn sparnaður"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Enginn sparnaður"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Sparar rafhlöðunotkun"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Svalur litblær skjás"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Nota svalari skjáliti"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Slökktu á skjánum til að virkja litbreytinguna"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Til að breyta fjarskiptaumsjón skaltu endurræsa tækið"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Sjálfvirkar kerfisuppfærslur"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Bundið HAL (krefst endurræsingar)"</string>
     <string name="usage" msgid="2977875522080448986">"Notkun"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Strjúktu niður á fingrafaraskynjaranum aftan á símanum til að skoða tilkynningarnar."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Strjúktu niður á fingrafaraskynjaranum aftan á spjaldtölvunni til að skoða tilkynningarnar."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Strjúktu niður á fingrafaraskynjaranum aftan á símanum til að skoða tilkynningarnar."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Aðstoðarbending"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Kveikt"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Slökkt"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Ræsiforrit er þegar opið"</string>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Altækur HTTP-staðgengilsþjónn stilltur"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Kerfisstjóri getur læst tækinu og endurstillt aðgangsorðið"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Kerfisstjóri getur eytt öllum gögnum á tækinu"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Kerfisstjóri stillti hámarkstilraunir fyrir aðgangsorð á <xliff:g id="COUNT_1">%d</xliff:g> áður en öllum gögnum á tækinu verður eytt</item>
+      <item quantity="other">Kerfisstjóri stillti hámarkstilraunir fyrir aðgangsorð á <xliff:g id="COUNT_1">%d</xliff:g> áður en öllum gögnum á tækinu verður eytt</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Kerfisstjóri stillti hámarkstilraunir fyrir aðgangsorð á <xliff:g id="COUNT_1">%d</xliff:g> áður en öllum gögnum vinnusniðs verður eytt</item>
+      <item quantity="other">Kerfisstjóri stillti hámarkstilraunir fyrir aðgangsorð á <xliff:g id="COUNT_1">%d</xliff:g> áður en öllum gögnum vinnusniðs verður eytt</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Þessu tæki er stýrt."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Þessu tæki er stýrt af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Frekari upplýsingar"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Myndir og myndskeið"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Tónlist og hljóð"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Leikir"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Önnur forrit"</string>
     <string name="storage_files" msgid="8581083146777364063">"Skrár"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Geymsluumsjón: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Slökkt"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Kveikt"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Leikir"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Hljóðskrár"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Tónlist"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(fjarlægt fyrir notandann <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(óvirkt fyrir notandann <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Forrit fyrir sjálfvirka útfyllingu"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4269be9..c691975 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Geolocalizzazione"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Account"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Sicurezza e blocco schermo"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Crittografia e credenziali"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Password"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Disattivata dall\'amministratore"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Stato sicurezza"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Posizione, impronta digitale"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Uguale al blocco schermo del dispositivo"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestisci e rimuovi applicazioni installate"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informazioni app"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gestisci le applicazioni, imposta le scorciatoie di avvio rapido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Impostazioni applicazioni"</string>
     <string name="install_applications" msgid="4872012136210802181">"Origini sconosciute"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Gestisci spazio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtra"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Scegli opzioni di filtro"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Tutte"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Disattivate"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Tutte le app"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"App disattivate"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Scaricate"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"In uso"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Archivio USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Scheda SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Disattivato"</string>
     <string name="not_installed" msgid="2797554494953450291">"Non installata per l\'utente"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Installata"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nessuna applicazione."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Memoria interna"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"memoria interna"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Configura metodi di immissione"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Impostazioni"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Impostazioni"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metodi di immissione attivi"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Utilizza le lingue di sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Impostazioni di <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Scegli metodi di immissione attivi"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Impostazioni tastiera sullo schermo"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Aggiorn. autom. ingrandim. schermo"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aggiorna ingrandimento schermo per transizioni app"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Chiudi chiamata con tasto accensione"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Pronuncia le password"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Puntatore del mouse grande"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio in formato mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Unisci i canali durante la riproduzione dell\'audio"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Utilizzo dall\'ultima ricarica completa"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Utilizzo dello schermo"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo dello schermo"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Scansione rete mobile"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Utilizzo dell\'app dall\'ultima ricarica completa"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Utilizzo del dispositivo dall\'ultima ricarica completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizzo batteria dallo scollegamento"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilizzo batteria dal ripristino"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> con la batteria"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo batteria sovrastimato"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Usata per %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s dell\'utilizzo totale della batteria"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Analisi dell\'utilizzo dall\'ultima ricarica completa"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Tempo residuo stimato"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tempo necessario per la ricarica completa"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"La stima potrebbe variare in base all\'utilizzo"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> dallo scollegamento"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Durante ultimo scollegamento per <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Non attiva sempre"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Non supportata da questa app"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Consenti solo connessioni tramite VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Connessione VPN obbligatoria?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Blocco attivato"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Blocco disattivato"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Seleziona un profilo VPN a cui rimanere sempre connesso. Il traffico di rete sarà consentito solo quando sei connesso a questa VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"I profili con limitazioni non possono aggiungere account"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Elimina <xliff:g id="USER_NAME">%1$s</xliff:g> da dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Impostazioni schermata di blocco"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Aggiungi utenti dalla schermata di blocco"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nuovo utente"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nuovo profilo"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Eliminare te stesso?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Desideri attivare chiamate e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"La cronologia chiamate e SMS verrà condivisa con questo utente."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informazioni per le emergenze"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informazioni su <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Info e contatti per <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Consenti app e contenuti"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applicazioni con limitazioni"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Espandi impostazioni per app"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Mostra %d elementi nascosti</item>
       <item quantity="one">Mostra %d elemento nascosto</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Rete e Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, rete dati, utilizzo dati, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Rete e Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, dispositivo mobile, utilizzo dati, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivi collegati"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, trasmettere"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"App e notifiche"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Risultati"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, connessione di rete"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"sms, invio di sms, messaggi, invio di messaggi"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"cellulare, operatore cell, wireless, dati, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellulare, dispositivo mobile, operatore cellulare, wireless, dati, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, chiamata, chiamare"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Avvio applicazioni"</string>
     <string name="keywords_display" msgid="8910345814565493016">"schermo, touchscreen"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Avviso acustico"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrazione"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Attiva suoni"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Preferenze Non disturbare"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"La priorità consente solo"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regole automatiche"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Pianifica Non disturbare"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Tono notifiche lavoro predef."</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Suoneria sveglia lavoro pred."</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Uguali al profilo personale"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Sostituire suoni lavoro?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Utilizzare i suoni del profilo personale?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Sostituisci"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"I suoni attuali del profilo di lavoro verranno sostituiti con i suoni del tuo profilo personale"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"I suoni del profilo personale verranno sostituiti con i suoni attuali del tuo profilo di lavoro"</string>
     <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="7447797716856573587">"Preferenze di notifica"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nessuna autorizzazione concessa"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nessuna autorizzazione richiesta"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Tutte le app"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Attive"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"App installate"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"App istantanee"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personali"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Lavoro"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloccate"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL di dominio"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzate"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configura app"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Applicazione sconosciuta"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Predefinite per il lavoro"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistenza e input vocale"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"App di assistenza"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Nessuna"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Scegli l\'app di assistenza"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Desideri farti assistere da <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Il componente Assistant potrà leggere i dati delle app in uso nel sistema, inclusi i dati visibili sul tuo schermo o accessibili all\'interno dell\'app."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Accetta"</string>
@@ -2959,6 +2958,8 @@
     <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">"Ottimizzazione batteria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Avvisi sul livello di carica"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Mostra tutte le app"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Nascondi app extra"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Senza ottimizzazione"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Senza ottimizzazione"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Uso della batteria ottimizzato"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura di colore fredda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizza colori del display più freddi"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Per applicare la modifica ai colori, disattiva lo schermo"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Per applicare la modifica a TelephonyMonitor, riavvia il dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Aggiornamenti di sistema automatici"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (richiede il riavvio)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilizzo"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Assistenza gesto"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Attivati"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Disattivati"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Il bootloader è già sbloccato"</string>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP globale impostato"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"L\'amministratore può bloccare il dispositivo e reimpostare la password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"L\'amministratore può eliminare tutti i dati del dispositivo"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">L\'amministratore ha impostato <xliff:g id="COUNT_1">%d</xliff:g> tentativi massimi di inserimento della password prima dell\'eliminazione di tutti i dati del dispositivo.</item>
+      <item quantity="one">L\'amministratore ha impostato <xliff:g id="COUNT_0">%d</xliff:g> tentativo massimo di inserimento della password prima dell\'eliminazione di tutti i dati del dispositivo.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">L\'amministratore ha impostato <xliff:g id="COUNT_1">%d</xliff:g> tentativi massimi di inserimento della password prima dell\'eliminazione dei dati del profilo di lavoro.</item>
+      <item quantity="one">L\'amministratore ha impostato <xliff:g id="COUNT_0">%d</xliff:g> tentativo massimo di inserimento della password prima dell\'eliminazione dei dati del profilo di lavoro.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Questo dispositivo è gestito."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Questo dispositivo è gestito da <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Ulteriori informazioni"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto e video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musica e audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Giochi"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Altre app"</string>
     <string name="storage_files" msgid="8581083146777364063">"File"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestione memoria: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Non attiva"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Attiva"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Giochi"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"File audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musica"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(disinstallato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disattivato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App di compilazione automatica"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f4d95ff..329e9d3 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -334,9 +334,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"מיקום"</string>
     <string name="account_settings_title" msgid="626177544686329806">"חשבונות"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"אבטחה ונעילת מסך"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"הצפנה ופרטי כניסה"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"‏הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"סיסמאות"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"פרטיות"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"הושבת על ידי מנהל המערכת"</string>
     <string name="security_status_title" msgid="5848766673665944640">"סטטוס אבטחה"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"מיקום וטביעות אצבע"</string>
@@ -687,8 +688,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"‏בחר Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"‏מפעיל את ה-Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"‏מכבה את ה-Wi-Fi..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"הצג את כל הרשתות"</string>
     <string name="wifi_error" msgid="3207971103917128179">"שגיאה"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"‏רצועת התדרים של ‎5 GHz אינה זמינה במדינה זו"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"במצב טיסה"</string>
@@ -1281,12 +1281,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"‏שיתוף אינטרנט דרך Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"שיתוף אינטרנט בין ניידים"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"נק\' לשיתוף אינטרנט ושיתוף בין ניידים"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"נקודה לשיתוף אינטרנט פועלת, שיתוף אינטרנט בין ניידים"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"נקודה לשיתוף אינטרנט פועלת"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"שיתוף אינטרנט בין ניידים"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"‏לא ניתן לשתף אינטרנט בין ניידים או להשתמש בנקודה ניידת לשיתוף אינטרנט כשחוסך הנתונים (Data Saver) פועל."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏שיתוף אינטרנט דרך USB"</string>
@@ -1450,8 +1447,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"זהה לנעילת המסך במכשיר"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"נהל אפליקציות"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"נהל והסר אפליקציות מותקנות"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"פרטי אפליקציה"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"ניהול אפליקציות, הגדרת קיצורי דרך להפעלה מהירה"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"הגדרות אפליקציה"</string>
     <string name="install_applications" msgid="4872012136210802181">"מקורות לא ידועים"</string>
@@ -1513,16 +1509,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"נהל שטח אחסון"</string>
     <string name="filter" msgid="2018011724373033887">"סינון"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"בחר אפשרויות סינון"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"הכל"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"מנוטרל"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"כל האפליקציות"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"אפליקציות מושבתות"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"הורדו"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"פועלות"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏אחסון USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏בכרטיס SD"</string>
     <string name="disabled" msgid="9206776641295849915">"מושבת"</string>
     <string name="not_installed" msgid="2797554494953450291">"לא מותקן עבור משתמש זה"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"מותקנת"</string>
     <string name="no_applications" msgid="7336588977497084921">"אין אפליקציות."</string>
     <string name="internal_storage" msgid="1584700623164275282">"אחסון פנימי"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"אחסון פנימי"</string>
@@ -1700,8 +1695,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"הגדר שיטות קלט"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"הגדרות"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"הגדרות"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"שיטות קלט פעילות"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"שימוש בשפות מערכת"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"הגדרות <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"בחר שיטות קלט פעילות"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"הגדרות מקלדת במסך"</string>
@@ -1745,7 +1738,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"עדכון אוטומטי של הגדלת מסך"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"עדכון הגדלת מסך במעבר בין אפליקציות"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"לחצן ההפעלה מסיים שיחה"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"אמירת סיסמאות"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"מצביע עכבר גדול"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"אודיו במונו"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"שלב ערוצים כאשר אתה מפעיל אודיו"</string>
@@ -1871,7 +1863,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"שימוש מאז הטעינה המלאה האחרונה"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"שימוש במסך"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"צריכת החשמל של המסך"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"סריקה של רשתות סלולריות"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"שימוש באפליקציות מאז הטעינה המלאה האחרונה"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"שימוש במכשיר מאז הטעינה המלאה האחרונה"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"צריכת סוללה מאז הניתוק"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"צריכת סוללה מאז האיפוס"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"פועל על סוללה <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1961,11 +1957,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"חישוב יתר של שימוש בחשמל"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> מיליאמפר לשעה"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"‏%1$s שימוש"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"‏%1$s מצריכת הסוללה הכוללת"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"פירוט השימוש מאז הטעינה המלאה האחרונה"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"זמן משוער שנותר"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"זמן שנותר עד לטעינה מלאה"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"ההערכה עשויה להשתנות בהתאם לשימוש"</string>
     <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>
@@ -2356,6 +2352,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"האפשרות \'תמיד פועל\' לא פעילה"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"לא נתמך על ידי אפליקציה זו"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"‏אפשר חיבורים רק דרך VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"‏תמיד לדרוש חיבור VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"נעילה פעילה"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"נעילה לא פעילה"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‏בחר פרופיל VPN שתישאר מחובר אליו תמיד. תנועת רשת תהיה מותרת רק כאשר תהיה מחובר ל-VPN זה."</string>
@@ -2451,8 +2448,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"פרופילים מוגבלים לא יכולים להוסיף חשבונות"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"מחק את <xliff:g id="USER_NAME">%1$s</xliff:g> ממכשיר זה"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"הגדרות מסך נעילה"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"הוספת משתמשים ממסך הנעילה"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"משתמש חדש"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"פרופיל חדש"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"האם למחוק אותך?"</string>
@@ -2480,7 +2476,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"‏האם להפעיל שיחות טלפון ו-SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"‏יבוצע שיתוף של היסטוריית השיחות וה-SMS עם המשתמש הזה."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"מידע למקרה חירום"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"מידע בנושא <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"המידע ואנשי הקשר של <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"אפשר אפליקציות ותוכן"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"אפליקציות והגבלות"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"הרחב את ההגדרות עבור האפליקציה"</string>
@@ -2602,8 +2598,8 @@
       <item quantity="other">‏הצג %d פריטים מוסתרים</item>
       <item quantity="one">‏הצג פריט %d מוסתר</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"רשת ואינטרנט"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"‏רשתות Wi-Fi, רשתות סלולריות, שימוש בנתונים ונקודה לשיתוף אינטרנט"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"רשת ואינטרנט"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"‏Wi-Fi, נייד, צריכת נתונים, נקודה לשיתוף אינטרנט, hotspot, הוטספוט"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"מכשירים מחוברים"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"‏Bluetooth, NFC והעברה"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"אפליקציות והודעות"</string>
@@ -2611,8 +2607,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"משתמש וחשבונות"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"אפליקציות בברירת מחדל"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"שפות, גיבוי, עדכונים ומידע על הטלפון"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"שפות, גיבוי, עדכונים, מידע על הטלפון"</string>
     <string name="search_results_title" msgid="1796252422574886932">"הגדרות"</string>
     <string name="search_menu" msgid="6283419262313758339">"הגדרות חיפוש"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"הגדרות חיפוש"</string>
@@ -2620,7 +2615,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"תוצאות"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"‏wifi, ‏wi-fi, חיבור רשת"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"הודעת טקסט, לשלוח הודעת טקסט, הודעות, העברת הודעות"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"‏סלולרי, ספק סלולרי, אלחוטי, נתונים, 4g, ‏3g, ‏2g, ‏lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"‏סלולרי, נייד, ספק סלולרי, רשת אלחוטית, 4g, 3g, 2g, lte "</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"‏wifi, ‏wi-fi, שיחה, התקשרות"</string>
     <string name="keywords_home" msgid="3626170808219458848">"מפעיל האפליקציות"</string>
     <string name="keywords_display" msgid="8910345814565493016">"מסך, מסך מגע"</string>
@@ -2696,8 +2691,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"התראה"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"רטט"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"הפעלת צלילים"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"העדפות של מצב \'נא לא להפריע\'"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"רק התראות בעדיפות"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"כללים אוטומטיים"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"הגדרת לוח זמנים לאפשרות \'נא לא להפריע\'"</string>
@@ -2714,9 +2708,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"צליל ברירת מחדל להודעה מהעבודה"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"רינגטון ברירת מחדל להתראת עבודה"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"זהה לצלילים של הפרופיל האישי"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"להחליף צלילי פרופיל עבודה?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"האם להשתמש בצלילים מהפרופיל האישי?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"החלף"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"הצלילים המוגדרים לפרופיל העבודה שלך יוחלפו בצלילים שהוגדרו לפרופיל האישי"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"הצלילים המוגדרים בפרופיל האישי יופעלו במקום הצלילים הקיימים בפרופיל העבודה"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"רינגטונים"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"צלילים אחרים ורטט"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"העדפות התראה"</string>
@@ -2964,11 +2958,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"לא הוענקו הרשאות"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"לא התבקשו הרשאות"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"כל האפליקציות"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"מופעלות"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"אפליקציות מותקנות"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"אפליקציות אינסטנט"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"אישיות"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"עבודה"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"חסומות"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"‏עם URL של דומיינים"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"מתקדם"</string>
     <string name="configure_apps" msgid="6685680790825882528">"הגדרת אפליקציות"</string>
     <string name="unknown_app" msgid="5275921288718717656">"אפליקציה לא מוכרת"</string>
@@ -2995,8 +2989,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"ברירת מחדל לעבודה"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"קלט אסיסטנט וקלט קולי"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"אפליקציית אסיסטנט"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"ללא"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"בחר אפליקציית אסיסטנט"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"האם להפוך את <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> לאסיסטנט שלך?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"האסיסטנט יוכל לקרוא מידע על אפליקציות שבהן נעשה שימוש במערכת שלך, כולל מידע המופיע במסך או שניתן לגשת אליו באפליקציות."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"קבל"</string>
@@ -3026,6 +3018,8 @@
     <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">"אופטימיזציה של סוללה"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"התראות על ניצול סוללה"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"הצג את כל האפליקציות"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"הסתר את האפליקציות הנוספות"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"לא בוצעה אופטימיזציה"</string>
     <string name="high_power_on" msgid="6216293998227583810">"לא בוצעה אופטימיזציה"</string>
     <string name="high_power_off" msgid="3393904131961263278">"מבצעת אופטימיזציה לשימוש בסוללה"</string>
@@ -3210,6 +3204,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"טמפרטורת צבעים קרים"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"השתמש בצבעי תצוגה קרירים יותר"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"כבה את המסך כדי להחיל שינוי צבע"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"‏כדי להחיל את השינוי ב-Telephony Monitor, הפעל מחדש את המכשיר"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"עדכוני מערכת אוטומטיים"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"‏Binderized HALs (דורשת הפעלה מחדש)"</string>
     <string name="usage" msgid="2977875522080448986">"שימוש"</string>
@@ -3395,6 +3390,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"תנועת סיוע"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3468,12 +3465,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏הוגדר שרת proxy גלובלי של HTTP"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"מנהל המערכת יכול לנעול את המכשיר ולאפס את הסיסמה"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"מנהל המערכת יכול למחוק את כל הנתונים מהמכשיר"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="two">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה <xliff:g id="COUNT_1">%d</xliff:g> פעמים, יימחקו כל הנתונים במכשיר</item>
+      <item quantity="many">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה <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_0">%d</xliff:g>, יימחקו כל הנתונים במכשיר</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="two">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה <xliff:g id="COUNT_1">%d</xliff:g> פעמים, יימחקו הנתונים של פרופיל העבודה</item>
+      <item quantity="many">מנהל המערכת הגדיר מספר ניסיונות מקסימלי להזנת סיסמה. לאחר הזנת הסיסמה <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_0">%d</xliff:g>, יימחקו הנתונים של פרופיל העבודה</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"המכשיר הזה מנוהל."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"מכשיר זה מנוהל על ידי <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"למידע נוסף"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"תמונות וסרטונים"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"מוזיקה ואודיו"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"משחקים"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"אפליקציות אחרות"</string>
     <string name="storage_files" msgid="8581083146777364063">"קבצים"</string>
@@ -3484,9 +3495,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"מנהל אחסון: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"כבוי"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"פועל"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"משחקים"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"קובצי אודיו"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"מוזיקה"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ההתקנה הוסרה אצל <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"‏(WebView מושבתת אצל <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"אפליקציית המילוי האוטומטי"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 2856897..a69257e 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -295,7 +295,7 @@
     <item msgid="6108267038969274380">"発信の処理"</item>
     <item msgid="4823402479973873358">"指紋"</item>
     <item msgid="5895843015407713543">"ボディー センサー"</item>
-    <item msgid="1436446526955010826">"緊急警報の読み取り"</item>
+    <item msgid="1436446526955010826">"緊急速報メールの読み取り"</item>
     <item msgid="884172201575690484">"仮の現在地情報"</item>
     <item msgid="3591971310048485247">"ストレージの読み取り"</item>
     <item msgid="4041187808621866119">"ストレージへの書き込み"</item>
@@ -362,7 +362,7 @@
     <item msgid="1958009349883195116">"発信の処理"</item>
     <item msgid="8526563410140613458">"指紋"</item>
     <item msgid="7864822459293570891">"ボディー センサー"</item>
-    <item msgid="6798698496904810960">"緊急警報の読み取り"</item>
+    <item msgid="6798698496904810960">"緊急速報メールの読み取り"</item>
     <item msgid="5242052845700875820">"仮の現在地情報"</item>
     <item msgid="1246296877820358565">"ストレージの読み取り"</item>
     <item msgid="2404067308793740341">"ストレージへの書き込み"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 93ccb8e..21d7a9f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"位置情報"</string>
     <string name="account_settings_title" msgid="626177544686329806">"アカウント"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"セキュリティと画面ロック"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"暗号化と認証情報"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"パスワード"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"プライバシー"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"管理者によって無効にされています"</string>
     <string name="security_status_title" msgid="5848766673665944640">"セキュリティ ステータス"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"位置情報、フィンガープリント"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fiを選択"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-FiをONにしています…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-FiをOFFにしています…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"すべてのネットワークを表示"</string>
     <string name="wifi_error" msgid="3207971103917128179">"エラー"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"この国では5GHz帯域は利用できません"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"機内モード"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetoothテザリング"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"テザリング"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"アクセス ポイントとテザリング"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"アクセス ポイント ON、テザリング"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"アクセス ポイント ON"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"テザリング"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"データセーバーが ON のときは、テザリングやポータブル アクセス ポイントを使用できません"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USBテザリング"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"端末の画面ロックと同一にする"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"アプリを管理"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"インストール済みアプリを管理、削除する"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"アプリ情報"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"アプリの管理やクイック起動ショートカットのセットアップ"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"アプリの設定"</string>
     <string name="install_applications" msgid="4872012136210802181">"提供元不明のアプリ"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"容量を管理"</string>
     <string name="filter" msgid="2018011724373033887">"フィルタ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"フィルタオプションの選択"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"すべて"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"無効"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"すべてのアプリ"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"無効になっているアプリ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ダウンロード済み"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"実行中"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USBストレージ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SDカード上"</string>
     <string name="disabled" msgid="9206776641295849915">"無効"</string>
     <string name="not_installed" msgid="2797554494953450291">"このユーザーでは未インストール"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"インストール済み"</string>
     <string name="no_applications" msgid="7336588977497084921">"アプリはありません。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"内部ストレージ"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"内部ストレージ"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"入力方法のセットアップ"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"設定"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"設定"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"有効な入力方法"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"システム言語を使用"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>の設定"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"有効な入力方法の選択"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"画面キーボードを設定する"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"画面の拡大を自動更新"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"アプリの遷移時に画面の拡大を更新"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"電源ボタンで通話を終了"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"パスワードの音声出力"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"大きなマウスポインタ"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"モノラル音声"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"音声再生時のチャンネルを統合します"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"前回のフル充電から使用"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"画面使用"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"画面消費"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"モバイル ネットワークのスキャン"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"前回のフル充電からのアプリの使用状況"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"前回のフル充電からの端末の使用状況"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"電池使用時間"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"リセット後の電池使用量"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"電池使用時間: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"過剰算出された消費電力"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s、使用しました"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"電池全体の %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"前回のフル充電からの使用状況の内訳"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"予測される残り時間"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"フル充電までの時間"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"予測時間は使用状況によって変わる可能性があります。"</string>
     <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>
@@ -2326,6 +2322,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"常時接続は無効です"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"このアプリは対応していません"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"VPN 経由の接続のみ許可"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN 接続を要求しますか？"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"ロックダウンが有効"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"ロックダウンが無効"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"常時接続するVPNプロファイルを選択します。このVPNに接続しているときのみネットワークにアクセスできます。"</string>
@@ -2411,8 +2408,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"制限付きプロファイルではアカウントを追加できません"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"この端末から<xliff:g id="USER_NAME">%1$s</xliff:g>を削除"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"ロック画面の設定"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"ロック画面からユーザーを追加"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新しいユーザー"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"新しいプロファイル"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"自分を削除しますか？"</string>
@@ -2440,7 +2436,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"通話とSMSをONにしますか？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話とSMSの履歴がこのユーザーと共有されます。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"緊急情報"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> に関する情報"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> さんの情報と連絡先"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"アプリとコンテンツの許可"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"制限のあるアプリ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"アプリの設定を展開"</string>
@@ -2486,7 +2482,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"通話マネージャ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"緊急警報"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"緊急速報メール"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"携帯通信会社"</string>
     <string name="access_point_names" msgid="1381602020438634481">"アクセスポイント名"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"パワーアップした4G LTEモード"</string>
@@ -2560,8 +2556,8 @@
       <item quantity="other">%d 件の非表示のアイテムを表示</item>
       <item quantity="one">%d 件の非表示のアイテムを表示</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"ネットワークとインターネット"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi、モバイル、データ使用量、アクセス ポイント"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"ネットワークとインターネット"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi、モバイル、データ使用量、アクセス ポイント"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"接続済みの端末"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth、NFC、キャスト"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"アプリと通知"</string>
@@ -2569,8 +2565,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"ユーザーとアカウント"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"デフォルト アプリ"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"言語、バックアップ、アップデート、端末情報"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"言語、バックアップ、アップデート、端末情報"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
     <string name="search_menu" msgid="6283419262313758339">"検索設定"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"検索設定"</string>
@@ -2578,7 +2573,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"検索結果"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi、Wi-Fi、ネットワーク接続"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"テキスト メッセージ、テキスト送信、メッセージ、SMS"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"モバイル、携帯通信会社、無線、データ、4G、3G、2G、LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"モバイル、携帯通信会社、無線、データ、4G、3G、2G、LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi、Wi-Fi、通話、発信"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ランチャー"</string>
     <string name="keywords_display" msgid="8910345814565493016">"画面、タッチスクリーン"</string>
@@ -2654,8 +2649,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"アラート"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"バイブレーション"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"電源オンの音"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"マナーモード設定"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"優先する通知のみを許可"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動ルール"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"マナーモード スケジュールの設定"</string>
@@ -2672,9 +2666,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"デフォルトの仕事用通知音"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"デフォルトの仕事用アラーム音"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"個人用プロファイルと共通"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"仕事用プロファイルの音の置換"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"個人用プロファイルの音の使用"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"置換"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"現在の仕事用プロファイルの音は個人用プロファイルの音に置き換えられます"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"現在の仕事用プロファイルの音の代わりに個人用プロファイルの音が使用されます"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"着信音"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"その他の音やバイブレーション"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"通知設定"</string>
@@ -2910,11 +2904,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"権限が付与されていません"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"リクエストされた権限はありません"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"すべてのアプリ"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"有効"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"インストール済みアプリ"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant Apps"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"個人用"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"仕事用"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ブロック中"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ドメインURLあり"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"詳細設定"</string>
     <string name="configure_apps" msgid="6685680790825882528">"アプリの設定"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明なアプリ"</string>
@@ -2939,8 +2933,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"仕事用のデフォルト"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"アシストと音声入力"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"アシストアプリ"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"なし"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"アシストアプリの選択"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>をアシスタントに設定しますか？"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"アシスタントはシステムで使用中のアプリに関する情報（画面に表示される情報、アプリ内でアクセス可能な情報など）を読み取れるようになります。"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"同意する"</string>
@@ -2970,6 +2962,8 @@
     <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">"電池の最適化"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"使用状況に関する通知"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"すべてのアプリを表示"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"余分なアプリを非表示"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"最適化していないアプリ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"最適化していないアプリ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"電池の使用を最適化"</string>
@@ -3150,6 +3144,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"寒色の色温度"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"寒色の表示色を使用します"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"色の変更を適用するには、画面を OFF にしてください"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor の変更を適用するには、端末を再起動してください"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動システム アップデート"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL のバインダライゼーション（再起動が必要）"</string>
     <string name="usage" msgid="2977875522080448986">"使用量"</string>
@@ -3327,6 +3322,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"アシスト操作"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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">"ブートローダーは既にロック解除されています"</string>
@@ -3388,12 +3385,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"グローバル HTTP プロキシが設定されています"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"管理者は端末をロックしてパスワードを再設定できます"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"管理者は端末のすべてのデータを削除できます"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">管理者は、すべての端末データが削除されるまでのパスワードの有効入力回数を <xliff:g id="COUNT_1">%d</xliff:g> 回に設定しました</item>
+      <item quantity="one">管理者は、すべての端末データが削除されるまでのパスワードの有効入力回数を <xliff:g id="COUNT_0">%d</xliff:g> 回に設定しました</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"この端末は管理されています。"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"この端末は <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> により管理されています。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"詳細"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"写真＆動画"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"音楽＆オーディオ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ゲーム"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"その他のアプリ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ファイル"</string>
@@ -3404,9 +3411,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ストレージ マネージャ: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"OFF"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ON"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ゲーム"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音声ファイル"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"音楽"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"（<xliff:g id="USER">%s</xliff:g> からアンインストール）"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"（<xliff:g id="USER">%s</xliff:g> では無効）"</string>
     <string name="autofill_app" msgid="3889348218462883960">"自動入力アプリ"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index b14445d..6a8d5e03f 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"მდებარეობა"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ანგარიშები"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"უსაფრთხოება და ეკრანის დაბლოკვა"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"დაშიფვრა და ავტორიზაციის მონაცემები"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"„ჩემი მდებარეობის“ პარამეტრების დაყენება, ეკრანის განბლოკვა და SIM ბარათის დაბლოკვა, ავტორიზაციის მონაცემების საცავის დაბლოკვა"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"დააყენე ჩემი მდებარეობის, ეკრანის განბლოკვისა და ავტორიზაციის მონაცემთა საცავის პარამეტრები"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"პაროლები"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"კონფიდენციალურობა"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"გათიშულია ადმინისტრატორის მიერ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"უსაფრთხოების სტატუსი"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"მდებარეობა, თითის ანაბეჭდი"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"მოწყობილობის იდენტური ეკრანის დაბლოკვის მეთოდი"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"აპების მართვა"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"დაყენებული აპების მართვა და წაშლა"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"აპის შესახებ"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"აპების მართვა, სწრაფი გაშვებისთვის მალსახმობების დაყენება"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"აპების პარამეტრები"</string>
     <string name="install_applications" msgid="4872012136210802181">"უცნობი წყაროები"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"სივრცის მართვა"</string>
     <string name="filter" msgid="2018011724373033887">"გაფილტვრა"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ფილტრის ვარიანტების არჩევა"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"ყველა"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"გათიშულია"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"ყველა აპი"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"გაუქმებული აპები"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ჩამოტვირთული"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"გაშვებული"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB მეხსიერება"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD ბარათზე"</string>
     <string name="disabled" msgid="9206776641295849915">"გამორთული"</string>
     <string name="not_installed" msgid="2797554494953450291">"ამ მომხმ. დაყენებული არ არის"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"დაინსტალირებულია"</string>
     <string name="no_applications" msgid="7336588977497084921">"არ არის აპები."</string>
     <string name="internal_storage" msgid="1584700623164275282">"შიდა მეხსიერება"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"შიდა მეხსიერება"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"შეტანის მეთოდების დაყენება"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"პარამეტრები"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"პარამეტრები"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"შეყვანის აქტიური მეთოდები"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"სისტემის ენების გამოყენება"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-ის პარამეტრები"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"შეყვანის აქტიური მეთოდების შერჩევა"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ეკრანის კლავიატურის პარამეტრები"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"ეკრანის მასშტაბის ავტომატური განახლება"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ეკრანის მასშტაბის განახლება ერთი აპიდან მეორეზე გადასვლისას"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ზარი შეწყდება ჩართვის ღილაკზე დაჭერით"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"პაროლების წარმოთქმა"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"მაუსის დიდი კურსორი"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"მონო აუდიო"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"აუდიოს დაკვრისას არხების კომბინირება"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"გამოიყენეთ მას შემდეგ, რაც სრულად დაიტენება"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"ეკრანის გამოყენება"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"ეკრანის მოხმარება"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"მობილური ქსელის სკანირება"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"აპის გამოყენების დეტალები ბოლო სრული დატენვის შემდეგ"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"მოწყობილობის გამოყენების დეტალები ბოლო სრული დატენვის შემდეგ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ბატარეის ხარჯი დამტენის გამოერთების შემდეგ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ელემენტის გამოყენება გადატვირთვის შემდეგ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> ბატარეაზე"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ზედმეტად ჩათვლილი ელკვების გამოყენება"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"გამოიყენება %1$s-ს განმავლობაში"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"ბატარეის საერთო გამოყენების %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"გამოყენების დეტალები ბოლო სრული დატენვის შემდეგ"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"სავარაუდო დარჩენილი დრო"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"სრულად დატენვამდე დარჩენილი დრო"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"მიახლოებითი დრო შეიძლება შეიცვალოს მოხმარების მიხედვით"</string>
     <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>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"„ყოველთვის ჩართული“ არააქტიურია"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"მხარდაუჭერელია ამ აპის მიერ"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"კავშირების მხოლოდ VPN-ის მეშვეობით დაშვება"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"გსურთ VPN კავშირის მოთხოვნა?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"დაბლოკვა აქტიურია"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"დაბლოკვა არააქტიურია"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"მუდმივი კავშირისათვის აირჩიეთ VPN პროფილი. ქსელის ტრაფიკი დაიშვება მხოლოდ ამ VPN-თან კავშირის დროს."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"შეზღუდული პროფილიდან ანგარიშების დამატება შეუძლებელია"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"წაშალე <xliff:g id="USER_NAME">%1$s</xliff:g> ამ მოწყობილობიდან"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"ჩაკეტილი ეკრანის პარამეტრები"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"ჩაკეტილი ეკრანიდან მომხმარებლების დამატება"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"ახალი მომხმარებელი"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"ახალი პროფილი"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"წავშალო თქვენი ანგარიში?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ჩაირთოს სატელეფონო ზარები &amp; amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ზარის და SMS ისტორია გაზიარდება ამ მომხმარებელთან."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"საგანგებო ინფორმაცია"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"ინფორმაცია <xliff:g id="USER_NAME">%1$s</xliff:g>-ის შესახებ"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"ინფორმაცია და კონტაქტები (<xliff:g id="USER_NAME">%1$s</xliff:g>)"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"აპებისა და კონტენტის დაშვება"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"აპლიკაციები შეზღუდვებით"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"აპლიკაციის პარამეტრების გაფართოება"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">%d დამალული ერთეულის ჩვენება</item>
       <item quantity="one">%d დამალული ერთეულის ჩვენება</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"ქსელი და ინტერნეტი"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, მობილური ინტერნეტი, მონაცემთა მოხმარება, უსადენო ქსელი"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"ქსელი და ინტერნეტი"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, მობილური ინტერნეტი, მონაცემთა მოხმარება, უსადენო ქსელი"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"დაკავშირებული მოწყობილობები"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, ტრანსლირება"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"აპები და შეტყობინებები"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"შედეგები"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, ქსელის კავშირი"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ტექსტური შეტყობინება, SMS-ის გაგზავნა, შეტყობინებები, შეტყობინების გაგზავნა"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"ფიჭური, მობილური ოპერატორი, უსადენო, მონაცემები, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ფიჭური კავშირი, მობილური ინტერნეტი, უსადენო კავშირი, მონაცემები, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, ზარი, დარეკვა"</string>
     <string name="keywords_home" msgid="3626170808219458848">"გამშვები"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ეკრანი, სენსორული ეკრანი"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"გაფრთხილება"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ვიბრაცია"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ჩართვის ხმები"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"„არ შემაწუხოთ“ რეჟიმის პარამეტრები"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"დაუშვას მხოლოდ პრიორიტეტულები"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ავტომატური წესები"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"„არ შემაწუხოთ“ რეჟიმის განრიგი"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"შეტყობინების ნაგულისხმევი ხმა (სამსახური)"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"მაღვიძარას ნაგულისხმევი ზარი (სამსახური)"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"პირადი პროფილის იდენტური"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"ჩანაცვლდეს სამსახურის პროფილის ხმები?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"გსურთ, გამოიყენოთ პირადი პროფილის ხმები?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ჩანაცვლება"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"სამსახურის პროფილის ამჟამინდელი ხმები თქვენი პირადი პროფილის ხმებით ჩანაცვლდება"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"სამსახურის პროფილის ამჟამინდელი ხმები თქვენი პირადი პროფილის ხმებით ჩანაცვლდება"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ზარები"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"სხვა ხმები და ვიბრაცია"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"შეტყობინების პარამეტრები"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ნებართვები არ არის გაცემული"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"ნებართვებზე მოთხოვნები არ არის"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ყველა აპი"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"ჩართული"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"დაინსტალირებული აპები"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"მყისიერი აპები"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"პირადი"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"სამუშაო"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"დაბლოკილი"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"დომენის URL-ებით"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"გაფართოებული"</string>
     <string name="configure_apps" msgid="6685680790825882528">"აპების კონფიგურაცია"</string>
     <string name="unknown_app" msgid="5275921288718717656">"უცნობი აპი"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"სამსახურის ნაგულისხმევი"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"დახმარება &amp; ხმოვანი შეყვანა"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"დახმარების აპი"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"არცერთი"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"დახმარების აპის არჩევა"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> გახდეს თქვენი თანაშემწე?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"დამხმარე შეძლებს თქვენს სისტემაში გამოყენებაში მყოფი აპების შესახებ ინფორმაციის წაკითხვას, მათ შორის, ინფორმაციის, რომელიც ნაჩვენებია თქვენს ეკრანზე ან ხელმისაწვდომია აპებში."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"ვეთანხმები"</string>
@@ -2959,6 +2958,8 @@
     <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">"ბატარეის ოპტიმიზაცია"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"მოხმარების გაფრთხილებები"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"ყველა აპის ჩვენება"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"დამატებითი აპების დამალვა"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"არ არის ოპტიმიზებული"</string>
     <string name="high_power_on" msgid="6216293998227583810">"არ არის ოპტიმიზებული"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ხდება ბატარეის გამოყენების ოპტიმიზაცია"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ცივი ფერები"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ეკრანზე ცივი ფერების გამოყენება"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ფერთა ცვლილების მისასადაგებლად, გამორთეთ ეკრანი"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ტელეფონიის კონტროლიორთან დაკავშირებული ცვლილებების მისასადაგებლად, გადატვირთეთ მოწყობილობა"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"სისტემის ავტომატური განახლება"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (საჭიროებს გადატვირთვას)"</string>
     <string name="usage" msgid="2977875522080448986">"მოხმარება"</string>
@@ -3175,7 +3177,7 @@
     <string name="data_saver_on" msgid="6774217590237934709">"ჩართული"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"გამორთული"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"მონაცემთა შეუზღუდავი მოხმარება"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"მონაცემებზე შეუზღუდავი წვდომის დაშვება, როცა მონაცემთა დამზოგველი ჩართულია"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"მონაც. შეუზღ. წვდომის დაშვება, როცა მონაც. დამზოგ. ჩართულია"</string>
     <string name="home_app" msgid="4066188520886810030">"მთავარი აპი"</string>
     <string name="no_default_home" msgid="7184117487704520238">"ნაგულისხმევი მთავარი აპი არ არის"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"უსაფრთხო გაშვება"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"დახმარების ჟესტი"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"გლობალური HTTP-პროქსი დაყენებულია"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ადმინისტრატორს მოწყობილობის ჩაკეტვა და პაროლის გადაყენება შეუძლია"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ადმინისტრატორს მოწყობილობაზე არსებული ყველა მონაცემის წაშლა შეუძლია"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">ადმინისტრატორმა მოგცათ პაროლის შეყვანის <xliff:g id="COUNT_1">%d</xliff:g> მცდელობა, სანამ მოწყობილობაზე არსებული ყველა მონაცემი წაიშლება</item>
+      <item quantity="one">ადმინისტრატორმა მოგცათ პაროლის შეყვანის <xliff:g id="COUNT_0">%d</xliff:g> მცდელობა, სანამ მოწყობილობაზე არსებული ყველა მონაცემი წაიშლება</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"ეს მოწყობილობა მართულია."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ამ მოწყობილობას მართავს <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"შეიტყვეთ მეტი"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ფოტოები და ვიდეოები"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"მუსიკა და აუდიო"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"თამაშები"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"სხვა აპები"</string>
     <string name="storage_files" msgid="8581083146777364063">"ფაილები"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"მეხსიერების მენეჯერი: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"გამორთული"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ჩართული"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"თამაშები"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"აუდიო ფაილები"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"მუსიკა"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(დეინსტალირებულია მომხმარებლისთვის: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(გათიშულია მომხმარებლისთვის: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ავტომატური შევსების აპი"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c987104..6368dcc 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Орын"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Есептік жазбалар"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Қауіпсіздік және экран құлпы"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлау және тіркелу деректері"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Менің аймағым, экран бекіту, SIM картасын бекіту, растау дерекқорын бекітуді орнату"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Менің аймағым, экран бекітпесі, растау деректері жадының бекітпесін реттеу"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Құпия сөздер"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Құпиялылық"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Әкімші өшірген"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Қауіпсіздік күйі"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Орналасқан жер, саусақ ізі"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Құрылғының экран бекітпесімен бірдей"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Қолданбаларды алу"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Орнатылған қолданбаларды басқару және алу"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Қолданба ақпараты"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Қолданбаларды басқару, жылдам бастау төте пернелерін орнату"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Қолданбалар параметрлері"</string>
     <string name="install_applications" msgid="4872012136210802181">"Белгісіз дереккөздер"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Кеңістікті басқару"</string>
     <string name="filter" msgid="2018011724373033887">"Сүзгі"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Сүзгі опцияларын таңдау"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Барлық"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Өшірілген"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Барлық қолданбалар"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Өшірілген қолданбалар"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Жүктелген"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Қосылған"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB жады"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD картасында"</string>
     <string name="disabled" msgid="9206776641295849915">"Өшірілген"</string>
     <string name="not_installed" msgid="2797554494953450291">"Осы пайдал. үшін орнатылмаған"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Орнатылды"</string>
     <string name="no_applications" msgid="7336588977497084921">"Қолданбалар жоқ"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Ішкі жад"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ішкі жад"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Енгізу әдістерін реттеу"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Параметрлер"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Параметрлер"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Белсенді енгізу әдістері"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Жүйелік тілдерді пайдалану"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> параметрлері"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Белсенді енгізу әдістерін таңдау"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Экрандағы пернетақта параметрлері"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Экранды ұлғайтуды авто жаңарту"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Қолданба ауысуларындағы экран ұлғайту функциясын жаңарту"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Қуат түймесі арқылы қоңырауды үзу"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Құпия сөздерді дыбыстау"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Үлкен тінтуір меңзері"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Моно аудио"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Аудионы ойнату кезінде арналарды біріктіру"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Соңғы толық зарядталғаннан бері пайдаланылғаны"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Экранды пайдалану"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Экран жарығына жұмсалатын заряд шығыны"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Мобильдік желіні сканерлеу"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Соңғы толық зарядталғаннан кейінгі қолданбаның пайдаланылуы"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Соңғы толық зарядталғаннан кейінгі құрылғының пайдаланылуы"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ажыратылғаннан бері батарея қолданысы"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Қайта реттелгеннен бергі батарея қолданысы"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Батареядағы уақыт <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Мөлшерінен жоғары есептелген қуатты қолдану"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> Ампер/сағ"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s пайдаланылды"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"Батарея зарядының %1$s-ы"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Соңғы толық зарядталғаннан кейін пайдалану мәліметтері"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Қалған болжалды уақыт"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Толық зарядталуға дейін қалған уақыт"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Болжалды уақыт пайдалануға байланысты өзгеруі мүмкін"</string>
     <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>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\"Қосып қою\" опциясы өшірулі"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Бұл қолданбада қолдау көрсетілмейді"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Тек VPN арқылы іске қосылатын байланыстарға рұқсат беру"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN байланысы қажет пе?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Құлыптау қосулы"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Құлыптау өшірулі"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Әрқашан жалғанып тұратын VPN профилін таңдаңыз. Желі трафигі осы VPN жалғанып тұрғанда ғана жүреді."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Шектелген профайлдардың есептік жазба қосу мүмкіндігі жоқ"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> осы құралдан жою"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Құлып экранының параметрлері"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Пайдаланушыларды құлып экранынан енгізу"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Жаңа пайдаланушы"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Жаңа профайл"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Өзіңізді жоясыз ба?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Телефон қоңырауларын және SMS қосу керек пе?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Қоңыраулар және SMS тарихы осы пайдаланушымен бөлісіледі."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Төтенше жағдайға арналған ақпарат"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> туралы ақпарат"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> ақпараты және контактілері"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Қолданбалар мен мазмұнға рұқсат беру"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Шектеулері бар қолданбалар"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Қолданба параметрлерін кеңейту"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">%d жасырын элементті көрсету</item>
       <item quantity="one">%d жасырын элементті көрсету</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Желі және интернет"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, ұялы байланыс, деректерді пайдалану, хотспот"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Желі және интернет"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобильдік, деректер трафигі, хотспот"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Қосылған құрылғылар"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, трансляциялау"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Қолданбалар мен хабарландырулар"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Нәтижелер"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, желі байланысы"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"мәтіндік хабар, мәтіндік хабарлар жіберу, хабарлар, хабар алмасу"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"ұялы, ұялы оператор, сымсыз, деректер, 4g, 3g, 2g, LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ұялы байланыс, мобильдік, ұялы байланыс операторы, сымсыз, деректер, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, қоңырау, қоңыраулар"</string>
     <string name="keywords_home" msgid="3626170808219458848">"қосқыш"</string>
     <string name="keywords_display" msgid="8910345814565493016">"экран, сенсорлық экран"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Дабыл"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Дірілдеу"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Дыбыстарды қосу"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"\"Мазаламау режимі\" параметрлері"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Маңыздыларына ғана рұқсат"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматты ережелер"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"\"Мазаламау\" кестесін орнату"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Әдепкі жұмыс хабарландыруы үні"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Әдепкі жұмыс дабылы рингтоны"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Жеке профильдікімен бірдей"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Жұмыс профилінің дыбыстары ауыстырылсын ба?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Жеке профиль дыбыстары пайдаланылысын ба?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Ауыстыру"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Ағымдағы жұмыс профилі дыбыстарының орнына жеке профильдікі қолданылады"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Ағымдағы жұмыс профилі дыбыстарының орнына жеке профильдікі қолданылады"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Рингтондар"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Басқа дыбыстар мен дірілдер"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Хабарландыру параметрлері"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Ешқандай рұқсат берілмеген"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Ешқандай рұқсат сұралмаған"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Қолданбалар"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Қосылған"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Орнатылған қолданбалар"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Лездік қолданбалар"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Жеке"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Жұмыс"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Бөгелген"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домен URL мекенжайларымен"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Кеңейтілген"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Қолданбаларды конфигурациялау"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгісіз қолданба"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Жұмыс үшін әдепкі"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Көмекші және дауыспен енгізу"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Көмекші қолданба"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ешқандай"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Көмекші қолданбаны таңдау"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> қолданбасын сіздің көмекшіңіз ету қажет пе?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Көмекші жүйеде пайдаланылып жатқан қолданбалар туралы ақпаратты, соның ішінде, экранда көрінетін ақпаратты немесе қолданбалар ішінде қатынасуға болатын ақпаратты оқи алады."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Келісу"</string>
@@ -2959,6 +2958,8 @@
     <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">"Батареяны оңтайландыру"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Пайдаланушы ескертулері"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Барлығын көрсету"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Қосымша қолданбаларды жасыру"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Оңтайландырылмаған"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Оңтайландырылмаған"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Батареяны пайдалануды оңтайландыру"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Суық түс температурасы"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Суығырақ дисплей түстерін пайдалану"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Түс өзгерісін қолдану үшін экранды өшіріңіз"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor функциясындағы өзгеріс күшіне енуі үшін, құрылғыны қайта жүктеңіз"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматты жүйе жаңартулары"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL байланыстырылған модульдері (қайта жүктеу қажет)"</string>
     <string name="usage" msgid="2977875522080448986">"Трафик"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Көмекші қимыл"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ғаламдық HTTP прокси-серверлер жиыны"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Әкімші құрылғыны құлыптап, құпия сөзді қайта орната алады"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Әкімші барлық құрылғы деректерін жоя алады"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Әкімші құпия сөзді енгізуді <xliff:g id="COUNT_1">%d</xliff:g> мүмкіндікпен шектеген, одан кейін барлық құрылғы деректері жойылады</item>
+      <item quantity="one">Әкімші құпия сөзді енгізуді <xliff:g id="COUNT_0">%d</xliff:g> мүмкіндікпен шектеген, одан кейін барлық құрылғы деректері жойылады</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"Бұл құрылғыны ұйым басқарады."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Бұл құрылғыны <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> басқарады."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Толығырақ"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Суреттер және бейнелер"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музыка және аудиомазмұн"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Ойындар"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Басқа қолданбалар"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлдар"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Жад менеджері: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Өшірулі"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Қосулы"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Ойындар"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудиофайлдар"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Mузыка"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> деген пайдаланушы үшін жойылған)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> деген пайдаланушы үшін өшірілген)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Автотолтыру қолданбасы"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index b2b8823..dde298b 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង​"</string>
     <string name="account_settings_title" msgid="626177544686329806">"គណនី"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"សុវត្ថិភាព និងការ​ចាក់​សោ​អេក្រង់"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ការ​អ៊ិនគ្រីប និងលិខិត​សម្គាល់"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"កំណត់​ទីតាំង​ខ្ញុំ, ការ​ដោះ​សោ​អេក្រង់, សោ​ឧបករណ៍​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"ពាក្យ​សម្ងាត់"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"ឯកជនភាព"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"បាន​បិទ​ដោយ​អ្នក​គ្រប់គ្រង"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ស្ថានភាព​សុវត្ថិភាព"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"ទីតាំង ស្នាម​ម្រាមដៃ"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"ជ្រើស​វ៉ាយហ្វាយ"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"កំពុង​បើក​វ៉ាយហ្វាយ..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"កំពុង​បិទ​វ៉ាយហ្វាយ..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"មើល​បណ្តាញ​ទាំងអស់"</string>
     <string name="wifi_error" msgid="3207971103917128179">"កំហុស"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz band មិនមានផ្តល់ជូននៅក្នុងប្រទេសនេះទេ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ពេល​ជិះ​យន្ត"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ការ​ភ្ជាប់ប៊្លូធូស"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ការ​ភ្ជាប់"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"ហតស្ប៉ត និង​ការភ្ជាប់"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"បាន​បើក​ហតស្ប៉ត និង​ការ​ភ្ជាប់"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"បាន​បើក​ហតស្ប៉ត"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ការ​ភ្ជាប់"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"មិនអាចភ្ជាប់ ឬប្រើហតស្ពតចល័តបានទេ នៅពេលបើកកម្មវិធីសន្សំសំចៃទិន្នន័យ"</string>
     <string name="usb_title" msgid="7483344855356312510">"យូអេសប៊ី"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"ការ​ភ្ជាប់​តាម​យូអេសប៊ី"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ដូចទៅនឹងការចាក់សោអេក្រង់ឧបករណ៍"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"គ្រប់គ្រង​កម្មវិធី"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"គ្រប់គ្រង និង​លុប​កម្មវិធី​ដែល​បាន​ដំឡើង"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"ព័ត៌មាន​អំពី​កម្មវិធី"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"គ្រប់គ្រង​កម្មវិធី និង​រៀបចំ​ផ្លូវកាត់​ចាប់ផ្ដើម​រហ័ស"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"ការ​កំណត់​កម្មវិធី"</string>
     <string name="install_applications" msgid="4872012136210802181">"មិនស្គាល់ប្រភព"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"គ្រប់គ្រង​ទំហំ"</string>
     <string name="filter" msgid="2018011724373033887">"តម្រង"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ជ្រើស​ជម្រើស​ត្រង"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"ទាំងអស់"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"បិទ"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"កម្មវិធី​ទាំងអស់"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"កម្មវិធី​ដែល​បាន​បិទ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"បាន​ទាញ​យក"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"កំពុង​ដំណើរការ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ឧបករណ៍​ផ្ទុក​​យូអេសប៊ី"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"លើ​កាត​អេសឌី"</string>
     <string name="disabled" msgid="9206776641295849915">"បិទ"</string>
     <string name="not_installed" msgid="2797554494953450291">"មិន​បាន​ដំឡើង​សម្រាប់​អ្នក​ប្រើ​នេះ"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"បាន​ដំឡើង"</string>
     <string name="no_applications" msgid="7336588977497084921">"គ្មាន​កម្មវិធី"</string>
     <string name="internal_storage" msgid="1584700623164275282">"ឧបករណ៍​ខាង​ក្នុង"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ឧបករណ៍ផ្ទុកខាងក្នុង"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"រៀបចំ​វិធីសាស្ត្រ​បញ្ចូល"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"ការ​កំណត់"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"ការ​កំណត់"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"វិធីសាស្ត្រ​បញ្ចូល​សកម្ម"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"ប្រើភាសាប្រព័ន្ធ"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"ការ​កំណត់ <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"ជ្រើស​វិធីសាស្ត្រ​បញ្ចូល​សកម្ម"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ការ​កំណត់​ក្ដារចុច​លើអេក្រង់"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"ធ្វើ​បច្ចុប្បន្នភាព​ការ​ពង្រីក​អេក្រង់​ស្វ័យប្រវត្តិ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ធ្វើ​បច្ចុប្បន្ន​ភាព​ការ​ពង្រីក​អេក្រង់​ពេល​មាន​ដំណើរ​ផ្លាស់​ប្ដូរ​កម្មវិធី"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ប៊ូតុង​បិទ/បើក​បញ្ចប់​ការ​ហៅ"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"និយាយ​ពាក្យ​សម្ងាត់"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"ព្រួញកណ្តុរធំ"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"សំឡេងម៉ូណូ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"រួមផ្សំប៉ុស្តិ៍ចូលគ្នាពេលកំពុងចាក់សំឡេង"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"ប្រើ​តាំង​ពី​បញ្ចូល​ថ្ម​ពេញ​ចុងក្រោយ"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"ការប្រើប្រាស់​អេក្រង់"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"ការប្រើប្រាស់​អេក្រង់"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"ការស្កេន​បណ្ដាញ​ទូរសព្ទ​ចល័ត"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"ការប្រើប្រាស់​កម្មវិធី​ចាប់​តាំង​ពី​សាកថ្ម​ពេញលើក​ចុង​ក្រោយ"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"ការប្រើប្រាស់​ឧបករណ៍​ចាប់​តាំង​ពី​សាកថ្ម​ពេញ​លើក​ចុងក្រោយ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ថ្ម​ដែល​បាន​ប្រើ​តាំង​ពី​លែង​បញ្ចូល"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ថ្មី​ប្រើ​តាំង​ពី​ពេល​កំណត់​ឡើង​វិញ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"បាន​ប្រើ​ថ្ម​អស់​រយៈពេល <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស​"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"បានប្រើ​អស់​រយៈពេល %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s នៃ​ថាមពល​ថ្ម​សរុប"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"ព័ត៌មាន​លម្អិត​អំពី​ការប្រើប្រាស់​ថាមពល​ចាប់តាំង​ពី​សាក​ពេញ​រួចមក"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"រយៈពេល​នៅ​សល់​ប៉ាន់​ស្មាន"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"រយៈពេល​នៅសល់​រហូត​សាក​ពេញ"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"ការ​ប៉ាន់ស្មាន​អាចនឹង​ផ្លាស់ប្តូរ​ផ្អែកលើ​ការ​ប្រើប្រាស់"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"មុខងារបើកជានិច្ចបានអសកម្ម"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"មិនគាំទ្រដោយកម្មវិធីនេះទេ"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"អនុញ្ញាតឲ្យភ្ជាប់តាមរយៈ VPN តែប៉ុណ្ណោះ"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"តម្រូវឲ្យ​មាន​ការ​តភ្ជាប់ VPN ?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"បើកការរារាំង"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"បិទការរាំរាំង"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ជ្រើស​ប្រវត្តិរូប VPN តភ្ជាប់​ជា​និច្ច។ ចរាចរណ៍​បណ្ដាញ​នឹង​ត្រូវ​បាន​អនុញ្ញាត​ ពេល​តភ្ជាប់​ទៅ VPN នេះ។"</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"ប្រវត្តិរូប​បាន​ដាក់កម្រិត​មិន​អាច​បន្ថែម​គណនី"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"លុប <xliff:g id="USER_NAME">%1$s</xliff:g> ពី​ឧបករណ៍​នេះ"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"ការកំណត់អេក្រង់ចាក់សោ"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"បញ្ចូល​អ្នក​ប្រើប្រាស់​ពី​អេក្រង់​ចាក់សោ"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"អ្នក​ប្រើថ្មី"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"ប្រវត្តិរូប​ថ្មី"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"លុប​ខ្លួន​ឯង​ផ្ទាល់?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"បើកការហៅទូរស័ព្ទ &amp; សារ SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ប្រវត្តិ​ហៅ និង​សារ SMS នឹង​ត្រូវ​បាន​ចែករំលែក​ជា​មួយ​អ្នកប្រើ​នេះ។"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ព័ត៌មានបន្ទាន់"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"ព័ត៌មានអំពី <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"ព័ត៌មាន និង​ទំនាក់​ទំនង​សម្រាប់ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"អនុញ្ញាត​កម្មវិធី និង​មាតិកា"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"កម្មវិធី​មាន​ការ​ដាក់កម្រិត"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ពង្រីក​ការ​កំណត់​សម្រាប់​កម្មវិធី"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">បង្ហាញធាតុ %d ដែលបានលាក់</item>
       <item quantity="one">បង្ហាញធាតុ %d ដែលបានលាក់</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"បណ្តាញ និង​អ៊ីនធឺណិត"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, ទិន្នន័យចល័ត ការ​ប្រើ​ទិន្នន័យ ហតស្ប៉ត"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"បណ្តាញ និងអ៊ីនធឺណិត"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi ឧបករណ៍​ចល័ត ការ​ប្រើ​ប្រាស់ទិន្នន័យ ហតស្ប៉ត"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ឧបករណ៍ដែលបានភ្ជាប់"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"ប៊្លូធូស, NFC, ភ្ជាប់"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"កម្មវិធី និងការជូនដំណឹង"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"អ្នកប្រើ និងគណនី"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"កម្មវិធីលំនាំដើម"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"ភាសា ការបម្រុងទុក បច្ចុប្បន្នភាព អំពី​ទូរសព្ទ"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"ភាសា ការ​បម្រុង​ទុក បច្ចុប្បន្នភាព អំពី​ឧបករណ៍"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ការកំណត់"</string>
     <string name="search_menu" msgid="6283419262313758339">"ការកំណត់ការស្វែងរក"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"កំណត់​ការ​​ស្វែងរក"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"លទ្ធផល"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, ការតភ្ជាប់បណ្តាញ"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"សារជាអក្សរ, សរសេរសារជាអក្សរ, ការផ្ញើសារ"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"ចល័ត, ក្រុមហ៊ុនទូរស័ព្ទចល័ត, ឥតខ្សែ, ទិន្នន័យ, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ចល័ត ឧបករណ៍​ចល័ត ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ ឥត​ខ្សែ ទិន្នន័យ 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, ហៅ, ការហៅ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"កម្មវិធី​ចាប់ផ្ដើម"</string>
     <string name="keywords_display" msgid="8910345814565493016">"អេក្រង់, ប៉ះអេក្រង់"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"ជូន​ដំណឹង"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ញ័រ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"បើកសំឡេង"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"ចំណូល​ចិត្ត​មុខងារ​កុំ​រំខាន"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"អនុញ្ញាតអាទិភាពប៉ុណ្ណោះ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ច្បាប់ស្វ័យប្រវត្តិ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"កំណត់ពេលអនុវត្តមុខងារកុំរំខាន"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"សំឡេងជូនដំណឹងការងារលំនាំដើម"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"សំឡេងម៉ោងរោទិ៍ការងារលំនាំដើម"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ដូចគ្នានឹងប្រវត្តិរូបការងារ"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"ជំនួសសំឡេងប្រវត្តិការងារឬ?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ប្រើ​សំឡេង​កម្រង​ព័ត៌មាន​ផ្ទាល់ខ្លួន?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ជំនួស"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"សំឡេងប្រវត្តិរូបការងារបច្ចុប្បន្នរបស់អ្នកនឹងត្រូវបានជំនួសដោយសំឡេងប្រវត្តិរូបផ្ទាល់ខ្លួនរបស់អ្នក"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"សំឡេង​កម្រង​ព័ត៌មាន​ផ្ទាល់ខ្លួន​របស់​អ្នកនឹង​ត្រូវ​បាន​ប្រើ​ជំនួស​ឲ្យសំឡេង​កម្រង​ព័ត៌មាន​ការងារ​បច្ចុប្បន្ន​របស់​អ្នក"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"សំឡេង​រោទ៍"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"សំឡេង និង​ការ​ញ័រ​ផ្សេងទៀត"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"ចំណូលចិត្តការជូនដំណឹង"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"គ្មានការផ្តល់សិទ្ធិអនុញ្ញាតទេ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"គ្មានការស្នើសិទ្ធិអនុញ្ញាតទេ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"កម្មវិធីទាំងអស់"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"បានបើកដំណើរការ"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"កម្មវិធី​ដែល​បាន​ដំឡើង"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"កម្មវិធី​ប្រើ​ភ្លាមៗ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ផ្ទាល់ខ្លួន"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"កន្លែងធ្វើការ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"បានទប់ស្កាត់"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ដោយមានដែន URLs"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"កម្រិតខ្ពស់"</string>
     <string name="configure_apps" msgid="6685680790825882528">"កំណត់រចនាសម្ព័ន្ធកម្មវិធី"</string>
     <string name="unknown_app" msgid="5275921288718717656">"កម្មវិធីមិនស្គាល់"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"លំនាំដើមសម្រាប់ការងារ"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"ជំនួយ និងការបញ្ចូលសំឡេង"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"កម្មវិធីជំនួយ"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"គ្មាន"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"ជ្រើសកម្មវិធីជំនួយ"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"កំណត់ឲ្យ <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ជាជំនួយការរបស់អ្នក?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"ជំនួយការនឹងមិនអាចអានព័ត៌មានអំពីកម្មវិធីដែលកំពុងប្រើនៅក្នុងប្រព័ន្ធរបស់អ្នកបានទេ ដោយរាប់បញ្ចូលទាំងព័ត៌មានដែលអាចមើលឃើញនៅលើអេក្រង់របស់អ្នក ឬព័ត៌មានដែលអាចចូលបាននៅក្នុងកម្មវិធី។"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"យល់ព្រម"</string>
@@ -2966,6 +2958,8 @@
     <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">"ការបង្កើនប្រសិទ្ធភាពថ្ម"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ការជូនដំណឹង​អំពី​ការប្រើប្រាស់"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"បង្ហាញ​​កម្មវិធី​ទាំងអស់"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"លាក់កម្មវិធី​បន្ថែម​ទៀត"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"មិនបានបង្កើនប្រសិទ្ធភាព"</string>
     <string name="high_power_on" msgid="6216293998227583810">"មិនបានសម្រួលឲ្យមានប្រសិទ្ធភាពទេ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"បង្កើនប្រសិទ្ធភាពប្រើប្រាស់ថ្ម"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"សីតុណ្ហភាពពណ៌ត្រជាក់"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ប្រើពណ៌បង្ហាញត្រជាក់ជាងមុន"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ដើម្បីប្តូរពណ៌ សូមបិទអេក្រង់"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ដើម្បី​អនុវត្ត​ការ​ផ្លាស់ប្តូរ telephony monitor សូម​ចាប់ផ្តើម​ឧបករណ៍​ឡើងវិញ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ការអាប់ដេតប្រព័ន្ធដោយស្វ័យប្រវត្តិ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (តម្រូវឲ្យ​ចាប់ផ្ដើម​ឡើង​វិញ)"</string>
     <string name="usage" msgid="2977875522080448986">"ការប្រើប្រាស់"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"ចលនា​បើកកម្មវិធីជំនួយ"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"បាន​កំណត់​ប្រូកស៊ី HTTP សកល"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"អ្នក​គ្រប់គ្រង​អាច​ចាក់សោ​ឧបករណ៍ និង​កំណត់​ពាក្យសម្ងាត់​ឡើងវិញ​បាន"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"អ្នក​គ្រប់គ្រង​អាច​លុប​ទិន្នន័យ​ឧបករណ៍​ទាំងអស់​បាន"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">អ្នក​គ្រប់គ្រង​បាន​កំណត់​ចំនួន​នៃ​ការព្យាយាម​បញ្ចូល​ពាក្យ​សម្ងាត់ <xliff:g id="COUNT_1">%d</xliff:g> ដង​ជាចំនួន​អតិបរមា មុន​ពេល​លុប​ទិន្នន័យ​ឧបករណ៍​ទាំងអស់</item>
+      <item quantity="one">អ្នក​គ្រប់គ្រង​បាន​កំណត់​ចំនួន​នៃ​ការព្យាយាម​បញ្ចូល​ពាក្យ​សម្ងាត់ <xliff:g id="COUNT_0">%d</xliff:g> ដង​ជាចំនួន​អតិបរមា មុន​ពេល​លុប​ទិន្នន័យ​ឧបករណ៍​ទាំងអស់</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"ឧបករណ៍​នេះ​ស្ថិត​ក្រោម​ការ​គ្រប់គ្រង។"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ឧបករណ៍​នេះ​ស្ថិត​ក្រោម​ការ​គ្រប់គ្រង​របស់ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ។"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ស្វែងយល់បន្ថែម"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"រូបថត និង​វីដេអូ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"តន្រ្តី និង​សំឡេង"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ហ្គេម"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"កម្មវិធី​ផ្សេង​ទៀត"</string>
     <string name="storage_files" msgid="8581083146777364063">"ឯកសារ"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"កម្មវិធី​គ្រប់គ្រង​ទំហំផ្ទុក៖ <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"បិទ"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"បើក"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ហ្គេម"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ឯកសារ​សំឡេង"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"តន្ត្រី"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(បានលុប​សម្រាប់​អ្នក​ប្រើ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(បានបិទ​សម្រាប់​អ្នក​ប្រើ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"កម្មវិធី​បំពេញ​ស្វ័យប្រវត្តិ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 615644f..56b2f57 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"ಸ್ಥಾನ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ಖಾತೆಗಳು"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"ಭದ್ರತೆ ಮತ್ತು ಪರದೆ ಲಾಕ್"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಮತ್ತು ರುಜುವಾತುಗಳು"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"ಪಾಸ್‌ವರ್ಡ್‌ಗಳು"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"ಗೌಪ್ಯತೆ"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"ನಿರ್ವಾಹಕರಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ಭದ್ರತೆ ಸ್ಥಿತಿ"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"ಸ್ಥಳ, ಫಿಂಗರ್ ಫ್ರಿಂಟ್"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi ಆನ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi ಆಫ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"ಎಲ್ಲ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ನೋಡಿ"</string>
     <string name="wifi_error" msgid="3207971103917128179">"ದೋಷ"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"ಈ ದೇಶದಲ್ಲಿ 5 GHz ಬ್ಯಾಂಡ್ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್‌ನಲ್ಲಿ"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ಬ್ಲೂಟೂತ್‌‌ ಟೆಥರಿಂಗ್‌"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ಟೆಥರಿಂಗ್‌"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"ಹಾಟ್‌ಸ್ಪಾಟ್‌ - ಟೆಥರಿಂಗ್"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆನ್ ಆಗಿದೆ, ಟೆಥರಿಂಗ್‌"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆನ್ ಆಗಿದೆ"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ಟೆಥರಿಂಗ್‌"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ಡೇಟಾ ಉಳಿಸುವಿಕೆಯನ್ನು ಆನ್ ಆಗಿರುವಾಗ ಪೋರ್ಟೆಬಲ್ ಹಾಟ್‌ಸ್ಪಾಟ್‌ಗಳನ್ನು ಟೆಥರ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ ಅಥವಾ ಬಳಸಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ಟೆಥರಿಂಗ್"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ಸಾಧನದ ಪದದೆ ಲಾಕ್‌ ರೀತಿಯಲ್ಲಿ"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ ಮತ್ತು ತೆಗೆದುಹಾಕಿ"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ, ಶೀಘ್ರ ಪ್ರಾರಂಭ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="install_applications" msgid="4872012136210802181">"ಅಪರಿಚಿತ ಮೂಲಗಳು"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"ಸ್ಥಳ ನಿರ್ವಹಿಸಿ"</string>
     <string name="filter" msgid="2018011724373033887">"ಫಿಲ್ಟರ್‌"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ಫಿಲ್ಟರ್ ಆಯ್ಕೆಗಳನ್ನು ಆರಿಸಿ"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"ಎಲ್ಲಾ"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ಚಾಲನೆಯಲ್ಲಿದೆ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB ಸಂಗ್ರಹಣೆ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD ಕಾರ್ಡ್‌ ನಲ್ಲಿ"</string>
     <string name="disabled" msgid="9206776641295849915">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="not_installed" msgid="2797554494953450291">"ಈ ಬಳಕೆದಾರರಿಗಾಗಿ ಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
     <string name="no_applications" msgid="7336588977497084921">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಇಲ್ಲ."</string>
     <string name="internal_storage" msgid="1584700623164275282">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"ಸಕ್ರಿಯ ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳು"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"ಸಿಸ್ಟಂ ಭಾಷೆಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"ಸಕ್ರಿಯ ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಆರಿಸಿ"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ಪರದೆ ಮೇಲಿನ ಕೀಬೋರ್ಡ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"ಸ್ವಯಂಚಾಲಿತ ನವೀಕರಣದ ಸ್ಕ್ರೀನ್‌ ವರ್ಧನೆ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ಅಪ್ಲಿಕೇಶನ್‌ ಪರಿವರ್ತನೆಗಳಲ್ಲಿ ಸ್ಕ್ರೀನ್‌ ವರ್ಧಕವನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ಪವರ್ ಬಟನ್ ಕರೆಯನ್ನು ಕೊನೆಗೊಳಿಸುತ್ತದೆ"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ಹೇಳು"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"ದೊಡ್ಡ ಮೌಸ್ ಪಾಯಿಂಟರ್"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"ಮೊನೊ ಆಡಿಯೊ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ಆಡಿಯೊ ಪ್ಲೇ ಮಾಡುತ್ತಿರುವಾಗ ಚಾನಲ್‌ಗಳನ್ನು ಒಂದುಗೂಡಿಸಿ"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"ಕೊನೆಯ ಪೂರ್ತಿ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ ಬಳಕೆ"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"ಪರದೆಯ ಬಳಕೆಗಾಗಿ"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"ಪರದೆ ಬಳಕೆ ಮಾಡಿದ್ದು"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಕ್ಯಾನ್ ಮಾಡುವುದು"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"ಕೊನೆಯ ಬಾರಿ ಪೂರ್ಣ ಚಾರ್ಜ್‌ ಮಾಡಿದ ನಂತರ ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆ"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"ಕೊನೆಯ ಬಾರಿ ಸಂಪೂರ್ಣ ಚಾರ್ಜ್‌ ಮಾಡಿದ ನಂತರದಿಂದ ಸಾಧನದ ಬಳಕೆ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ಅನ್‌ಪ್ಲಗ್‌ ಆದಾಗಿನಿಂದ ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ಮರುಹೊಂದಿಸಿದಾಗಿನಿಂದ ಬಳಕೆಯಾದ ಬ್ಯಾಟರಿ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"ಬ್ಯಾಟರಿಯಲ್ಲಿ <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ಅಧಿಕ ಗಣನೆಯ ಪವರ್ ಬಳಕೆ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s ಗೆ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"ಒಟ್ಟು ಬ್ಯಾಟರಿ ಬಳಕೆಯ %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"ಕೊನೆಯ ಬಾರಿ ಪೂರ್ಣ ಚಾರ್ಜ್‌ ಆದ ನಂತರ ಬಳಕೆಯಾದ ವಿವರ"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"ಅಂದಾಜಿಸಿದ ಸಮಯ ಮುಗಿದಿದೆ"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್‌ ಮಾಡುವ ಸಮಯ"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"ಬಳಕೆಯನ್ನು ಆಧರಿಸಿ ಅಂದಾಜು ಬದಲಾಗಬಹುದು"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"ಯಾವಾಗಲೂ ಆನ್ ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಮೂಲಕ ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"VPN ಮೂಲಕ ಮಾತ್ರ ಸಂಪರ್ಕಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN ಸಂಪರ್ಕ ಅಗತ್ಯವಿದೆಯೇ?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"ಲಾಕ್‌ಡೌನ್‌ ಸಕ್ರಿಯವಾಗಿದೆ"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"ಲಾಕ್‌ಡೌನ್‌ ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ಯಾವಾಗಲೂ ಸಂಪರ್ಕದಿಂದಿರಲು VPN ಪ್ರೊಫೈಲ್‌ ಆಯ್ಕೆಮಾಡಿ. ಈ VPN ಗೆ ಸಂಪರ್ಕಗೊಳಿಸಿದಾಗ ಮಾತ್ರ ನೆಟ್‌ವರ್ಕ್‌ ದಟ್ಟಣೆಯನ್ನು ಅನುಮತಿಸಲಾಗುವುದು."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"ನಿರ್ಬಂಧಿಸಿದ ಪ್ರೊಫೈಲ್‌ಗಳು ಖಾತೆಗಳನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"ಈ ಸಾಧನದಿಂದ <xliff:g id="USER_NAME">%1$s</xliff:g> ಅಳಿಸಿ"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"ಪರದೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಲಾಕ್ ಮಾಡಿ"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಿಂದ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"ಹೊಸ ಬಳಕೆದಾರರು"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"ಹೊಸ ಪ್ರೊಫೈಲ್"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"ನಿಮ್ಮನ್ನು ಅಳಿಸುವುದೇ?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ಫೋನ್ ಕರೆಗಳು &amp; SMS ಆನ್ ಮಾಡುವುದೇ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ಕರೆ ಮತ್ತು SMS ಇತಿಹಾಸವನ್ನು ಈ ಬಳಕೆದಾರರ ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತದೆ."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ತುರ್ತು ಮಾಹಿತಿ"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> ಕುರಿತು ಮಾಹಿತಿ"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> ಗಾಗಿ ಮಾಹಿತಿ ಮತ್ತು ಸಂಪರ್ಕಗಳು"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ಅಪ್ಲಿಕೇಶನ್‌‌ಗಳು ಮತ್ತು ವಿಷಯವನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ನಿರ್ಬಂಧಗಳೊಂದಿಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ಅಪ್ಲಿಕೇಶನ್‌ಗಾಗಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ವಿಸ್ತರಿಸಿ"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="one">%d ಮರೆಮಾಡಲಾದ ಐಟಂಗಳನ್ನು ತೋರಿಸಿ</item>
       <item quantity="other">%d ಮರೆಮಾಡಲಾದ ಐಟಂಗಳನ್ನು ತೋರಿಸಿ</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"ನೆಟ್‌ವರ್ಕ್ ಮತ್ತು ಇಂಟರ್ನೆಟ್"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"ವೈಫೈ, ಸೆಲ್ಯುಲರ್, ಡೇಟಾ ಬಳಕೆ, ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"ನೆಟ್‌ವರ್ಕ್ ಮತ್ತು ಇಂಟರ್ನೆಟ್"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"ವೈಫೈ, ಮೊಬೈಲ್, ಡೇಟಾ ಬಳಕೆ, ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ಸಂಪರ್ಕ ಹೊಂದಿರುವ ಸಾಧನಗಳು"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"ಬ್ಲೂಟೂತ್, NFC, ಬಿತ್ತರಣೆ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"ಬಳಕೆದಾರ ಮತ್ತು ಖಾತೆಗಳು"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"ಡಿಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"ಭಾಷೆಗಳು, ಬ್ಯಾಕ್‌ಅಪ್, ಅಪ್‌ಡೇಟ್‌ಗಳು, ಫೋನ್‌ ಕುರಿತ ಮಾಹಿತಿ"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"ಭಾಷೆಗಳು, ಬ್ಯಾಕ್‌ಅಪ್, ಅಪ್‌ಡೇಟ್‌ಗಳು, ಸಾಧನದ ಕುರಿತು"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="search_menu" msgid="6283419262313758339">"ಹುಡುಕಾಟ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"ಹುಡುಕಾಟ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"ಫಲಿತಾಂಶಗಳು"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"ವೈಫೈ, ವೈ-ಫೈ, ನೆಟ್‌ವರ್ಕ್‌ ಸಂಪರ್ಕ"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ಪಠ್ಯ ಸಂದೇಶ, ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ, ಸಂದೇಶಗಳು, ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"ಸೆಲ್ಯುಲಾರ್, ಸೆಲ್ ವಾಹಕ, ವೈರ್‌ಲೆಸ್, ಡೇಟಾ, 4g, 3g, 2g, ಎಲ್‌ಟಿಇ"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ಸೆಲ್ಯುಲಾರ್, ಸೆಲ್ ವಾಹಕ, ವೈರ್‌ಲೆಸ್, ಡೇಟಾ, 4g, 3g, 2g, ಎಲ್‌ಟಿಇ"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"ವೈಫೈ, ವೈ-ಫೈ, ಕರೆ, ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ಲಾಂಚರ್"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ಪರದೆ, ಟಚ್‌ಸ್ಕ್ರೀನ್"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"ಎಚ್ಚರಿಕೆ"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ವೈಬ್ರೇಟ್‌‌"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ಧ್ವನಿಗಳನ್ನು ಪವರ್ ಆನ್ ಮಾಡಿ"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಎಂಬ ಆದ್ಯತೆಗಳು"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ಆದ್ಯತೆ ಮಾತ್ರ ಅನುಮತಿಸುತ್ತದೆ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ಸ್ವಯಂಚಾಲಿತ ನಿಯಮಗಳು"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅವಧಿ ಹೊಂದಿಸಿ"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ಡಿಫಾಲ್ಟ್ ಕೆಲಸದ ಅಧಿಸೂಚನೆ ರಿಂಗ್‌ಟೋನ್"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ಡಿಫಾಲ್ಟ್ ಕೆಲಸದ ಅಲಾರಮ್ ರಿಂಗ್‌ಟೋನ್"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ರೀತಿಯಲ್ಲಿ"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳನ್ನು ಬದಲಾಯಿಸುವುದೇ?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳನ್ನು ಬಳಸಬೇಕೆ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ಸ್ಥಾನಾಂತರಿಸು"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳನ್ನು ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಯಾಗಿ ಸ್ಥಾನಾಂತರಿಸಲಾಗುತ್ತದೆ"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳ ಬದಲಾಗಿ ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳನ್ನು ಬಳಸಲಾಗುತ್ತದೆ"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ರಿಂಗ್‌ಟೋನ್‌ಗಳು"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ಇತರ ಧ್ವನಿ ಮತ್ತು ವೈಬ್ರೇಷನ್‌ ಆದ್ಯತೆಗಳು"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"ಅಧಿಸೂಚನೆ ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ಯಾವುದೇ ಅನುಮತಿಗಳನ್ನು ನೀಡಲಾಗಿಲ್ಲ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"ಯಾವುದೇ ಅನುಮತಿಗಳನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ತತ್‌ಕ್ಷಣ ಆಪ್‌ಗಳು"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ವೈಯಕ್ತಿಕ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ಕೆಲಸ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ಡೊಮೇನ್‌ URL ಗಳ ಜೊತೆಗೆ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"ಸುಧಾರಿತ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ಅಪ್ಲಿಕೇಶನ್‌ ಕಾನ್ಫಿಗರ್‌"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"ಕೆಲಸದ ಡಿಫಾಲ್ಟ್"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"ಸಹಾಯ &amp; ಧ್ವನಿ ಇನ್‌ಪುಟ್"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"ಅಪ್ಲಿಕೇಶನ್ ಸಹಾಯ"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"ಸಹಾಯ ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ಅನ್ನು ನಿಮ್ಮ ಸಹಾಯಕವನ್ನಾಗಿ ಮಾಡುವುದೇ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"ನಿಮ್ಮ ಪರದೆಯಲ್ಲಿ ಗೋಚರಿಸುವ ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿಯೇ ಪ್ರವೇಶಿಸಬಹುದಾದಂತಹ ಮಾಹಿತಿ ಸೇರಿದಂತೆ ನಿಮ್ಮ ಸಿಸ್ಟಂನಲ್ಲಿ ಬಳಕೆಯಲ್ಲಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಕುರಿತು ಮಾಹಿತಿಯನ್ನು ಓದಲು ಸಹಾಯಕಕ್ಕೆ ಸಾಧ್ಯವಾಗಬಹುದು."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"ಅನುಮೋದಿಸು"</string>
@@ -2966,6 +2958,8 @@
     <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">"ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಷನ್‌"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ಬಳಕೆ ಎಚ್ಚರಿಕೆಗಳು"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರದರ್ಶಿಸಿ"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"ಹೆಚ್ಚುವರಿ ಅಪ್ಲಿಕೇಶನ್‌ ಮರೆಮಾಡಿ"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ತಂಪು ಬಣ್ಣದ ತಾಪಮಾನ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ತಂಪಾದ ಪ್ರದರ್ಶನ ಬಣ್ಣಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ಬಣ್ಣದ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಪರದೆ ಆಫ್ ಮಾಡಿ"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ದೂರವಾಣಿ ಮಾನಿಟರ್ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಸಾಧನವನ್ನು ರೀಬೂಟ್ ಮಾಡಿ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ಸ್ವಯಂಚಾಲಿತ ಸಿಸ್ಟಂ ಅಪ್‌ಡೇಟ್‌ಗಳು"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"ಬೈಂಡರ್ ಮಾಡಿದ HAL ಗಳು (ರಿಬೂಟ್ ಅಗತ್ಯವಿದೆ)"</string>
     <string name="usage" msgid="2977875522080448986">"ಬಳಕೆ"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"ನೆರವು ಗೆಸ್ಚರ್"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ಜಾಗತಿಕ HTTP ಪ್ರಾಕ್ಸಿ ಸೆಟ್"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ನಿರ್ವಾಹಕರು ಸಾಧನವನ್ನು ಲಾಕ್ ಮಾಡಬಹುದು ಮತ್ತು ಪಾಸ್‌ವರ್ಡ್ ಹೊಂದಿಸಬಹುದು"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ನಿರ್ವಾಹಕರು ಸಾಧನದ ಡೇಟಾವನ್ನು ಅಳಿಸಬಹುದು"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <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="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"ಈ ಸಾಧನವನ್ನು ನಿರ್ವಹಿಸಲಾಗಿದೆ."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ಈ ಸಾಧನವನ್ನು <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ನಿರ್ವಹಿಸುತ್ತಿದೆ."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳು"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"ಸಂಗೀತ ಮತ್ತು ಆಡಿಯೋ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ಆಟಗಳು"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="storage_files" msgid="8581083146777364063">"ಫೈಲ್‌ಗಳು"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ಸಂಗ್ರಹಣಾ ನಿರ್ವಾಹಕ: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ಆಫ್"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ಆನ್"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ಆಟಗಳು"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ಆಡಿಯೋ ಫೈಲ್‌ಗಳು"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"ಸಂಗೀತ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> ಬಳಕೆದಾರರಿಗೆ ಅಸ್ಥಾಪಿಸಲಾಗಿದೆ)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> ಬಳಕೆದಾರರಿಗೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ಸ್ವಯಂತುಂಬುವಿಕೆ ಅಪ್ಲಿಕೇಶನ್"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 420fc42..326b1b0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"위치"</string>
     <string name="account_settings_title" msgid="626177544686329806">"계정"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"보안 및 화면 잠금"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"암호화 및 사용자 인증 정보"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"비밀번호"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"개인정보 보호"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"관리자가 사용 중지함"</string>
     <string name="security_status_title" msgid="5848766673665944640">"보안 상태"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"위치, 지문"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fi 선택"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi 사용 설정 중..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi 사용 중지 중..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"모든 네트워크 보기"</string>
     <string name="wifi_error" msgid="3207971103917128179">"오류"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5GHz 대역은 이 국가에서 지원되지 않습니다."</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"비행기 모드"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"블루투스 테더링"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"테더링"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"핫스팟 및 테더링"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"핫스팟 사용, 테더링"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"핫스팟 사용"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"테더링"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"데이터 절약 모드가 켜져 있으면 테더링하거나 휴대용 핫스팟을 사용할 수 없습니다."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 테더링"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"기기 화면 잠금과 동일"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"앱 관리"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"설치된 앱 관리 및 제거"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"앱 정보"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"앱 관리, 빠른실행 바로가기 설정"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"앱 설정"</string>
     <string name="install_applications" msgid="4872012136210802181">"알 수 없는 소스"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"공간 관리"</string>
     <string name="filter" msgid="2018011724373033887">"필터"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"필터 옵션 선택"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"전체"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"사용중지됨"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"모든 앱"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"사용 중지된 앱"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"다운로드"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"실행 중"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 저장소"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD 카드"</string>
     <string name="disabled" msgid="9206776641295849915">"사용 안함"</string>
     <string name="not_installed" msgid="2797554494953450291">"이 사용자에게 설치되지 않음"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"설치됨"</string>
     <string name="no_applications" msgid="7336588977497084921">"앱 없음"</string>
     <string name="internal_storage" msgid="1584700623164275282">"내부 저장소"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"내부 저장소"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"입력 방법 설정"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"설정"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"설정"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"입력 방법"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"시스템 언어 사용"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 설정"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"입력 방법 선택"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"화면 키보드 설정"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"화면 확대 자동 업데이트"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"앱 전환 시 화면 확대 업데이트"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"전원 버튼으로 통화 종료"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"비밀번호 말하기"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"대형 마우스 포인터"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"모노 오디오"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"오디오 재생 시 채널 통합"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"마지막 충전 완료 후 배터리 사용 내역"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"화면 켜짐 상태 시간"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"화면 소비 전력"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"모바일 네트워크 검색"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"마지막 충전 완료 후 앱 사용"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"마지막 충전 완료 후 기기 사용"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"플러그를 뽑은 이후 배터리 전원 사용"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"초기화 이후 배터리 사용"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"배터리 사용 시간: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"전력 사용량 과다 산정됨"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s 동안 사용"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"전체 배터리 용량의 %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"마지막 충전 완료 후 사용 내역 분석"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"남은 예상 시간"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"남은 충전 시간"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"사용량에 따라 예상 시간이 달라질 수 있습니다."</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"항상 켜짐 비활성화"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"이 앱에서 지원되지 않음"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"VPN을 통한 연결만 허용"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN 연결이 필요한가요?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"잠금 활성화"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"잠금 비활성화"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"VPN 프로필을 선택하여 연결된 상태를 유지하세요. 이 VPN에 연결된 상태에서만 네트워크 트래픽이 허용됩니다."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"제한된 프로필은 계정을 추가할 수 없습니다."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"이 기기에서 <xliff:g id="USER_NAME">%1$s</xliff:g>님 삭제"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"잠금 화면 설정"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"잠금 화면에서 사용자 추가"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"새 사용자"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"새 프로필"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"본인을 삭제하시겠습니까?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"통화 및 SMS 기능을 사용하시겠습니까?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"통화 및 SMS 기록이 이 사용자와 공유됩니다."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"긴급 상황 정보"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g>님의 정보"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>님의 정보 및 연락처"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"앱 및 콘텐츠 허용"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"애플리케이션 제한"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"애플리케이션을 위한 설정 확장"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">%d개의 숨겨진 항목 표시</item>
       <item quantity="one">%d개의 숨겨진 항목 표시</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"네트워크 및 인터넷"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, 이동통신망, 데이터 사용량, 핫스팟"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"네트워크 및 인터넷"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, 모바일, 데이터 사용량, 핫스팟"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"연결된 기기"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"블루투스, NFC, 전송"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"앱 및 알림"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"사용자 및 계정"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"기본 앱"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"언어, 백업, 업데이트, 휴대전화 정보"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"언어, 백업, 업데이트, 기기 정보"</string>
     <string name="search_results_title" msgid="1796252422574886932">"설정"</string>
     <string name="search_menu" msgid="6283419262313758339">"검색 설정"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"검색 설정"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"검색결과"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"WiFi, Wi-Fi, 네트워크 연결"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, 문자 메시지, 텍스트 메시지, 메시지"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"휴대전화, 이동통신사, 무선, 데이터, 4G, 3G, 2G, LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"셀룰러, 모바일, 이동통신사, 무선, 데이터, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"WiFi, Wi-Fi, 전화, 통화"</string>
     <string name="keywords_home" msgid="3626170808219458848">"런처"</string>
     <string name="keywords_display" msgid="8910345814565493016">"화면, 터치스크린"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"알림"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"진동"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"부팅 소리"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"알림 일시중지 환경설정"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"중요 알림만 허용"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"자동 규칙"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"알림 일시중지 일정 설정"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"기본 직장 알림 톤"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"기본 직장 알람 벨소리"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"개인 프로필과 동일"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"직장 프로필 사운드 바꾸기"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"개인 프로필 사운드 사용"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"바꾸기"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"현재 직장 프로필 사운드가 개인 프로필 사운드로 대체됩니다."</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"현재 직장 프로필 사운드 대신 개인 프로필 사운드가 사용됩니다."</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"벨소리"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"기타 소리 및 진동"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"알림 환경설정"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"부여된 권한이 없습니다."</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"요청한 권한이 없습니다."</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"모든 앱"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"사용"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"설치된 앱"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"빠른 실행 앱"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"개인"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"직장"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"차단됨"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"도메인 URL이 있는 앱"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"고급"</string>
     <string name="configure_apps" msgid="6685680790825882528">"앱 설정"</string>
     <string name="unknown_app" msgid="5275921288718717656">"알 수 없는 앱"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"업무용 기본값"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"지원 및 음성 입력"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"지원 앱"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"없음"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"지원 앱 선택"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>을(를) 어시스턴트로 설정하시겠습니까?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"어시스턴트가 시스템에서 사용 중인 앱에 관한 정보를 읽을 수 있게 됩니다. 여기에는 화면에 표시된 정보 또는 앱 내에서 액세스할 수 있는 정보가 포함됩니다."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"동의"</string>
@@ -2966,6 +2958,8 @@
     <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">"배터리 최적화"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"배터리 사용량 알림"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"모든 앱 표시"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"추가 앱 숨기기"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"최적화되지 않음"</string>
     <string name="high_power_on" msgid="6216293998227583810">"최적화되지 않음"</string>
     <string name="high_power_off" msgid="3393904131961263278">"배터리 최적화 사용"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"차가운 색상 온도"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"더 차가운 디스플레이 색상 사용"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"색상 변경을 적용하려면 화면을 끄세요."</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"통신 모니터의 변경사항을 적용하려면 기기를 재부팅하세요."</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"자동 시스템 업데이트"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HAL(재부팅 필요)"</string>
     <string name="usage" msgid="2977875522080448986">"사용량"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"지원 동작"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"전체 HTTP 프록시 설정됨"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"관리자는 기기를 잠그고 비밀번호를 재설정할 수 있습니다."</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"관리자는 모든 기기 데이터를 삭제할 수 있습니다."</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">관리자가 비밀번호 입력에 <xliff:g id="COUNT_1">%d</xliff:g>회 실패 시 기기의 데이터가 모두 삭제되도록 설정했습니다.</item>
+      <item quantity="one">관리자가 비밀번호 입력에 <xliff:g id="COUNT_0">%d</xliff:g>회 실패 시 기기의 데이터가 모두 삭제되도록 설정했습니다.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"관리되는 기기입니다."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>에서 관리하는 기기입니다."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"자세히 알아보기"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"사진 및 동영상"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"음악 및 오디오"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"게임"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"기타 앱"</string>
     <string name="storage_files" msgid="8581083146777364063">"파일"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"저장용량 관리자: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"사용 안함"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"사용"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"게임"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"오디오 파일"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"음악"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>님의 경우 제거됨)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>님의 경우 사용 안함)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"자동완성 앱"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 62021a2..4b09a24 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -329,9 +329,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Жайгашкан жер"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Каттоо эсептери"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Коопсуздук жана экранды бөгөттөө"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлөө жана эсептик дайындар"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Жайгашкан жеримди, экрандын кулпусун ачуу ыкмасын, SIM карта кулпусун, аныктоо эстутумунун кулпусун коюу"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Жайгашкан жеримди, экран кулпусун ачууну, аныктоо эстутумунун кулпусун коюу"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Сырсөздөр"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Купуялык"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Администратор өчүрүп койгон"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Коопсуздук абалы"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Жайгашкан жер, манжа изи"</string>
@@ -1425,8 +1426,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Түзмөктүн экранын кулпулоо ыкмасындай"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Колдонмолорду башкаруу"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Орнотулган колдонмолорду өчүрүү жана башкаруу"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Колдонмо тууралуу"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Колдонмолорду башкарыңыз, тез чакырмаларды түзүңүз"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Колдонмонун тууралоолору"</string>
     <string name="install_applications" msgid="4872012136210802181">"Белгисиз булактар"</string>
@@ -1486,16 +1486,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Бош орунду башкаруу"</string>
     <string name="filter" msgid="2018011724373033887">"Чыпка"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Электөө опцияларын тандаңыз"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Бардыгы"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Токтотулган"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Бардык колдонмолор"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Өчүрүлгөн колдонмолор"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Жүктөлүп алынды"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Аткарылууда"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB сактагыч"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD картада"</string>
     <string name="disabled" msgid="9206776641295849915">"Өчүрүлгөн"</string>
     <string name="not_installed" msgid="2797554494953450291">"Бул колднууч үчн орнтулгн эмес"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Орнотулду"</string>
     <string name="no_applications" msgid="7336588977497084921">"Эч бир колдонмо жок."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Ички эстутум"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ички сактагыч"</string>
@@ -1673,8 +1672,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Киргизүү ыкмаларын тууралоо"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Жөндөөлөр"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Тууралоолор"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Жигердүү киргизүү ыкмалары"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Тутум тилдерин колдонуу"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> жөндөөлөрү"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Иштеген киргизме ыкмаларын тандаңыз"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Экрандагы баскычтоптун жөндөөлөрү"</string>
@@ -1718,7 +1715,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Экрандын чоңойтуусун авто жаңыртуу"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Колдонмо кубулган сайын, экрандын чоңойтуусун жаңыртуу"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Кубат баскычы чалууну бүтүрөт"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Сырсөздөрдү окуп берүү"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Чычкандын чоң көрсөткүчү"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Моно аудио"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Аудио ойнотулуп жатканда каналдар бириктирилсин"</string>
@@ -1832,7 +1828,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Акыркы толук кубатталгндн бери колдонңуз"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Экранды колдонуу"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Экран керектеген кубат"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Мобилдик тармак скандалууда"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Акыркы жолу толук кубатталгандан бери колд-дун колдонулушу"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Акыркы жолу толук кубатталгандан бери түзмөктүн колдонулушу"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Суурулгандан бери батареянын колдонулушу"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Баштапкы абалга келтирилгенден бери батареянын колдонулушу"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Батарея менен <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1922,8 +1922,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ашыкча эсептелген кубаттын пайдаланылышы"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s колдонулду"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"Батареянын %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Акыркы жолу толук кубатталгандан бери колдонулушун чагылдырган таблица"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Болжолдуу калган убакыт"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Толук кубатталышына чейин калган убакыт"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Колдонулганына жараша бул болжолдуу убакыт өзгөрүшү мүмкүн"</string>
     <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>
@@ -2315,6 +2317,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Өчүк"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Бул колдонмодо колдоого алынбайт"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Туташуу VPN аркылуу гана ишке ашырылсын"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN туташуусу талап кылынсынбы?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Тармакка бөгөт коюлду"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Тармактан бөгөт алынды"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Дайым туташып туруучу VPN профайл тандаңыз. Бул VPN\'ге кошулганда гана желе трафигине уруксат берилет."</string>
@@ -2400,8 +2403,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Чектелген профайлдар эсеп жарата алышпайт"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> бул түзмөктөн жок кылуу"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Кулпуланган экран жөндөөлөрү"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Кулпуланган экрандан колдонуучуларды кошуу"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Жаңы колдонуучу"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Жаңы профайл"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Өзүңүздү жок кылалыбы?"</string>
@@ -2429,7 +2431,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Чалуулар менен SMS иштетилсинби?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Чалуу жана SMS таржымалы бул колдонуучу менен бөлүшүлөт."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Шашылыш кырдаал жөнүндө маалымат"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> жөнүндө маалымат"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> жөнүндө маалымат жана байланыштар"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Колдонмолорго жана мазмунга уруксат"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Чектелген колдонмолор"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Колдонмонун тууралоолорун ачуу"</string>
@@ -2549,8 +2551,8 @@
       <item quantity="other">Жашырылган %d нерсе көрсөтүлсүн</item>
       <item quantity="one">Жашырылган %d нерсе көрсөтүлсүн</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Тармак жана Интернет"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, мобилдик дайындар, дайындарды өткөрүү, хотспот"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Тармак жана Интернет"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобилдик түзмөк, дайындарды өткөрүү, хотспот"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Туташкан түзмөктөр"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, тышкы экранга чыгаруу"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Колдонмолор жана эскертмелер"</string>
@@ -2566,7 +2568,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Натыйжалар"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, түйүн, туташуу"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS билдирүү, SMS жазышуу, билдирүүлөр, билдирүү жазышуу"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"уюлдук, уюл оператору, зымсыз, дайындар, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"уюлдук, мобилдик түзмөк, байланыш оператору, зымсыз, дайындар, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, чалуу, чалуу"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ишке киргизгич"</string>
     <string name="keywords_display" msgid="8910345814565493016">"экран, сенсордук экран"</string>
@@ -2642,8 +2644,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Айгай"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Дирилдөө"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Түзмөк күйгүзүлгөндөгү үндөр"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"\"Тынчымды алба\" функ-н жөнд-рү"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Артыкчылыктууга гана уруксат"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматтык эрежелер"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"\"Тынчымды алба\" режимин коюу"</string>
@@ -2660,9 +2661,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Демейки жумуш эскертмесинин обону"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Демейки ойготкуч рингтону"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Жеке профилдеги үндөргө окшош"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Үндөр алмаштырылсынбы?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Жеке профилдин үндөрү колдонулсунбу?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Алмаштыруу"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Учурдагы жумуш профилиңиздин үндөрү жеке профилиңиздин үндөрү менен алмаштырылат."</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Учурдагы жумуш профилиңиздин үндөрүнүн ордуна жеке профилиңиздин үндөрү колдонулат"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Рингтондор"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Башка үндөр жана дирилдөөлөр"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Эскертменин параметрлери"</string>
@@ -2898,11 +2899,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Эч уруксат берилген жок"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Эч уруксат суралган жок"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Бардк колдонмлр"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Иштетилген"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Орнотулган колдонмолор"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Ыкчам ачылуучу колдонмолор"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Жеке"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Жумуш"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Бөгөттөлгөн"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домен URL\'дери менен"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Өркүндөтүлгөн"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Колдонмолорду конфигурациялоо"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгисиз колдонмо"</string>
@@ -2927,8 +2928,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Жумуш үчүн демейки жөндөөлөр"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Көмөкчү жана үн менен киргизүү"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Көмөкчү колдонмо"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Эч бири"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Көмөкчү колдонмону тандаңыз"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> сиздин көмөкчү колдонмоңуз болсунбу?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Жардамчы тутумуңузда иштеп жаткан программалар, ошондой эле экраныңызда көрүнүп турган же колдонмодогу маалыматты окуй алат."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Макул"</string>
@@ -2958,6 +2957,8 @@
     <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">"Батареянн кубатн үнөмдөө"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Колдонуу эскертүүлөрү"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Бардык колдонмолорду көрсөтүү"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Кошумча колдонмолорду жашыруу"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Батарянн кубатн үнөмдшпйт"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Батарянын кубатын үнөмдөшпөйт"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Батареянын кубатын үнөмдөө иштетилген"</string>
@@ -3138,6 +3139,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Салкын температура түсү"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Салкыныраак дисплей түстөрүн колдонуңуз"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Түс өзгөртүүлөрүн күчүнө киргизүү үчүн, экранды өчүрүңүз"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor функциясын колдонуу үчүн түзмөктү өчүрүп-күйгүзүү керек"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматтык тутум жаңыртуулары"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (өчүрүп-күйгүзүү талап кылынат)"</string>
     <string name="usage" msgid="2977875522080448986">"Колдонулушу"</string>
@@ -3315,6 +3317,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Жардамчы жаңсоо"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3376,12 +3380,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глобалдык HTTP проксиси орнотулду"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Администратор түзмөктү кулпулап, сырсөздү баштапкы абалга келтире алат"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Администратор түзмөктүн бардык дайындарын жок кыла алат"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Сырсөздү <xliff:g id="COUNT_1">%d</xliff:g> жолу ката киргизгенден кийин түзмөктөгү бардык дайындар жок кылынат</item>
+      <item quantity="one">Сырсөздү <xliff:g id="COUNT_0">%d</xliff:g> жолу ката киргизгенден кийин түзмөктөгү бардык дайындар жок кылынат</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"Бул түзмөктү ишкана башкарат."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Бул түзмөк <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> тарабынан башкарылат."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Көбүрөөк маалымат"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Сүрөттөр жана видеолор"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музыка жана аудио"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Оюндар"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Башка колдонмолор"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлдар"</string>
@@ -3392,9 +3406,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Сактагычты көзөмөлдөгүч: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Өчүк"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Күйүк"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Оюндар"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио файлдар"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музыка"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> үчүн чыгарылып салынган)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> үчүн өчүрүлгөн)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Автотолтуруу колдонмосу"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 909e1bd..3ed8b69 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"ສະຖານທີ່"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ບັນຊີ"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Security &amp; screen lock"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ການເຂົ້າລະຫັດ ແລະ ຂໍ້ມູນການເຂົ້າສູ່ລະບົບ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ຕັ້ງທີ່ຢູ່ຂອງຂ້ອຍ, ໜ້າຈໍປົດລັອກ, ການລັອກຊິມກາດ, ການລັອກບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ກຳນົດທີ່ຢູ່ຂອງຂ້ອຍ, ການປົດລັອກໜ້າຈໍ, ການລັອກບ່ອນເຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"ລະ​ຫັດ​ຜ່ານ"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"ຄວາມເປັນສ່ວນຕົວ"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ່ເບິ່ງແຍງລະບົບ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ສະຖານະຄວາມປອດໄພ"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Location, fingerprint"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ໃຊ້ການລັອກແບບດຽວກັບອຸປະກອນ"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"ຈັດການແອັບຯ"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ຈັດການແລະລຶບແອັບຯທີ່ຕິດຕັ້ງແລ້ວ"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"ຂໍ້ມູນແອັບ"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"ຈັດການແອັບຯ, ຕັ້ງຄ່າທາງລັດຂອງການເປີດດ່ວນ"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"ການຕັ້ງຄ່າແອັບຯ"</string>
     <string name="install_applications" msgid="4872012136210802181">"ແຫຼ່ງຂໍ້ມູນທີ່ບໍ່ຮູ້ຈັກ"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"ຈັດການພື້ນທີ່"</string>
     <string name="filter" msgid="2018011724373033887">"ໂຕກັ່ນຕອງ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ເລືອກໂຕເລືອກການກັ່ນຕອງ"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"ທັງໝົດ"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"ປິດການນຳໃຊ້"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"ແອັບທັງໝົດ"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"ແອັບທີ່ຖືກປິດການນຳໃຊ້"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ດາວໂຫລດແລ້ວ"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ກຳລັງເຮັດວຽກ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"ໃນ SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"ປິດການນຳໃຊ້"</string>
     <string name="not_installed" msgid="2797554494953450291">"ບໍ່ໄດ້​ຕິດຕັ້ງ​ສຳລັບ​ຜູ່ໃຊ້ນີ້"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"ຕິດຕັ້ງແລ້ວ"</string>
     <string name="no_applications" msgid="7336588977497084921">"ບໍ່ມີແອັບຯ."</string>
     <string name="internal_storage" msgid="1584700623164275282">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນພາຍໃນ"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ບ່ອນເກັບຂໍ້ມູນພາຍໃນ"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"ຕັ້ງຄ່າວິທີການປ້ອນຂໍ້ມູນ"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"ການຕັ້ງຄ່າ"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"ການຕັ້ງຄ່າ"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"ວິທີປ້ອນຂໍ້ມູນທີ່ເຮັດວຽກຢູ່"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"ໃຊ້ພາສາຂອງລະບົບ"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"ການຕັ້ງຄ່າ <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"ເລືອກວິທີການປ້ອນຂໍ້ມູນທີ່ນຳໃຊ້"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ການຕັ້ງຄ່າແປ້ນພິມເທິງໜ້າຈໍ"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"ອັບເດດການຂະຫຍາຍໜ້າຈໍອັດຕະໂນມັດ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ອັບເດດການຂະຫຍາຍໜ້າຈໍເມື່ອປ່ຽນແອັບພລິເຄຊັນ"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ກົດປຸ່ມ ປິດ/ເປີດ ເພື່ອວາງສາຍ"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"ເວົ້າ​ລະ​ຫັດ​ຜ່ານ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"ຕົວຊີ້ເມົ້າຂະໜາດໃຫຍ່"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"ສຽງໂມໂນ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ຮວມຊ່ອງເມື່ອຫຼິ້ນສຽງ"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"​ໃຊ້​ຕັ້ງ​ແຕ່​ການ​ສາກ​ໄຟ​ເຕັມ​ເທື່ອ​ສຸດ​ທ້າຍ"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"ການໃຊ້ໜ້າຈໍ"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"ການໃຊ້ພະລັງງານໄປກັບໜ້າຈໍ"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"ການສະແກນເຄືອຂ່າຍມືຖື"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"ການນຳໃຊ້ແອັບນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"ການນຳໃຊ້ອຸປະກອນນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ການນຳໃຊ້ແບັດເຕີຣີຕັ້ງແຕ່ຖອດສາຍສາກ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ການໃຊ້ແບັດເຕີຣີນັບຈາກການຣີເຊັດ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"ໃຊ້ແບັດເຕີຣີມາ <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ການໃຊ້ພະລັງງານທີ່ຄິດໄລ່ເກີນ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"ໃຊ້ເປັນເວລາ %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ຂອງແບັດເຕີຣີໂດຍຮວມ"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"ແຍກສ່ວນການນຳໃຊ້ນັບຕັ້ງແຕ່ສາກຈົນເຕັມເທື່ອຫຼ້າສຸດ"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"ເວລາທີ່ເຫຼືອໂດຍປະມານ"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"ເວລາທີ່ໃຊ້ໃນການສາກໃຫ້ເຕັມ"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"ການປະມານອາດມີການປ່ຽນແປງໂດຍອ້າງອີງຈາກການນຳໃຊ້"</string>
     <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>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"ປິດການໃຊ້ເປີດຕະຫຼອດ"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ແອັບນີ້ບໍ່ຮອງຮັບ"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"ອະນຸຍາດສະເພາະການເຊື່ອມຕໍ່ຜ່ານ VPN ເທົ່ານັ້ນ"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"ຮ້ອງຂໍການເຊື່ອມຕໍ່ VPN ບໍ?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"ເປີດໃຊ້ການລັອກຢູ່"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"ບໍ່ໄດ້ເປີດໃຊ້ການລັອກຢູ່"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ເລືອກໂປຣໄຟລ໌ VPN ເພື່ອໃຫ້ເຊື່ອມຕໍ່ຕະຫຼອດເວລາ. ການຈະລາຈອນໃນເຄືອຂ່າຍ ຈະໄດ້ຮັບອະນຸຍາດສະເພາະເມື່ອເຊື່ອມຕໍ່ຜ່ານ VPN ນີ້ເທົ່ານັ້ນ."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"ໂປຣໄຟລ໌ທີ່ຖືກຈຳກັດຈະບໍ່ສາມາດເພີ່ມບັນຊີໄດ້"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"ລຶບ <xliff:g id="USER_NAME">%1$s</xliff:g> ອອກຈາກອຸປະກອນນີ້"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"ການ​ຕັ້ງ​ຄ່າ​ຫນ້າ​ຈໍລັອກ"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"ເພີ່ມຜູ້ໃຊ້ຈາກໜ້າຈໍລັອກ"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"ຜູ່ໃຊ້ໃໝ່"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"ໂປຣໄຟລ໌ໃໝ່"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"ລຶບໂຕທ່ານເອງ?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ເປີດ​ໂທ​ລະ​ສັບ &amp; SMS ບໍ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ປະ​ຫວັດ​ການ​ໂທ​ ແລະ ​ການ​ສົ່ງ SMS ຈະ​ຖືກ​ແບ່ງ​ປັນ​ໃຫ້​ກັບ​ຜູ້​ໃຊ້​ນີ້."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ຂໍ້ມູນສຸກເສີນ"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"ຂໍ້ມູນກ່ຽວກັບ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"ຂໍ້ມູນ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ສຳລັບ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ອະນຸຍາດແອັບຯ ແລະເນື້ອຫາ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ແອັບພລິເຄຊັນທີ່ມີຂໍ້ຈຳກັດ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ຂະຫຍາຍການຕັ້ງຄ່າສຳລັບແອັບພລິເຄຊັນ"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">ສະແດງ %d ລາຍການທີ່ເຊື່ອງໄວ້</item>
       <item quantity="one">ສະແດງ %d ລາຍການທີ່ເຊື່ອງໄວ້</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"ເຄືອຂ່າຍ ແລະ ອິນເຕີເນັດ"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, cellular, data usage, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"ເຄືອຂ່າຍ ແລະ ອິນເຕີເນັດ"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, ມືຖື, ການນຳໃຊ້ອິນເຕີເນັດ, ຮັອດສະປອດ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ອຸປະກອນທີ່ເຊື່ອມຕໍ່ແລ້ວ"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ແອັບ ແລະ ການແຈ້ງເຕືອນ"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"ຜົນ​ການ​ຊອກ​ຫາ"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, ການເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ຂໍ້ຄວາມອັກສອນ, ການສົ່ງຂໍ້ຄວາມ, ຂໍ້ຄວາມ, ການສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"ເຄືອຂ່າຍມືຖື, ຜູ້ໃຫ້ບໍລິການມືຖື, ໄຮ້ສາຍ, ຂໍ້ມູນ, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ເຄືອຂ່າຍມືຖື, ມືຖື, ຜູ້ໃຫ້ບໍລິການມືຖື, ໄຮ້ສາຍ, ຂໍ້ມູນ, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, ໂທ, ການໂທ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"​ລອນ​ເຊີ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ສຳຜັດ, ໜ້າຈໍສຳພັດ"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"​ແຈ້ງ​ເຕ​ືອນ"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ສັ່ນເຕືອນ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ສຽງຕອນເປີດເຄື່ອງ"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"ການຕັ້ງຄ່າຫ້າມລົບກວນ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ບຸ​ລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ​ທີ່​ອະ​ນຸ​ຍາດ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ກົດ​ລະ​ບຽບ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"ຕັ້ງກຳນົດເວລາຫ້າມລົບກວນ"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ສຽງກນແຈ້ງເຕືອນບ່ອນເຮັດວຽກ"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ຣິງໂທນປຸກບ່ອນເຮັດວຽກ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ຄືກັນກັບໂປຣໄຟລ໌ສ່ວນຕົວ"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"ແທນທີ່ສຽງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກບໍ?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ໃຊ້ສຽງໂປຣໄຟລ໌ສ່ວນຕົວ"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ແທນທີ່"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"ສຽງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານໃນປັດຈຸບັນຈະຖືກແທນທີ່ດ້ວຍສຽງໂປຣໄຟລ໌ສ່ວນຕົວຂອງທ່ານ"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"ສຽງໂປຣໄຟລ໌ສ່ວນຕົວຂອງທ່ານຈະຖືກໃຊ້ແທນສຽງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກປັດຈຸບັນ"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ຣິງໂທນ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Other sounds and vibrations"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"ການຕັ້ງຄ່າການແຈ້ງເຕືອນ"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ບໍ່ໄດ້ໃຫ້ການອະນຸຍາດໃດ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"ບໍ່ມີການຮ້ອງຂໍການອະນຸຍາດໃດ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ແອັບທັງໝົດ"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"ເປີດຳໃຊ້ງານ​ແລ້ວ"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ແອັບທີ່ຕິດຕັ້ງແລ້ວ"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ອິນສະແຕນແອັບ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"​ສ່ວນ​ໂຕ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ວຽກ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ບລັອກ​ແລ້ວ"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ກັບ URL ໂດ​ເມນ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"​ຂັ້ນ​ສູງ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ກຳນົດຄ່າແອັບ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ແອັບທີ່ບໍ່ຮູ້ຈັກ"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"ຄ່າເລີ່ມຕົ້ນສຳລັບບ່ອນເຮັດວຽກ"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"ການຊ່ວຍເຫຼືອ &amp; ການປ້ອນຂໍ້ມູນດ້ວຍສຽງ"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"ແອັບຜູ້ຊ່ວຍ"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"ບໍ່ມີ"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"ເລືອກແອັບຜູ້ຊ່ວຍ"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"ເຮັດ​ໃຫ້ <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ເປັນຜູ້ຊ່ວຍຂອງທ່ານບໍ​?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"ຕົວ​ຊ່ວຍ​ຈະ​ສາ​ມາດ​ອ່ານ​ຂໍ້​ມູນ​ກ່ຽວ​ກັບ​ແອັບ​ໃຊ້​ງານ​ຢູ່​ໃນ​ລະ​ບົບ​ຂອງ​ທ່ານ, ລວມ​ທັງ​ຂໍ້​ມູນ​ທີ່​ເຫັນ​ໄດ້​ຢູ່​ເທິງ​ໜ້າ​ຈໍ​ຂອງ​ທ່ານ ຫຼື ສາ​ມາດ​ເຂົ້າ​ຫາ​ໄດ້​ຢູ່​ພາຍ​ໃນ​ແອັບ."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"ເຫັນດີ"</string>
@@ -2959,6 +2958,8 @@
     <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">"ການປັບແບັດເຕີຣີໃຫ້ເໝາະສົມ"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"ສະແດງແອັບທັງໝົດ"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"ເຊື່ອງແອັບເພີ່ມເຕີມ"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ບໍ່ໄດ້ປັບໃຫ້ເໝາະສົມ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ບໍ່ໄດ້ປັບໃຫ້ເໝາະສົມ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ກຳລັງປັບການໃຊ້ແບັດເຕີຣີໃຫ້ເໝາະສົມ"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ອຸນຫະພູມສີເຢັນ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ໃຊ້ສີຈໍສະແດງຜົນທີ່ເຢັນກວ່າ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ເພື່ອນຳໃຊ້ການປ່ຽນສີ, ໃຫ້ປິດໜ້າຈໍ"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ເພື່ອນຳໃຊ້ການປ່ຽນແປງ Telephony Monitor, ໃຫ້ປິດແລ້ວເປີດອຸປະກອນຄືນໃໝ່"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ການອັບເດດລະບົບອັດຕະໂນມັດ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (ຕ້ອງປິດແລ້ວເປີດໃໝ່)"</string>
     <string name="usage" msgid="2977875522080448986">"ການໃຊ້"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"ທ່າທາງແບບຊ່ວຍ"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ຜູ້ເບິ່ງແຍງລະບົບສາມາດລັອກອຸປະກອນ ແລະ ຕັ້ງລະຫັດຜ່ານໃໝ່ໄດ້"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ຜູ້ເບິ່ງແຍງສາມາດລຶບຂໍ້ມູນອຸປະກອນທັງໝົດໄດ້"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">ຜູ້ເບິ່ງແຍງໄດ້ຕັ້ງໃຫ້ພະຍາຍາມໃສ່ລະຫັດຜ່ານໄດ້ສູງສຸດ <xliff:g id="COUNT_1">%d</xliff:g> ເທື່ອກ່ອນລຶບຂໍ້ມູນອຸປະກອນອອກ</item>
+      <item quantity="one">ຜູ້ເບິ່ງແຍງໄດ້ຕັ້ງໃຫ້ພະຍາຍາມໃສ່ລະຫັດຜ່ານໄດ້ສູງສຸດ <xliff:g id="COUNT_0">%d</xliff:g> ເທື່ອກ່ອນລຶບຂໍ້ມູນອຸປະກອນອອກ</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"ອຸປະກອນນີ້ຖືກຈັດການຢູ່"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ອຸປະກອນນີ້ຖືກຈັດການໂດຍ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ສຶກສາເພີ່ມເຕີມ"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ຮູບພາບ ແລະ ວິດີໂອ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Music &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ເກມ"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ແອັບຯອື່ນໆ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ໄຟລ໌"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ປິດ"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ເປີດ"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ເກມ"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ໄຟລ໌ສຽງ"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"ດົນຕີ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ຖືກຖອນການຕິດຕັ້ງສຳລັບຜູ້ໃຊ້ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ຖຶືກປິດໄວ້ສຳລັບຜູ້ໃຊ້ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ແອັບຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index df563b7..0a2edf9 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -334,9 +334,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Vietovė"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Paskyros"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Sauga ir ekrano užraktas"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifruotė ir prisijungimo duomenys"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, prisijungimo duomenų saugyklos užraktą"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nustatyti mano vietą, ekrano atrakinimą, įgaliojimų saugyklos užraktą"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Slaptažodžiai"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privatumas"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Išjungė administratorius"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Saugos būsena"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Vietovė, kontrolinis kodas"</string>
@@ -687,8 +688,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Pasirinkti „Wi-Fi“"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"„Wi-Fi“ įjungiama…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"„Wi-Fi“ išjungiama…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Žr. visus tinklus"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Klaida"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz juosta neprieinama šioje šalyje"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Veikia lėktuvo režimu"</string>
@@ -1281,12 +1281,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"„Bluetooth“ susiejimas"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Susiejimas"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Vieš. int. pr. tšk. ir įr. kaip modemo naud."</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Viešosios interneto prieigos taškas įjungtas, įrenginys naudojamas kaip modemas"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Viešosios interneto prieigos taškas įjungtas"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Įrenginio kaip modemo naudojimas"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Negalima naudoti įrenginio kaip modemo arba viešosios interneto prieigos taškų, kai įjungta Duomenų taupymo priemonė"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB susiejimas"</string>
@@ -1450,8 +1447,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Toks pats kaip įrenginio ekrano užraktas"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Valdyti programas"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Tvarkykite ir pašalinkite įdiegtas programas"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Programos informacija"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Valdyti programas, nustatyti greitojo paleidimo sparčiuosius klavišus"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Programos nustatymai"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nežinomi šaltiniai"</string>
@@ -1513,16 +1509,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Valdyti vietą"</string>
     <string name="filter" msgid="2018011724373033887">"Filtruoti"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Pasirinkti filtro parinktis"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Visi"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Neleidžiama"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Visos programos"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Išjungtos programos"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Atsisiųsta"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Vykdoma"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB atmintinė"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kortelėje"</string>
     <string name="disabled" msgid="9206776641295849915">"Neleidžiama"</string>
     <string name="not_installed" msgid="2797554494953450291">"Neįdiegta šiam naudotojui"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Įdiegta"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nėra programų"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Vidinė atmint."</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"vidinė atmintis"</string>
@@ -1700,8 +1695,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Nustatykite įvesties metodus"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Nustatymai"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Nustatymai"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktyvūs įvesties metodai"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Sistemos kalbų naudojimas"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> nustatymai"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Pasirink. aktyvius įvesties metodus"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekraninės klaviatūros nustatymai"</string>
@@ -1745,7 +1738,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automat. atnaujinti ekrano didinimą"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atnaujinti ekrano didinimą perkeliant programas"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Maitinimo mygt. baig. skamb."</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Sakyti slaptažodžius"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Didelis pelės žymeklis"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monofoninis garsas"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Sujungti kanalus leidžiant garsą"</string>
@@ -1871,7 +1863,11 @@
     <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">"Liko: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Liko įkrauti: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Naudoti nuo paskutinio visiško įkrovimo"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Ekrano naudojimas"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrano suvartojama energija"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobiliojo ryšio tinklo nuskaitymas"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Programų naudojimas po paskutinio visiško įkrovimo"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Įrenginio naudojimas po paskutinio visiško įkrovimo"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumuliatoriaus naudojimas po to, kai buvo ištrauktas iš lizdo"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akumuliatoriaus naudojimas po nustatymo iš naujo"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> akumuliatoriaus"</string>
@@ -1961,11 +1957,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Per daug apskaičiuotos energijos naudojimas"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Naudota %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s visos akumuliatoriaus įkrovos"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Naudojimo nuo paskutinio visiško įkrovimo analizė"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Liko laiko (numatyta)"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Laikas iki visiškos įkrovos"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Numatymas gali pasikeisti atsižvelgiant į naudojimą"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> po to, kai buvo ištrauktas iš lizdo"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kai paskutinį kartą buvo ištrauktas iš lizdo <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Visas naudojimas"</string>
@@ -2356,6 +2352,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Režimas „Visada įjungta“ neaktyvus"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nepalaikoma šioje programoje"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Leisti ryšius tik per VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Būtinas VPN ryšys?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Užrakinimas aktyvus"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Užrakinimas neaktyvus"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pasirinkite VPN profilį, kad visada būtumėte prisijungę. Tinklo srautas bus leidžiamas tik prisijungus prie šio VPN."</string>
@@ -2449,8 +2446,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Apribotuose profiliuose negalima pridėti paskyrų"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Ištrinti <xliff:g id="USER_NAME">%1$s</xliff:g> iš šio įr."</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Užrakinimo ekrano nustatymai"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Pridėti naudotojų iš užrakinimo ekrano"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Naujas naudotojas"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Naujas profilis"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Ištrinti save?"</string>
@@ -2478,7 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Įjungti telefono skambučius ir SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Skambučių ir SMS istorija bus bendrinama su šiuo naudotoju."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Kritinės padėties informacija"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informacija apie <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> informacija ir kontaktai"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Leisti programas ir turinį"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programos su apribojimais"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Išplėsti programos nustatymus"</string>
@@ -2600,8 +2596,8 @@
       <item quantity="many">Rodyti %d paslėpto elemento</item>
       <item quantity="other">Rodyti %d paslėptų elementų</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Tinkas ir internetas"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"„Wi-Fi“, mobilusis ryšys, duomenų naudojimas, viešosios interneto prieigos taškas"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Tinkas ir internetas"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"„Wi-Fi“, mobilusis, duomenų naudojimas, viešosios interneto prieigos taškas"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Prijungti įrenginiai"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"„Bluetooth“, ALR, perdavimas"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programos ir pranešimai"</string>
@@ -2609,8 +2605,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Naudotojas ir paskyros"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Numatytosios programos"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Kalbos, atsarginė kopija, naujiniai, apie telefoną"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Kalbos, atsarginė kopija, naujiniai, apie įrenginį"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nustatymai"</string>
     <string name="search_menu" msgid="6283419262313758339">"Paieškos nustatymai"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Paieškos nustatymai"</string>
@@ -2618,7 +2613,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Rezultatai"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"„Wi-Fi“, tinklo ryšys"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"teksto pranešimas, teksto pranešimų siuntimas, pranešimai, susirašinėjimas"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobilusis, mobiliojo ryšio operatorius, belaidis ryšys, duomenys, 4G, 3G, 2G, LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilusis, mobiliojo ryšio operatorius, belaidis, duomenys, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"„Wi-Fi“, skambinti, skambinama"</string>
     <string name="keywords_home" msgid="3626170808219458848">"paleidimo priemonė"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekranas, jutiklinis ekranas"</string>
@@ -2694,8 +2689,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Įspėjimas"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibravimas"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Įjungti garsus"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Netrukdymo režimo nuostatos"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tik pagal prioritetą"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatinės taisyklės"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Nust. netrukd. režimo tvarkar."</string>
@@ -2712,9 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Numatyt. darbo pranešimų tonas"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Numat. darbo sign. skamb. ton."</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Tokie pat kaip asmeninio profilio"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Pakeisti darbo profil. garsus?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Naudoti asmeninio profilio garsus?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Pakeisti"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Dabartiniai darbo profilio garsai bus pakeisti asmeninio profilio garsais"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Asmeninio profilio garsai bus naudojami vietoj dabartinių darbo profilio garsų"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Skambėjimo tonai"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Kiti garsai ir vibravimas"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Pranešimų nuostatos"</string>
@@ -2962,11 +2956,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nėra suteiktų leidimų"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nėra užklausų dėl leidimų"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Visos programos"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Įgalintos"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Įdiegtos programos"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Akimirksniu įkeliamos programėlės"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Asmeninės"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Darbas"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Užblokuota"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Su domeno URL"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Išplėstiniai"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Programų konfigūravimas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nežinoma programa"</string>
@@ -2993,8 +2987,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Numatytieji darbui"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Pagalb. progr. ir įvest. balsu"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Pagalbinė programa"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Nėra"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Pagalbinės programos pasirinkimas"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Padaryti „<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>“ pagalbine programa?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Pagalbinė programa galės skaityti informaciją apie sistemoje naudojamas programas, įskaitant ekrane matomą ar programose pasiekiamą informaciją."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Sutinku"</string>
@@ -3024,6 +3016,8 @@
     <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">"Akumuliatoriaus optimiz."</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Naudojimo įspėjimai"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Rodyti visas programas"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Slėpti papildomas programas"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimizuota"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimizuota"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizuojamas akumuliatoriaus naudojimas"</string>
@@ -3210,6 +3204,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Šaltų spalvų temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Naudoti šaltesnes ekrano spalvas"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Kad pritaikytumėte spalvos pakeitimą, išjunkite ekraną"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Kad pritaikytumėte telefonijos stebėjimo priemonės pakeitimą, paleiskite įrenginį iš naujo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiniai sistemos naujiniai"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Susaistyti HAL (reikia paleisti iš naujo)"</string>
     <string name="usage" msgid="2977875522080448986">"Naudojimas"</string>
@@ -3395,6 +3390,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Jei norite patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu telefono užpakalinėje dalyje."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Jei norite greitai patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu planšetinio kompiuterio užpakalinėje dalyje."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Jei norite patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu įrenginio užpakalinėje dalyje."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Pagalbinis gestas"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Įjungta"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Išjungta"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Paleidyklė jau atrakinta"</string>
@@ -3468,12 +3465,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Nustatytas visuotinis HTTP tarpinis serveris"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratorius gali užrakinti įrenginį ir iš naujo nustatyti slaptažodį"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratorius gali ištrinti visus įrenginio duomenis"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui visi įrenginio duomenys bus ištrinti</item>
+      <item quantity="few">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui visi įrenginio duomenys bus ištrinti</item>
+      <item quantity="many">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui visi įrenginio duomenys bus ištrinti</item>
+      <item quantity="other">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui visi įrenginio duomenys bus ištrinti</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui darbo profilio duomenys bus ištrinti</item>
+      <item quantity="few">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui darbo profilio duomenys bus ištrinti</item>
+      <item quantity="many">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui darbo profilio duomenys bus ištrinti</item>
+      <item quantity="other">Administratorius nustatė didžiausią leistiną bandymų įvesti slaptažodį skaičių – <xliff:g id="COUNT_1">%d</xliff:g>. Paskui darbo profilio duomenys bus ištrinti</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Šis įrenginys tvarkomas."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Šį įrenginį tvarko „<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>“."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Sužinoti daugiau"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Nuotraukos ir vaizdo įrašai"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzika ir garso įrašai"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Žaidimai"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Kitos programos"</string>
     <string name="storage_files" msgid="8581083146777364063">"Failai"</string>
@@ -3484,9 +3495,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Saugyklos tvarkytuvė: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Išjungta"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Įjungta"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Žaidimai"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Garso failai"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(pašalinta naudotojui <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(išjungta naudotojui <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Automatinio pildymo programa"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 69acb3d..7449052 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -332,9 +332,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Atrašanās vieta"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Drošība un ekrāna bloķēšana"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrēšana un akreditācijas dati"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Manas atrašanās vietas, ekrāna atbloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Paroles"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Konfidencialitāte"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Atspējojis administrators"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Drošības statuss"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Atrašanās vieta, pirksta nospiedums"</string>
@@ -678,8 +679,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Atlasīt Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Notiek Wi-Fi ieslēgšana..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Notiek Wi-Fi izslēgšana..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Skatīt visus tīklus"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Kļūda"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz josla nav pieejama šajā valstī."</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Lidmašīnas režīmā"</string>
@@ -1271,12 +1271,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth saistīšana"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Saistīšana"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Tīklājs un piesaiste"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Tīklājs ir ieslēgts, piesaiste ir aktīva"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Tīklājs ir ieslēgts"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Piesaiste"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kamēr ir ieslēgts datu lietojuma samazinātājs, nevar veikt piesaisti vai izmantot pārnēsājamus tīklājus"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB piesaiste"</string>
@@ -1440,8 +1437,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Tāds pats kā ierīces bloķēšanas režīms"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pārvaldīt lietotnes"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pārvaldiet un noņemiet instalētās lietotnes"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informācija par lietotni"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Pārvaldīt lietotnes, iestatīt ātrās palaišanas saīsnes"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Lietotnes iestatījumi"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nezināmi avoti"</string>
@@ -1502,16 +1498,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Vietas pārvaldība"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrs"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Izvēlēties filtra opcijas"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Visas"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Atspējota"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Visas lietotnes"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Atspējotās lietotnes"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Lejupielādēts"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Darbojas"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB krātuve"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartē"</string>
     <string name="disabled" msgid="9206776641295849915">"Atspējots"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nav instalēta šim lietotājam"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instalēta"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nav lietotņu"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Iekšējā krātuve"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"iekšējā atmiņa"</string>
@@ -1689,8 +1684,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Ievades metožu iestatīšana"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Iestatījumi"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Iestatījumi"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktīvās ievades metodes"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Sistēmas valodu izmantošana"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> iestatījumi"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Aktivizēto ievades metožu izvēle"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekrāntastatūras iestatījumi"</string>
@@ -1734,7 +1727,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekrāna palielinājuma autom. atjaun."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atjaunināt ekrāna palielinājumu lietotņu pārejās"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Barošanas poga beidz zvanu"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Paroļu izrunāšana"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Liela rādītāja ikona"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono audio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Apvienot kanālus, atskaņojot audio"</string>
@@ -1854,7 +1846,11 @@
     <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">"Vēl <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Atlikušais uzlādes laiks: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Lietojums kopš pēdējās pilnās uzlādes"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Ekrāna lietojums"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrāna lietojuma patēriņš"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobilo tīklu meklēšana"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Lietotnes lietojums kopš pēdējās pilnās uzlādes"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Ierīces lietojums kopš pēdējās pilnās uzlādes"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumulatora lietojums kopš atslēgšanas"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akumulatora patēriņš kopš atiestatīšanas"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g>, izmantojot akumulatoru"</string>
@@ -1944,11 +1940,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Par daudz uzskaitītais enerģijas patēriņš"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Izmantots: %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s no vispārējā akumulatora lietojuma"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Lietojuma sadalījums kopš pēdējās pilnās uzlādes"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Plānotais atlikušais laiks"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Atlikušais laiks līdz pilnai uzlādei"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Aprēķini var mainīties atkarībā no lietojuma"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kopš atslēgšanas"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Pēdējās atslēgšanas laikā <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kopējais patēriņš"</string>
@@ -2339,6 +2335,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Opcija “Vienmēr ieslēgts” ir neaktīva"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Šajā lietotnē netiek atbalstīts"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Atļauja izveidot savienojumus, tikai izmantojot VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Vai nepieciešams VPN savienojums?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Noslēgšana ir aktīva"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Noslēgšana nav aktīva"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Izvēlieties VPN profilu, ar kuru izveidot pastāvīgu savienojumu. Tīkla datplūsma tiks atļauta, tikai esot izveidotam savienojumam ar šo VPN."</string>
@@ -2428,8 +2425,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ierobežoti profili nevar pievienot kontus."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Dzēst šajā ierīcē: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Bloķēšanas ekrāna iestatījumi"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Pievienot lietotājus no bloķēšanas ekrāna"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Jauns lietotājs"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Jauns profils"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vai dzēst jūsu kontu?"</string>
@@ -2457,7 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vai ieslēgt tālruņa zvanus un īsziņas?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Ar šo lietotāju tiks kopīgota zvanu un īsziņu vēsture."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Ārkārtas informācija"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informācija par lietotāju <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>: informācija un kontaktpersonas"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Lietotņu un satura atļaušana"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Lietojumprogrammas ar ierobežojumiem"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Izvērst lietojumprogr. iestat."</string>
@@ -2578,8 +2574,8 @@
       <item quantity="one">Rādīt %d slēptu vienumu</item>
       <item quantity="other">Rādīt %d slēptus vienumus</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Tīkls un internets"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobilie dati, datu lietojums, tīklājs"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Tīkls un internets"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilie dati, datu lietojums, tīklājs"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pievienotās ierīces"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Lietotnes un paziņojumi"</string>
@@ -2587,8 +2583,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Lietotāji un konti"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Noklusējuma lietotnes"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Valodas, dublēšana, atjauninājumi, tālruņa informācija"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Valodas, dublēšana, atajuninājumi, ierīces informācija"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Iestatījumi"</string>
     <string name="search_menu" msgid="6283419262313758339">"Meklēšanas iestatījumi"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Meklēšanas iestatījumi"</string>
@@ -2596,7 +2591,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Rezultāti"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, Wi-Fi, tīkla savienojums"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"īsziņa, sūtīt īsziņu, ziņas, ziņojumapmaiņa"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobilais, mobilais operators, bezvadu, dati, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilais, mobilo sakaru operators, bezvadu, dati, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, zvans, zvanīšana"</string>
     <string name="keywords_home" msgid="3626170808219458848">"palaišanas programma"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekrāns, skārienekrāns"</string>
@@ -2672,8 +2667,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Brīdinājums"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrozvans"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Ieslēgšanas skaņas"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Režīma “Netraucēt” preferences"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tikai prioritārie"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Autom. kārtulas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Iestatīt “Netraucēt” grafiku"</string>
@@ -2690,9 +2684,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Noklusējuma paziņojumu signāls"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Noklusējuma trauksmes signāls"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Tādi paši signāli kā personiskajā profilā"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Aizstāt darba profila signālus?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Vai lietot personiskā profila signālus?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Aizstāt"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Jūsu pašreizējā darba profila signāli tiks aizstāti ar jūsu personiskā profila signāliem."</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Jūsu pašreizējā darba profila signālu vietā tiks lietoti jūsu personiskā profila signāli."</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Zvana signāli"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Citas skaņas un vibrācija"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Paziņojumu preferences"</string>
@@ -2934,11 +2928,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nav piešķirta neviena atļauja."</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nav pieprasīta neviena atļauja."</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Visas lietotnes"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Iespējotās"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Instalētās lietotnes"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Tūlītējās lietotnes"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Privātās"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Darba"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloķētie"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Ar domēnu URL"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Papildu"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Lietotņu konfigurēšana"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nezināma lietotne"</string>
@@ -2964,8 +2958,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Noklusējuma iestatījums darbam"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Palīgs un balss ievade"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Palīga lietotne"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Nav"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Palīga lietotnes atlase"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Vai iestatīt lietotni <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> kā palīgu?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Palīgs varēs nolasīt informāciju par jūsu sistēmā izmantotajām lietotnēm, tostarp jūsu ekrānā redzamo informāciju vai lietotnēs pieejamo informāciju."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Piekrītu"</string>
@@ -2995,6 +2987,8 @@
     <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">"Akumulatora optimizācija"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Brīdinājumi par lietojumu"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Rādīt visas lietotnes"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Paslēpt papildu lietotnes"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Netiek optimizēts"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Netiek optimizēts"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akumulatora darbība tiek optimizēta"</string>
@@ -3177,6 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Vēsu krāsu temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Izmantot vēsākas krāsas"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Lai mainītu krāsas, izslēdziet ekrānu"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Lai lietotu telefonijas pārrauga izmaiņas, atkārtoti palaidiet ierīci."</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automātiski sistēmas atjauninājumi"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL sasaistīšana (nepieciešama atkārtota palaišana)"</string>
     <string name="usage" msgid="2977875522080448986">"Lietojums"</string>
@@ -3358,6 +3353,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru tālruņa aizmugurē."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru planšetdatora aizmugurē."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru ierīces aizmugurē."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Palīga žests"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Ieslēgti"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Izslēgti"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Palaišanas ielādētājs jau ir atbloķēts"</string>
@@ -3425,12 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ir iestatīts globālais HTTP starpniekserveris"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrators var bloķēt ierīci un atiestatīt paroli"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrators var dzēst visus ierīces datus"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="zero">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizes. Pēc tam tiks dzēsti visi ierīces dati.</item>
+      <item quantity="one">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizi. Pēc tam tiks dzēsti visi ierīces dati.</item>
+      <item quantity="other">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizi. Pēc tam tiks dzēsti visi ierīces dati.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="zero">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizes. Pēc tam tiks dzēsti darba profila dati.</item>
+      <item quantity="one">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizi. Pēc tam tiks dzēsti darba profila dati.</item>
+      <item quantity="other">Administrators ir iestatījis, ka paroli drīkst mēģināt ievadīt ne vairāk kā <xliff:g id="COUNT_1">%d</xliff:g> reizes. Pēc tam tiks dzēsti darba profila dati.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Šī ierīce tiek pārvaldīta."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Šo ierīci pārvalda <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Uzzināt vairāk"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotoattēli un videoklipi"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Mūzika un audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Spēles"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Citas lietotnes"</string>
     <string name="storage_files" msgid="8581083146777364063">"Faili"</string>
@@ -3441,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Krātuves pārvaldnieks: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Izslēgts"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ieslēgts"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Spēles"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio faili"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Mūzika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(atinstalēts lietotājam <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(atspējots lietotājam <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Automātiskās aizpildes lietotne"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index c137db0..35d3e9b 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Сметки"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Безбедност и заклучување екран"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрирање и акредитиви"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Постави „Моја локација“, отклучување на екран, заклучување на СИМ картичка, заклучување на меморија со акредитиви"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Постави „Моја локација“, отклучување на екран, заклучување на меморија за акредитиви"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Лозинки"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Приватност"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Оневозможено од администраторот"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Безбедносен статус"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Локација, отпечаток"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Исто како заклучувањето екран на уредот"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управувај со апликации"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управувај и отстрани инсталирани апликации"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Информации за апликација"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Управувај со апликации, постави кратенки за брзо стартување"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Поставки на апликација"</string>
     <string name="install_applications" msgid="4872012136210802181">"Непознати извори"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Управувај со простор"</string>
     <string name="filter" msgid="2018011724373033887">"Филтер"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Избери опции на филтер"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Сѐ"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Оневозможено"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Сите апликации"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Оневозможени апликации"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Преземени"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Активни"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"УСБ меморија"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На СД картичка"</string>
     <string name="disabled" msgid="9206776641295849915">"Оневозможено"</string>
     <string name="not_installed" msgid="2797554494953450291">"Не е инсталирано за корисникот"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Инсталирано"</string>
     <string name="no_applications" msgid="7336588977497084921">"Нема апликации."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Внатрешна меморија"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"внатрешна меморија"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Постави методи на внес"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Поставки"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Поставки"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Методи за активно внесување"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Користете ги системските јазици"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Поставки на <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Избери методи за активно внесување"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Поставки на тастатура на екран"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Автоматско ажурирање на зголемување на екран"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ажурирај зголемување екран при премини меѓу аплик."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Копче за прекин на телефонски повик"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Изговарај лозинки"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Голем покажувач на глувчето"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Моно аудио"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Комбинирај канали кога се пушта аудио"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Се користи од последн. потполно полнење"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Користење на екранот"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Потрошувачка на екранот"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилна мрежа"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Користење на апликацијата од последното целосно полнење"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Користење на уредот од последното целосно полнење"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Употреба на батеријата од исклучување"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Употреба на батеријата од ресетирање"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> на батерија"</string>
@@ -1923,9 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Надмината употреба на напојување"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Користена е %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s од целокупната батерија"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Детали за користењето од последното целосно полнење"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Проценето преостанато време"</string>
-    <string name="estimated_time_description" msgid="6722669204902760489">"Проценка може да се промени врз основа на употребата"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Време до целосно полнење"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Проценката може да се промени врз основа на употребата"</string>
     <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>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Секогаш-вклучена е неактивна"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Не е поддржано од оваа апликација"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Дозволи само врски преку VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Задолжително поврзување преку VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Заклучувањето е активно"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Заклучувањето е неактивно"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Избери VPN профил што секогаш ќе биде поврзан на мрежата, сообраќајот ќе биде дозволен само кога е поврзан со оваа VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ограничените профили не можат да додаваат сметки"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Избриши го <xliff:g id="USER_NAME">%1$s</xliff:g> од тука"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Поставки на екранот за заклучување"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Додајте корисници од заклучен екран"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Нов корисник"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Нов профил"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Избриши се себеси?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Вклучи телефонски повици и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Историјата на повици и пораки ќе се сподели со овој корисник."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Информации за итни случаи"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Информации за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Информации и контакти за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволи апликации и содржина"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликации со ограничувања"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подесувања за апликација"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="one">Прикажи %d сокриена ставка</item>
       <item quantity="other">Прикажи %d сокриени ставки</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Мрежа и интернет"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, мобилен интернет, потрошен сообраќај, точка на пристап"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и Интернет"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобилен, потрошен сообраќај, точка на пристап"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Поврзани уреди"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Апликации и известувања"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Резултати"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, мрежно поврзување"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"текстуална порака, испраќање текстуални пораки, пораки, испраќање пораки"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"мобилен, мобилен оператор, безжичен, податоци, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"мобилна мрежа, мобилен, мобилен оператор, безжичен, податоци, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, повикај, повикување"</string>
     <string name="keywords_home" msgid="3626170808219458848">"стартер"</string>
     <string name="keywords_display" msgid="8910345814565493016">"екран, екран на допир"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Предупредување"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибрации"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Вклучете ги звуците"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Поставки за „Не вознемирувај“"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозволува само приоритетно"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматски правила"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Распоред за Не вознемирувај"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Станд. тон за раб. известувања"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Станд. мелодија за раб. аларм"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Исти како на личниот профил"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Заменете звуци на раб. профил?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Да се користат звуци од личниот профил?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Замени"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Тековните звуци на работниот профил ќе бидат заменети со звуците од личниот профил"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Ќе се користат звуците од личниот профил наместо тековните звуци од работниот профил"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Мелодии"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Други звуци и вибрации"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Поставки за известувањата"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Не се доделени дозволи"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Не се побарани дозволи"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Сите апликации"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Овозможени"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Инсталирани апликации"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Инстант апликации"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Лични"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Службени"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блокирани"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Со УРЛ-домени"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Напредни"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Конфигурирање апликации"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Стандардно за работа"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Помош и гласовен запис"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Апликација за помош"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ништо"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Изберете апликација за помош"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Направете <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> да ви биде помошник?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Помошникот ќе може да чита информации за апликациите што се во употреба на системот, вклучувајќи информации што се видливи на екранот или достапни во апликациите."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Се согласувам"</string>
@@ -2959,6 +2958,8 @@
     <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">"Оптимизација на батерија"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Предупредувања за батеријата"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Прикажи ги сите апликации"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Сокриј дополнителни апликации"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Не се оптимизирани"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не е оптимизирано"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Се оптимизира користењето на батеријата"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ладна боја за температура"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи поладни бои на екранот"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"За да се примени промената на бојата, исклучете го екранот"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"За да се примени промената на мониторот за телефонија, рестартирајте го уредот"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматски ажурирања на системот"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Споени слоеви за апстракција на хардвер (бара рестартирање)"</string>
     <string name="usage" msgid="2977875522080448986">"Користење"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Движење за помош"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Поставен е глобален HTTP прокси"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Администраторот може да го заклучи уредот и да ја ресетира лозинката"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Администраторот може да ги избрише сите податоци на уредот"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <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="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"Со уредов се управува."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> управува со уредов."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Дознајте повеќе"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Фотографии и видеа"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музика и аудио"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Игри"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Други апликации"</string>
     <string name="storage_files" msgid="8581083146777364063">"Датотеки"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"„Управник со меморија“: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Исклучен"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Вклучен"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Игри"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио датотеки"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музика"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(деинсталирано за корисникот <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(оневозможено за корисникот <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Апликација за автоматско пополнување"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 150e6cf..f0cf6ae 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"ലൊക്കേഷൻ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"അക്കൗണ്ടുകൾ"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"സുരക്ഷ, സ്‌ക്രീൻ ലോക്ക്"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"എൻക്രിപ്‌ഷനും ക്രെഡന്‍ഷ്യലുകളും"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, സിം കാർഡ് ലോക്ക്, ക്രഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, ക്രെഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"പാ‌സ്‌വേഡുകൾ"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"സ്വകാര്യത"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"അഡ്‌മിനിസ്ട്രേറ്റർ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="security_status_title" msgid="5848766673665944640">"സുരക്ഷാ നില"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"ലൊക്കേഷൻ, ഫിംഗർപ്രിന്റ്"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"വൈഫൈ തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"വൈഫൈ ഓണാക്കുന്നു…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"വൈഫൈ ഓഫാക്കുന്നു…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"എല്ലാ നെറ്റ്‍വര്‍ക്കുകളും കാണുക"</string>
     <string name="wifi_error" msgid="3207971103917128179">"പിശക്"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"ഈ രാജ്യത്ത് 5 GHz ബാൻഡ് ലഭ്യമല്ല"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"വിമാന മോഡിലാണ്"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ബ്ലൂടൂത്ത് ടെതറിംഗ്"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ടെതറിംഗ്"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"ഹോട്ട്‌സ്പോട്ടും ‌ടെതറിംഗും"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ഹോട്ട്‌സ്‌പോട്ട് ഓണാണ്, ടെതർ ചെയ്യുന്നു"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ഹോട്ട്‌സ്‌പോട്ട് ഓണാണ്"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ടെതറിംഗ്"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ഡാറ്റ സേവർ ഓണായിരിക്കുന്ന സമയത്ത് പോർട്ടബിൾ ഹോട്ട്സ്പോട്ടുകൾ ടെതർ ചെയ്യാനോ ഉപയോഗിക്കാനോ കഴിയില്ല"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ടെതറിംഗ്"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ഉപകരണ സ്‌ക്രീൻ ലോക്കിന് സമാനം"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"അപ്ലിക്കേഷനുകൾ നിയന്ത്രിക്കുക"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ഇൻസ്റ്റാൾ ചെയ്‌ത അപ്ലിക്കേഷനുകൾ നിയന്ത്രിക്കുക, നീക്കംചെയ്യുക"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"ആപ്പ് വിവരം"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"അപ്ലിക്കേഷനുകൾ നിയന്ത്രിക്കുക, ദ്രുത സമാരംഭ കുറുക്കുവഴികൾ സജ്ജീകരിക്കുക"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങൾ"</string>
     <string name="install_applications" msgid="4872012136210802181">"അജ്ഞാത ഉറവിടങ്ങൾ"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"സ്‌പെയ്സ് നിയന്ത്രിക്കുക"</string>
     <string name="filter" msgid="2018011724373033887">"ഫിൽട്ടർ ചെയ്യുക"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ഫിൽട്ടർ ഓപ്ഷനുകൾ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"എല്ലാം"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"പ്രവർത്തനരഹിതമാക്കി"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"എല്ലാ ആപ്പുകളും"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"പ്രവർത്തനരഹിതമാക്കിയ ആപ്പുകൾ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ഡൗൺലോഡുചെയ്തു"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"പ്രവര്‍ത്തിക്കുന്നു"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB സ്റ്റോറേജ്"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD കാർഡിൽ"</string>
     <string name="disabled" msgid="9206776641295849915">"പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="not_installed" msgid="2797554494953450291">"ഈ ഉപയോക്താവിനായി ഇൻസ്‌റ്റാളുചെയ്‌തിട്ടില്ല"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"ഇന്‍‌സ്റ്റാളുചെയ്‌തു"</string>
     <string name="no_applications" msgid="7336588977497084921">"ആപ്സൊന്നുമില്ല."</string>
     <string name="internal_storage" msgid="1584700623164275282">"ആന്തരിക സ്റ്റോറേജ്"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ആന്തരിക സ്റ്റോറേജ്"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"ടൈപ്പുചെയ്യൽ രീതികൾ സജ്ജീകരിക്കുക"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"ക്രമീകരണം"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"ക്രമീകരണം"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"സജീവ ടൈപ്പുചെയ്യൽ രീതികൾ"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"സിസ്റ്റം ഭാഷകൾ ഉപയോഗിക്കുക"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ക്രമീകരണം"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"സജീവ ടൈപ്പുചെയ്യൽ രീതികൾ തിരഞ്ഞെടുക്കുക"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ഓൺ സ്ക്രീൻ കീബോർഡ് ക്രമീകരണങ്ങൾ"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"സ്‌ക്രീൻ മാഗ്‌നിഫിക്കേഷൻ സ്വയമേവ അപ്‌ഡേറ്റുചെയ്യുക"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"അപ്ലിക്കേഷൻ സംക്രമണങ്ങളിൽ സ്‌ക്രീൻ മാഗ്‌നിഫിക്കേഷൻ അപ്‌ഡേറ്റുചെയ്യുക"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"പവർബട്ടൺ കോൾ നിർത്തുന്നു"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"പാസ്‌വേഡുകൾ പറയുക"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"വലിയ മൗസ് പോയിന്റർ"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"മോണോ ഓഡിയോ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ഓഡിയോ പ്ലേ ചെയ്യുമ്പോൾ ചാനലുകൾ സംയോജിപ്പിക്കുക"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"പൂർണ്ണമായും ചാർജായ ശേഷമുള്ള ഉപയോഗം"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"സ്‌ക്രീൻ ഉപയോഗം"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"സ്‌ക്രീൻ ഉപഭോഗം"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"മൊബൈൽ നെറ്റ്‌വർക്ക് സ്‌കാൻ ചെയ്യൽ"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"അവസാനത്തെ പൂർണ്ണ ചാർജ്ജിംഗിനു‌ ശേഷമുള്ള ആപ്പിന്റെ ഉപഭോഗം"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"ഉപകരണത്തിന്റെ അവസാനത്തെ പൂർണ്ണ ചാർജ്ജിംഗിനു‌ ശേഷമുള്ള ഉപഭോഗം"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"അൺപ്ലഗ്ഗുചെയ്‌തതിനുശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"പുനഃസജ്ജമാക്കിയതിന് ശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"ബാറ്ററിയിൽ <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"കണക്കാക്കിയ പവർ ഉപയോഗം"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s ഉപയോഗിച്ചു"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"മൊത്തം ബാറ്ററിയുടെ %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"അവസാന സമ്പൂർണ്ണ ‌ചാർജ്ജിംഗിന് ‌ശേഷമുള്ള ഉപയോഗത്തിന്റെ വിശദാംശങ്ങൾ"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"അവശേഷിക്കുന്ന ഏകദേശ സമയം"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"മുഴുവൻ ചാർജ്ജാവാൻ വേണ്ട ‌സമയം"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"ഉപയോഗത്തിന് അനുസൃതമായി അനുമാനം മാറാം"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\'എല്ലായ്പ്പോഴും-ഓൺ\' നിർജീവമാണ്"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ഈ ആപ്പ് പിന്തുണയ്ക്കുന്നില്ല"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"VPN വഴിയുള്ള കണക്ഷനുകൾ മാത്രം അനുവദിക്കുക"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN കണക്ഷൻ ആവശ്യമാണോ?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"ലോക്ക്‌ഡൗൺ സജീവമാണ്"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"ലോക്ക്‌ഡൗൺ നിർജീവമാണ്"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"എല്ലായ്‌പ്പോഴും കണക്റ്റുചെയ്‌തതായി തുടരുന്ന ഒരു VPN പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക. ഈ VPN-ലേക്ക് കണക്റ്റുചെയ്‌തിരിക്കുമ്പോൾ മാത്രമേ നെറ്റ്‌വർക്ക് ട്രാഫിക്ക് അനുവദിക്കുകയുള്ളൂ."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"നിയന്ത്രിത പ്രൊഫൈലുകൾക്ക് അക്കൗണ്ടുകൾ ചേർക്കാനാകില്ല"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"ഫോണിൽ നിന്നും <xliff:g id="USER_NAME">%1$s</xliff:g>-നെ മായ്ക്കൂ"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"ലോക്ക് സ്ക്രീൻ ക്രമീകരണം"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"ലോക്ക് സ്ക്രീനിൽ നിന്ന് ഉപയോക്താക്കളെ ചേർക്കുക"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"പുതിയ ഉപയോക്താവ്"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"പുതിയ പ്രൊഫൈൽ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"നിങ്ങളെ സ്വയം ഇല്ലാതാക്കണോ?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ഫോൺ കോളുകൾ, SMS എന്നിവ ഓണാക്കണോ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ഈ ഉപയോക്താവുമായി കോൾ, SMS എന്നിവയുടെ ചരിത്രം പങ്കിടും."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"അടിയന്തര വിവരം"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> എന്ന ഉപയോക്താവിനെ കുറിച്ചുള്ള ‌വിവരങ്ങൾ"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> എന്നയാൾക്കുള്ള വിവരങ്ങളും കോൺടാക്‌റ്റുകളും"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"അപ്ലിക്കേഷനുകളും ഉള്ളടക്കവും അനുവദിക്കുക"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"നിയന്ത്രണങ്ങളുള്ള അപ്ലിക്കേഷനുകൾ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"അപ്ലിക്കേഷനുകൾക്കായുള്ള ക്രമീകരണങ്ങൾ വിപുലീകരിക്കുക"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">മറച്ച %d ഇനങ്ങൾ കാണിക്കുക</item>
       <item quantity="one">മറച്ച %d ഇനം കാണിക്കുക</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"നെറ്റ്‌വർക്കും ഇന്റർനെറ്റും"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"വൈ-ഫൈ, സെല്ലുലാർ, ഡാറ്റ ഉപയോഗം, ഹോട്ട്‌‌സ്‌പോട്ട്"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"നെറ്റ്‌വർക്കും ഇന്റർനെറ്റും"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"വൈ-ഫൈ, മൊബൈൽ, ഡാറ്റ ഉപഭോഗം, ഹോട്ട്‌സ്‌പോട്ട്"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"കണക്‌റ്റുചെയ്‌ത ഉപകരണങ്ങൾ"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, കാസ്‌റ്റുചെയ്യൽ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ആപ്‌സും അറിയിപ്പുകളും"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"ഉപയോക്താവും അക്കൗണ്ടുകളും"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"ഡിഫോൾട്ട് ആപ്‌സ്"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"ഭാഷകൾ, ബായ്ക്കപ്പ്, അപ്‌ഡേറ്റുകൾ, ഫോൺ സംബന്ധമായ ‌വിവരങ്ങൾ"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"ഉപകരണവുമായി ബന്ധപ്പെട്ട ഭാഷകൾ, ബായ്ക്കപ്പ്, അപ്‌ഡേറ്റുകൾ"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ക്രമീകരണം"</string>
     <string name="search_menu" msgid="6283419262313758339">"തിരയൽ ക്രമീകരണം"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"തിരയൽ ക്രമീകരണങ്ങൾ"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"ഫലങ്ങള്‍"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"വൈഫൈ, വൈ-ഫൈ, നെറ്റ്‌വർക്ക് കണക്ഷൻ"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ടെക്‌സ്‌റ്റ് സന്ദേശം, ടെക്സ്റ്റുചെയ്യൽ, സന്ദേശങ്ങൾ, സന്ദേശമയയ്‌ക്കൽ"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"സെല്ലുലാർ, സെൽ കാരിയർ, വയർലെസ്സ്, ഡാറ്റ, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"സെല്ലുലാർ, മൊബൈൽ, സെൽ കാരിയർ, വയർലെസ്, ഡാറ്റ, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"വൈഫൈ, വൈ-ഫൈ, കോൾ, കോളിംഗ്"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ലോഞ്ചർ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"സ്ക്രീൻ, ടച്ച്സ്ക്രീൻ"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"അലേർട്ട്"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"വൈബ്രേറ്റുചെയ്യുക"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ശബ്ദങ്ങൾ ഓണാക്കുക"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"\'ശല്യപ്പെടുത്തരുത്\' മുൻഗണനകൾ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"മുൻഗണനയുള്ളവ മാത്രം"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"സ്വയമേയുള്ള നയങ്ങൾ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"\'ശല്യപ്പെടുത്തരുത്\' ഷെഡ്യൂൾ സജ്ജമാക്കുക"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ഡിഫോൾട്ട് ഔദ്യോഗിക അറിയിപ്പ് ടോൺ"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ഡിഫോൾട്ട് ഔദ്യോഗിക അലാറം റിംഗ്‌ടോൺ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"വ്യക്തിഗത പ്രൊഫൈലിന് സമാനം"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"ഔദ്യോഗിക പ്രൊഫൈൽ ശബ്ദങ്ങൾ മാറ്റണോ?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"വ്യക്തിഗത പ്രൊഫൈൽ ശബ്‌ദങ്ങൾ ഉപയോഗിക്കണോ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"മാറ്റിസ്ഥാപിക്കുക"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"നിങ്ങളുടെ നിലവിലെ ഔദ്യോഗിക പ്രൊഫൈൽ ശബ്ദങ്ങൾക്ക് പകരമായി നിങ്ങളുടെ വ്യക്തിഗത പ്രൊഫൈൽ ശബ്ദങ്ങൾ ഉപയോഗിക്കപ്പെടും"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"നിങ്ങളുടെ നിലവിലെ ഔദ്യോഗിക പ്രൊഫൈൽ ശബ്‌ദങ്ങൾക്ക് പകരം വ്യക്തിഗത പ്രൊഫൈൽ ശബ്‌ദങ്ങൾ ഉപയോഗിക്കുന്നതാണ്"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"റിംഗ്‌ടോണുകൾ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"മറ്റ് ശബ്ദങ്ങളും വൈബ്രേഷനുകളും"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"അറിയിപ്പ് മുൻഗണനകൾ"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"അനുമതികളൊന്നും അനുവദിച്ചില്ല"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"അനുമതികളൊന്നും അഭ്യർത്ഥിച്ചില്ല"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"എല്ലാ ആപ്സും"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"പ്രവർത്തനക്ഷമമാക്കി"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ഇൻസ്‌റ്റാൾ ചെയ്‌ത ആപ്പുകൾ"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ഇൻസ്‌റ്റ‌ന്റ് ആപ്പ്"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"വ്യക്തിഗതം"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ഔദ്യോഗികം"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"തടഞ്ഞവ"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ഡൊമെയ്‌ൻ URL-കൾ ഉള്ളത്"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"വിപുലമായത്"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ആപ് കോണ്‍ഫിഗര്‍ചെയ്യൂ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"അജ്ഞാത അപ്ലിക്കേഷൻ"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"ഔദ്യോഗികാവശ്യങ്ങൾക്ക് ഡിഫോൾട്ട്"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"അസിസ്റ്റ്, വോയ്സ് ഇൻപുട്ട്"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"അസിസ്റ്റ് ആപ്പ്"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"ഒന്നുമില്ല"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"അസിസ്റ്റ് ആപ്പ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>-നെ നിങ്ങളുടെ സഹായി ആക്കണോ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"നിങ്ങളുടെ സ്ക്രീനിൽ ദൃശ്യമാകുന്നതോ ആപ്സിനുള്ളിൽ ആക്സസ് ചെയ്യാവുന്നതോ ആയ വിവരങ്ങൾ ഉൾപ്പെടെ, നിങ്ങളുടെ സിസ്റ്റത്തിൽ ഉപയോഗത്തിലുള്ള ആപ്സിനെ കുറിച്ചുള്ള വിവരങ്ങൾ വായിക്കാൻ അസിസ്റ്റന്റിന് കഴിയും."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"അംഗീകരിക്കുക"</string>
@@ -2966,6 +2958,8 @@
     <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">"ബാറ്ററി ഓപ്റ്റിമൈസേഷൻ"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ബാറ്ററി ഉപഭോഗ മുന്നറിയിപ്പ്"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"എല്ലാ ആപ്പുകളും കാണിക്കൂ"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"അധികമുള്ള ആപ്പുകൾ ‌മറയ്ക്കുക"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ഓപ്റ്റിമൈസ് ചെയ്തിട്ടില്ല"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ഓപ്റ്റിമൈസ് ചെയ്തിട്ടില്ല"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ബാറ്ററി ഉപയോഗം ഓപ്റ്റിമൈസ് ചെയ്യുന്നു"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"തണുത്ത വർണ്ണ താപനില"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"കൂടുതൽ തണുത്ത ഡിസ്പ്ലേ വർണ്ണങ്ങൾ ഉപയോഗിക്കുക"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"വർണ്ണ മാറ്റം ബാധകമാക്കാൻ, സ്ക്രീൻ ഓഫാക്കുക"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ടെലിഫോണി മോണിറ്ററിലെ മാറ്റം പ്രയോഗിക്കാൻ ഉപകരണം റീബൂട്ടുചെയ്യുക"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"സ്വയമേവയുള്ള സിസ്റ്റം അപ്ഡേറ്റുകൾ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"ബൈൻഡർ ചെയ്‌ത HAL-കൾ (റീബൂട്ട് ആവശ്യമാണ്)"</string>
     <string name="usage" msgid="2977875522080448986">"ഉപയോഗം"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"ജെസ്‌റ്റർ സഹായം"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ഗ്ലോബൽ HTTP പ്രോക്സി സെറ്റ്"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"അഡ്മിന് ഉപകരണം ‌ലോക്ക് ചെയ്യാനും പാസ്‌വേഡ് റീസെറ്റ് ചെയ്യാനും കഴിയും"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"അഡ്മിന് ഉപകരണത്തിലെ എല്ലാ ‌ഡാറ്റയും ഇല്ലാതാക്കാൻ ‌കഴിയും"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">ഉപകരണത്തിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുന്നതിനുമുമ്പുള്ള പരമാവധി ലോഗിൻ ശ്രമങ്ങൾ <xliff:g id="COUNT_1">%d</xliff:g> ആക്കി അഡ്‌മിൻ സജ്ജീകരിച്ചു.</item>
+      <item quantity="one">ഉപകരണത്തിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുന്നതിനുമുമ്പുള്ള പരമാവധി ലോഗിൻ ശ്രമങ്ങൾ <xliff:g id="COUNT_0">%d</xliff:g> ആക്കി അഡ്‌മിൻ സജ്ജീകരിച്ചു.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"ഈ ഉപകരണം ഉടമയാൽ ‌നിയന്ത്രിക്കപ്പെടുന്നു."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ഈ ഉപകരണം നിയന്ത്രിക്കുന്നത് <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ആണ്."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"കൂടുതലറിയുക"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ഫോട്ടോകളും വീഡിയോകളും"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"സംഗീതവും ഓഡിയോയും"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ഗെയിമുകള്‍"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"മറ്റ് ആപ്‌സ്"</string>
     <string name="storage_files" msgid="8581083146777364063">"ഫയലുകള്‍"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"സ്റ്റോറേജ് മാനേജര്‍: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ഓഫ്"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ഓൺ"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ഗെയിമുകള്‍"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ഓഡിയോ ഫയലുകള്‍‌"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"സംഗീതം"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് ‌അൺഇൻസ്റ്റാൾചെയ്തു)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് കാണാനാവില്ല)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"സ്വയമേവ പൂരിപ്പിക്കുന്ന ആപ്പ്"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 458167b..2de4134 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -214,7 +214,7 @@
     <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>
-    <string name="band_mode_loading" msgid="3555063585133586152">"Зурвасын жагсаалтыг ачааллаж байна..."</string>
+    <string name="band_mode_loading" msgid="3555063585133586152">"Зурвасын жагсаалтыг ачаалж байна..."</string>
     <string name="band_mode_set" msgid="5730560180249458484">"Тохируулах"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Амжилтгүй"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Амжилттай"</string>
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Байршил"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Бүртгэл"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Аюулгүй байдал, дэлгэцийн түгжээ"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифр, мандат үнэмлэх"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Миний Байршил, дэлгэц тайлах, SIM картны түгжээ, жуухны сангийн түгжээг тохируулах"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Миний Байршил, дэлгэц тайлах, жуухын сангийн түгжээ зэргийг тохируулах"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Нууц үг"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Нууцлал"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Админ идэвхгүй болгосон"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Аюулгүй байдлын төлөв"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Байршил, хурууны хээ"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi сонгох"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi-г асааж байна…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi-г унтрааж байна…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Бүх сүлжээг харах"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Алдаа"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz холбогчийг энэ улсад ашиглах боломжгүй байна"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Нислэгийн горим"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth модем болгох"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Модем болгох"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Сүлжээний цэг, модем болгох"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Сүлжээний цэг асаалттай, модем болгох"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Сүлжээний цэг асаалттай"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Модем болгох"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Өгөгдөл хамгаалагчийг асаалттай үед зөөврийн сүлжээний цэгийг ашиглах болон модем болгох боломжгүй"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB модем болгох"</string>
@@ -1358,7 +1355,7 @@
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"Гар ажиллагаатай"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Гар ажиллагааг ачаалах явцад алдаа гарлаа."</string>
     <string name="settings_license_activity_title" msgid="8525014571806471216">"Гуравдагч талын лиценз"</string>
-    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Лицензүүдийг ачааллах явцад алдаа гарлаа."</string>
+    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Лицензүүдийг ачаалах явцад алдаа гарлаа."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Ачаалж байна..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Аюулгүй байдлын мэдээлэл"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Аюулгүй байдлын мэдээлэл"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Төхөөрөмжийн дэлгэцийн түгжээтэй ижил"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Апп удирдах"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Суулгасан апп-уудыг удирдах болон устгах"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Аппын мэдээлэл"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Апп-уудыг удирдах, хурдан эхлүүлэх товчилборуудыг үүсгэх"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Апп тохиргоо"</string>
     <string name="install_applications" msgid="4872012136210802181">"Тодорхойгүй эх үүсвэр"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Эзэлсэн зайг удирдах"</string>
     <string name="filter" msgid="2018011724373033887">"Шүүлтүүр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Шүүлтүүрийн тохируулгыг сонгоно уу"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Бүгд"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Идэвхгүйжүүлсэн"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Бүх апп"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Идэвхгүй болгосон апп"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Татаж авсан"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Ажиллаж байна"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB сан"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD карт дээр"</string>
     <string name="disabled" msgid="9206776641295849915">"Идэвхгүйжүүлсэн"</string>
     <string name="not_installed" msgid="2797554494953450291">"Энэ хэрэглэгчид зориулан суулгаагүй байна"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Суулгасан"</string>
     <string name="no_applications" msgid="7336588977497084921">"Апп байхгүй."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Дотоод сан"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"дотоод санах ой"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Оруулах аргыг тохируулах"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Тохиргоо"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Тохиргоо"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Оруулах аргуудыг идэвхжүүлэх"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Системийн хэлүүдийг ашиглах"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> тохиргоо"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Идэвхтэй оруулах аргыг сонгоно уу"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Дэлгэцэн дээрх гарын тохиргоо"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Дэлгэц томруулахыг автоматаар шинэчлэх"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Апп шилжилт дээр дэлгэц томруулахыг шинэчлэх"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Асаах товч дуудлагыг таслана"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Нууц үгийг хэлэх"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Том хулгана заагч"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Моно аудио"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Аудиог тоглуулж байхад сувгийг нэгтгэх"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Сүүлийн бүрэн цэнэглэлтээс хойшхи ашиглалт"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Дэлгэц ашиглалт"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Дэлгэцийн хэрэглээ"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Мобайл сүлжээний скан"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Сүүлд бүрэн цэнэглэснээс хойших апп ашиглалт"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Сүүлд бүрэн цэнэглэснээс хойших төхөөрөмж ашиглалт"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Салгаснаас хойшхи зайны ашиглалт"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Дахин ачаалснаас хойшхи зайны ашиглалт"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> зайгаар"</string>
@@ -1929,11 +1925,11 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for battery_used_for (4383512863007718804) -->
     <skip />
+    <string name="battery_overall_usage" msgid="5541736421708733643">"Нийт батерейны %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Сүүлд бүрэн цэнэглэснээс хойших ашиглалтын дэлгэрэнгүй"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Барагцаалсан үлдсэн хугацаа"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Бүтэн цэнэглэх болсон"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Барагцаалсан хугацаа хэрэглээнд үндэслэн өөрчлөгдөж болно"</string>
     <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>
@@ -2241,8 +2237,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="5871168521456832764">"Энэ функц нь зөвхөн үүрэн сүлжээтэй үед далд датанд суурилсан апп-г зогсоход хүргэж болно. \n\nТа апп доторх тохиргооноос дата ашиглалтын хяналтын илүү тохиромжтой тохируулгыг ашиглаж болно."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="1493134803720421674">"Далд датаг хязгаарлах нь зөвхөн үүрэн датаны хязгаарыг тохируулсны дараа боломжтой болно."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Өгөгдлийг автоматаар синк хийхийг асаах уу?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Таны веб дээр өөрийн бүртгэлд оруулсан бүх өөрчлөлт таны таблет руу автоматаар хуулагдах болно.\n\nЗарим бүртгэл нь таны таблет дээр оруулсан аливаа өөрчлөлтийг мөн автоматаар веб рүү хуулж болно. Google бүртгэл ийм маягаар ажилладаг."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Таны веб дээрээс бүртгэлдаа оруулсан бүх өөрчлөлт автоматаар таны утсанд хуулагдах болно.\n\nЗарим бүртгэл нь таны утсан дээрээс оруулсан өөрчлөлтийг веб рүү автоматаар хуулж болно. Google бүртгэл ингэж ажилладаг."</string>
+    <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_cycle_editor_title" msgid="1373797281540188533">"Ашиглалтын циклийг шинэчлэх огноо"</string>
@@ -2324,6 +2320,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Үргэлж идэвхгүй"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Энэ апп-с дэмжээгүй"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Зөвхөн VPN-р холбогдохыг зөвшөөрөх"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN холболт шаардлагатай юу?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Салгах үйл ажиллагаа"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Салгах идэвхгүй"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Байнга холболттой байхын тулд VPN профайл сонгоно уу. Сүлжээний трафик зөвхөн энэ VPN-д холбогдсон үед зөвшөөрөгдөх болно."</string>
@@ -2409,8 +2406,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Хязгаарлагдсан профайлууд бүртгэл нэмэх боломжгүй"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g>-г энэ төхөөрөмжөөс устгах"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Дэлгэц түгжих тохиргоо"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Түгжигдсэн дэлгэцээс хэрэглэгч нэмэх"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Шинэ хэрэглэгч"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Шинэ профайл"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Өөрийгөө устгах уу?"</string>
@@ -2438,7 +2434,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Утасны дуудлага &amp; SMS-г хүлээн авах уу?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Энэ хэрэглэгчтэй утасны дуудлага болон SMS түүхийг хуваалцах болно."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Яаралтай тусламжийн мэдээлэл"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g>-н тухай мэдээлэл"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>-н мэдээлэл, харилцагч"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Апп болон агуулгыг зөвшөөрөх"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Хязгаарлалттай аппликешнүүд"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Аппликешний тохиргоог дэлгэх"</string>
@@ -2558,8 +2554,8 @@
       <item quantity="other">Нуусан %d зүйлийг харуулах</item>
       <item quantity="one">Нуусан %d зүйлийг харуулах</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Сүлжээ &amp; интернэт"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, үүрэн, дата ашиглалт, сүлжээний цэг"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Сүлжээ &amp; интернэт"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобайл, дата хэрэглээ, сүлжээний цэг"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Холбогдсон төхөөрөмж"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Апп; мэдэгдэл"</string>
@@ -2567,8 +2563,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Хэрэглэгч &amp; бүртгэл"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Өгөгдмөл апп"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Хэл, нөөцлөлт, шинэчлэлт, утасны тухай"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Хэл, нөөц, шинэчлэлт, төхөөрөмжийн тухай"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Тохиргоо"</string>
     <string name="search_menu" msgid="6283419262313758339">"Хайлтын тохиргоо"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Хайлтын тохиргоо"</string>
@@ -2576,7 +2571,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Илэрцүүд"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, сүлжээний холболт"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"текст зурвас, текст бичих, зурвас, зурвас бичих"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"үүрэн холбоо, үүрэн холбооны оператор, утасгүй интернэт, дата, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"үүрэн холбоо, үүрэн холбооны оператор, утасгүй интернэт, дата, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, залгах, дуудлага"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ажиллуулагч"</string>
     <string name="keywords_display" msgid="8910345814565493016">"дэлгэц, мэдрэгчтэй дэлгэц"</string>
@@ -2652,8 +2647,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Сэрэмжлүүлэг"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Чичиргээ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Дууны чадал"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Бүү саад бол сонголт"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Зөвхөн хамгийн чухал гэснийг зөвшөөрнө"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автомат журам"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"\"Бүү саад бол\" горимын хуваарийг тохируулах"</string>
@@ -2670,9 +2664,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Ажлын мэдэгдлийн үндсэн ая"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Ажлын сэрүүлгийн үндсэн ая"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Хувийн профайлтай ижил"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Ажлын профайлын дууг солих уу?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Хувийн профайлын дууг ашиглах уу?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Солих"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Таны ажлын профайлын одоогийн дууг таны хувийн профайлын дуугаар солих болно"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Таны одоогийн ажлын профайлын дууны оронд хувийн профайлын дууг ашиглана"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Хонхны ая"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Бусад дуу, чичиргээ"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Мэдэгдлийн тохируулга"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Зөвшөөрөл олгоогүй байна"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Зөвшөөрөл шаардлаггүй"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Бүх апп-ууд"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Идэвхжүүлсэн"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Суулгасан апп"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Шуурхай апп"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Хувийн"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Ажил"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блоклосон"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домэйн хаягуудын хамт"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Боловсронгуй"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Апп тохируулах"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Үл мэдэгдэх апп"</string>
@@ -2935,15 +2929,13 @@
     <string name="default_for_work" msgid="9152194239366247932">"Ажлын өгөгдмөл"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Туслах &amp; дууны оруулах"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Туслах апп"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Байхгүй"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Туслах апп сонгох"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>-г туслахаа болгох уу?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Туслах нь дэлгэцэнд харагддаг, апп дотор ашигладаг мэдээлэл зэрэг таны системд ашигладаг мэдээллийг уншина."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Зөвшөөрөх"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Зөвшөөрөхгүй"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Дууны оролтыг сонгох"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Хөтөч апп"</string>
-    <string name="default_browser_title_none" msgid="2124785489953628553">"Үндсэн веб хөтөч байхгүй"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Үндсэн вэб хөтөч байхгүй"</string>
     <string name="default_phone_title" msgid="282005908059637350">"Гар утасны апп"</string>
     <string name="default_app" msgid="6864503001385843060">"(Үндсэн)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Систем)"</string>
@@ -2966,6 +2958,8 @@
     <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">"Тэжээлийн оновчлол"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Хэрэглээний сануулга"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Бүх аппыг харуулах"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Нэмэлт аппыг нуух"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Оновчлоогүй"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Оновчлоогүй"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Тэжээлийн хэрэглээг оновчилж байна"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Хүйтэн өнгөний температур"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Илүү хүйтэн дэлгэцийн өнгө ашиглах"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Өнгөний өөрчлөлтийг оруулахын тулд дэлгэцийг унтраана уу"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Утасны хяналтын өөрчлөлтийг хэрэгжүүлэхийн тулд төхөөрөмжийг дахин асаана уу"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Системийн автомат шинэчлэлтүүд"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Холбосон HALs (дахин асаах шаардлагатай)"</string>
     <string name="usage" msgid="2977875522080448986">"Хэрэглээ"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Дэмжлэгийн зангаа"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Дэлхий нийтийн HTTP прокси тохиргоо"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Админ төхөөрөмжийг түгжиж, нууц үгийг сэргээх боломжтой"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Админ төхөөрөмжийн бүх өгөгдлийг устгах боломжтой"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Админ төхөөрөмжийн бүх өгөгдлийг устгахаас өмнө хамгийн ихдээ <xliff:g id="COUNT_1">%d</xliff:g> удаа нууц үг оруулах боломжтойгоор тохируулсан</item>
+      <item quantity="one">Админ төхөөрөмжийн бүх өгөгдлийг устгахаас өмнө хамгийн ихдээ <xliff:g id="COUNT_0">%d</xliff:g> удаа нууц үг оруулах боломжтойгоор тохируулсан</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"Энэ төхөөрөмжийг удирдаж байна"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Энэ төхөөрөмжийг <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> удирддаг"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Дэлгэрэнгүй үзэх"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Зураг &amp; видео"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Хөгжим &amp; аудио"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Тоглоом"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Бусад апп"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файл"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Сангийн менежер: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Идэвхгүй"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Идэвхтэй"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Тоглоом"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио файл"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Хөгжим"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> хэрэглэгчээс устгасан)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> хэрэглэгчид идэвхгүй болгосон)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Автоматаар бөглөх апп"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index dce3594..0bcf230 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाती"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"सुरक्षितता आणि स्क्रीन लॉक"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"कूटबद्धीकरण आणि क्रेडेन्शियल"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"माझे स्थान, स्क्रीन लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"संकेतशब्द"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"गोपनीयता"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"प्रशासकाने अक्षम केलेले"</string>
     <string name="security_status_title" msgid="5848766673665944640">"सुरक्षितता स्थिती"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"स्थान, फिंगरप्रिंट"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"वाय-फाय निवडा"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"वाय-फाय चालू करीत आहे..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"वाय-फाय बंद करीत आहे…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"सर्व नेटवर्क पहा"</string>
     <string name="wifi_error" msgid="3207971103917128179">"त्रुटी"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"या देशात 5 GHz बँड उपलब्‍ध नाही"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"विमान मोड मध्ये"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लूटुथ टेदरिंग"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टिथरिंग"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"हॉटस्‍पॉट आणि टिथरिंग"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"हॉटस्पॉट चालू, टिथरिंग करत आहे"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"हॉटस्पॉट चालू"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"टिथरिंग"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"डेटा बचतकर्ता चालू असताना टिथर करू शकत नाही किंवा पोर्टेबल हॉटस्पॉटचा वापर करू शकत नाही"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB टेदरिंग"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"डिव्हाइस स्क्रीन लॉक सारखेच"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"अ‍ॅप्स व्यवस्थापित करा"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"स्थापित अॅप्स व्यवस्थापित करा आणि काढा"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"अॅप माहिती"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"अॅप्स व्यवस्थापित करा, द्रुत लाँच शॉर्टकट सेट करा"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"अ‍ॅप सेटिंग्ज"</string>
     <string name="install_applications" msgid="4872012136210802181">"अज्ञात स्त्रोत"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"जागा व्यवस्थापित करा"</string>
     <string name="filter" msgid="2018011724373033887">"फिल्टर"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"फिल्टर पर्याय निवडा"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"सर्व"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"अक्षम"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"सर्व अ‍ॅप्स"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"अक्षम केलेले अ‍ॅप्स"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"डाउनलोड केले"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"चालू आहे"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB संचयन"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD कार्डवर"</string>
     <string name="disabled" msgid="9206776641295849915">"अक्षम"</string>
     <string name="not_installed" msgid="2797554494953450291">"या वापरकर्त्यासाठी स्थापित केले नाही"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"स्थापित केले"</string>
     <string name="no_applications" msgid="7336588977497084921">"अॅप्स नाहीत."</string>
     <string name="internal_storage" msgid="1584700623164275282">"अंतर्गत संचयन"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"अंतर्गत संचयन"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"इनपुट पद्धती सेट करा"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"सेटिंग्ज"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"सेटिंग्ज"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"सक्रिय इनपुट पद्धती"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"सिस्टीम भाषा वापरा"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> सेटिंग्ज"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"सक्रिय इनपुट पद्धती निवडा"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ऑनस्क्रीन कीबोर्ड सेटिंग्ज"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"स्क्रीन विस्तृतीकरण स्वयं अद्ययावत करा"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"अॅप संक्रमणांवर स्क्रीन विस्तृतीकरण अद्ययावत करा"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"उर्जा बटण कॉल समाप्त करते"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"संकेतशब्द म्हणा"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"मोठा माऊस पॉईंटर"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"मोनो ऑडिओ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ऑडिओ खेळताना चॅनेल एकत्र करा"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"पूर्ण चार्ज झाल्यानंतरचा वापर"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"स्क्रीन वापर"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रीन उपयोग"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कॅनिंग"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"मागील पूर्ण चार्जनंतरचा अ‍ॅप वापर"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"मागील पूर्ण चार्जनंतरचा डिव्हाइस वापर"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग केल्यापासून बॅटरी वापर"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"रीसेट केल्यापासून बॅटरी वापर"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"बॅटरीवरील <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"जास्त प्रमाणात उर्जा वापर"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s साठी वापरले"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"एकूण बॅटरी पैकी %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"पूर्ण चार्ज झाल्यानंतरचा वापर खंड"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"अंदाजे शिल्लक वेळ"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"पूर्ण चार्ज होण्यासाठी वेळ"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"वापराच्या आधारावर अंदाज बदलू शकतो"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"नेहमी-चालू निष्क्रिय आहे"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"या अॅप द्वारे समर्थित नाही"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"केवळ VPN द्वारे केलेल्या कनेक्शनना अनुमती द्या"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN कनेक्शन आवश्यक आहे?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"लॉकडाउन सक्रिय"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"लॉकडाउन निष्क्रिय"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"नेहमी कनेक्ट केलेले राहण्यासाठी एक VPN प्रोफाईल निवडा. केवळ या VPN शी कनेक्ट केलेले असताना नेटवर्क रहदारीला अनुमती दिली जाईल."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"प्रतिबंधित प्रोफाईल्स खाती जोडू शकत नाहीत"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"या डिव्हाइसवरुन <xliff:g id="USER_NAME">%1$s</xliff:g> हटवा"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"लॉक स्क्रीन सेटिंग्ज"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"लॉक स्‍क्रीनवरून वापरकर्ते जोडा"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"नवीन वापरकर्ता"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"नवीन प्रोफाईल"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"आपल्या स्वत:ला हटवायचे?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फोन कॉल आणि SMS चालू करायचे?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"या वापरकर्त्याशी कॉल आणि SMS इतिहास सामायिक केला जाईल."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आणीबाणी माहिती"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> विषयी माहिती"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी माहिती आणि संपर्क"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"अॅप्स आणि सामग्रीला अनुमती द्या"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंध असलेले अनुप्रयोग"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"अनुप्रयोगासाठी सेटिंग्ज विस्तृत करा"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="one">%d लपविलेला आयटम दर्शवा</item>
       <item quantity="other">%d लपविलेले आयटम दर्शवा</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"नेटवर्क आणि इंटरनेट"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"वाय-फाय, सेल्युलर, डेटा वापर, हॉटस्पॉट"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क आणि इंटरनेट"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"वाय-फाय, मोबाइल, डेटा वापर, हॉटस्पॉट"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"कनेक्‍ट केलेले डिव्‍हाइसेस"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"ब्लूटुथ, NFC, कास्‍ट"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अॅप्स आणि सूचना"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"वापरकर्ता आणि खाती"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"डीफॉल्ट अ‍ॅप्स"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"भाषा, बॅकअप, अद्यतने, फोन विषयी"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"भाषा, बॅकअप, अद्यतने, डिव्हाइसविषयी"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिंग्ज"</string>
     <string name="search_menu" msgid="6283419262313758339">"शोध सेटिंग्ज"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"शोध सेटिंग्ज"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"परिणाम"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"वायफाय, वाय-फाय, नेटवर्क कनेक्शन"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"मजकूर संदेश, मजकूर पाठविणे, संदेश, संदेशन"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"मोबाईल, सेल वाहक, वायरलेस, डेटा, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"सेल्युलर, मोबाइल, सेल वाहक, वायरलेस, डेटा, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"वायफाय, वाय-फाय, कॉल, कॉलिंग"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लाँचर"</string>
     <string name="keywords_display" msgid="8910345814565493016">"स्क्रीन, टचस्क्रीन"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"सूचना"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"कंपन करा"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ध्वनी चालू करा"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"व्यत्यय आणू नका प्राधान्ये"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"केवळ प्राधान्य अनुमती देते"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"स्वयंचलित नियम"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"व्यत्यय आणू नका अनुसूची सेट करा"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"डीफॉल्ट कार्य सूचना टोन"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"डीफॉल्ट कार्य अलार्म रिंगटोन"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"वैयक्तिक प्रोफाइल सारखे"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"कार्य प्रोफाईल ध्वनी पुनर्स्थित करायचे?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"वैयक्तिक प्रोफाइल ध्वनी वापरायचे?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"पुनर्स्थित करा"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"आपले वर्तमान कार्य प्रोफाइल ध्वनी आपल्या वैयक्तिक प्रोफाइल ध्वनींनी पुनर्स्थित केले जातील"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"आपल्या विद्यमान कार्य प्रोफाइल ध्वनींऐवजी आपले वैयक्तिक कार्य प्रोफाइल ध्वनी वापरले जातील"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"रिंगटोन"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"इतर आवाज आणि कंपने"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"सूचना प्राधान्ये"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"कोणत्याही परवानग्यांना मंजूरी दिली नाही"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"कोणत्याही परवानग्यांची विनंती केली नाही"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"सर्व अ‍ॅप्स"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"सक्षम केले"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"स्थापित केलेले अॅप्स"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"इन्स्टंट अ‍ॅप्स"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"वैयक्तिक"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"अवरोधित केले"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URL सह"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"प्रगत"</string>
     <string name="configure_apps" msgid="6685680790825882528">"अ‍ॅप्स कॉन्‍फिगर करा"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अॅप"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"कार्यासाठी डीफॉल्ट"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"सहाय्य आणि व्हॉइस इनपुट"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"सहाय्य अ‍ॅप"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"काहीही नाही"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"सहाय्य अ‍ॅप निवडा"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ला आपला सहाय्यक बनवायचे?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"आपल्‍या स्क्रीनवर दृश्‍यमान असलेली किंवा अॅप्समध्‍ये प्रवेश करण्‍यायोग्य माहितीसह, आपल्‍या सिस्टीम वरील वापरात असलेल्या अॅप्सविषयी माहिती वाचण्‍यात सहाय्यक सक्षम असेल."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"सहमत आहे"</string>
@@ -2966,6 +2958,8 @@
     <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">"बॅटरी ऑप्टिमायझेशन"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"वापरासंबंधी सूचना"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"सर्व अॅप्स दर्शवा"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"अतिरिक्त अॅप्स लपवा"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ऑप्टिमाइझ न केलेले"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ऑप्टिमाइझ न केलेले"</string>
     <string name="high_power_off" msgid="3393904131961263278">"बॅटरी वापर ऑप्टिमाइझ करीत आहे"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"छान रंगाचे तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"आणखी छान प्रदर्शन रंग वापरा"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदल लागू करण्यासाठी, स्क्रीन बंद करा"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलिफोनी मॉनिटर बदल लागू करण्‍यासाठी, डिव्‍हाइस रीबूट करा"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वयंचलित सिस्टम अद्यतने"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (रीबूट आवश्यक)"</string>
     <string name="usage" msgid="2977875522080448986">"वापर"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"सहाय्यता जेश्चर"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"जागतिक HTTP प्रॉक्‍सी सेट आहे"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"प्रशासक डिव्हाइस लॉक करु शकतो आणि संकेतशब्द रीसेट करु शकतो"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"प्रशासक डिव्हाइसवरील सर्व डेटा हटवू शकतो"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <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="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"हे डिव्हाइस व्यवस्थापित आहे."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> द्वारे व्यवस्थापित आहे."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"अधिक जाणून घ्या"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"फोटो आणि व्हिडिओ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"संगीत आणि ऑडिओ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"गेम"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"अन्य अॅप्स"</string>
     <string name="storage_files" msgid="8581083146777364063">"फायली"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"संचय व्यवस्थापक: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"बंद"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"चालू"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"गेम"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ऑडिओ फायली"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"संगीत"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> वापरकर्त्‍यासाठी विस्‍थापित)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> वापरकर्त्‍यासाठी अक्षम केले)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"स्वयं-भरण अॅप"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index ff1e0b7..cd9e214 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akaun"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Keselamatan &amp; kunci skrin"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Penyulitan &amp; bukti kelayakan"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Tetapkan Lokasi Saya, buka kunci skrin, kunci storan bukti kelayakan"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Kata laluan"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privasi"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Dilumpuhkan oleh pentadbir"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Status keselamatan"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Lokasi, cap jari"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Pilih Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Menghidupkan Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Mematikan Wi‑Fi…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Lihat semua rangkaian"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Ralat"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Jalur 5 GHz tidak tersedia di negara ini"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Dalam mod Pesawat"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Penambatan Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Penambatan"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Tempat Liputan &amp; Penambatan"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Tempat liputan dihidupkan, menambat"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Tempat liputan dihidupkan"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Penambatan"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Tidak boleh menambat atau menggunakan tempat liputan mudah alih semasa Penjimat Data dihidupkan"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Penambatan USB"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Sama seperti kunci skrin peranti"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Urus aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Urus dan alih keluar aplikasi yang dipasang"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Maklumat apl"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Urus aplikasi, sediakan pintasan pelancaran cepat"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Tetapan aplikasi"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sumber tidak diketahui"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Urus ruang"</string>
     <string name="filter" msgid="2018011724373033887">"Tapis"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Buat pilihan penapis"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Semua"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Dilumpuhkan"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Semua apl"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Apl yang dilumpuhkan"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Sudah dimuat turun"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Dijalankan"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Storan USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pada kad SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Dilumpuhkan"</string>
     <string name="not_installed" msgid="2797554494953450291">"Tidak dipasang bg pengguna ini"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Dipasang"</string>
     <string name="no_applications" msgid="7336588977497084921">"Tiada aplikasi."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Storan dalaman"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"storan dalaman"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Sediakan kaedah input"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Tetapan"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Tetapan"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Kaedah input aktif"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Gunakan bahasa sistem"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Tetapan <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Pilih kaedah input yang aktif"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Tetapan papan kekunci pada skrin"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto kemas kini pembesaran skrin"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Kemas kini pembesaran skrin pada peralihan apl"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Butang kuasa menamatkan panggilan"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Tuturkan kata laluan"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Penuding tetikus besar"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Gabungkan saluran semasa memainkan audio"</string>
@@ -1837,7 +1829,11 @@
     <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> yang tinggal"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> untuk mengecas"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Digunakan sejak cas penuh yang lalu"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Penggunaan skrin"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Penggunaan skrin"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Pengimbasan rangkaian mudah alih"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Penggunaan apl sejak cas penuh terakhir"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Penggunaan peranti sejak cas penuh terakhir"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateri digunakan sejak palam dicabut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Kegunaan bateri sejak ditetapkan semula"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> semasa menggunakan bateri"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan kuasa terlebih kira"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Digunakan untuk %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s daripada keseluruhan bateri"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Gendala penggunaan sejak pengecasan penuh terakhir"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Anggaran baki masa"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tempoh hingga cas penuh"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Anggaran mungkin berubah berdasarkan penggunaan"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak palam dicabut"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Semasa kali terakhir palam dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Jumlah penggunaan"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Sentiasa hidup tidak aktif"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Tidak disokong oleh apl ini"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Benarkan sambungan melalui VPN sahaja"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Perlukan sambungan VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Kunci semua aktif"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Kunci semua tidak aktif"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pilih profil VPN untuk sentiasa kekal tersambung. Trafik rangkaian hanya akan dibenarkan apabila bersambung ke VPN ini."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profil yang disekat tidak boleh menambah akaun"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Padam <xliff:g id="USER_NAME">%1$s</xliff:g> dari peranti"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Tetapan skrin kunci"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Tambahkan pengguna daripada skrin kunci"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Pengguna baharu"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Profil baharu"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Padam diri anda sendiri?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Hidupkan panggilan telefon &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Sejarah panggilan dan SMS akan dikongsi dengan pengguna ini."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Maklumat kecemasan"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Maklumat tentang <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Maklumat &amp; butiran hubungan untuk <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Benarkan apl dan kandungan"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan sekatan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Kembangkn tetapan utk aplikasi"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">Tunjukkan %d item yang tersembunyi</item>
       <item quantity="one">Tunjukkan %d item yang tersembunyi</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Rangkaian &amp; Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, selular, penggunaan data, tempat liputan"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Rangkaian &amp; Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mudah alih, penggunaan data, tempat liputan"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Peranti yang disambungkan"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, hantar"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apl &amp; pemberitahuan"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Pengguna &amp; akaun"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Apl lalai"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Bahasa, sandaran, kemas kini, perihal telefon"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Bahasa, sandaran, kemas kini perihal peranti"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Tetapan"</string>
     <string name="search_menu" msgid="6283419262313758339">"Tetapan carian"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Tetapan carian"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Hasil"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, sambungan rangkaian"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mesej teks, menghantar teks, mesej, pemesejan"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"selular, pembawa selular, wayarles, data, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"selular, mudah alih, pembawa selular, wayarles, data, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, panggil, panggilan"</string>
     <string name="keywords_home" msgid="3626170808219458848">"pelancar"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skrin, skrin sentuh"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Makluman"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Bergetar"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Bunyi semasa kuasa dihidupkan"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Pilihan jangan ganggu"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Benarkan keutamaan sahaja"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Peraturan automatik"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Tetapkan jadual Jangan Ganggu"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Nada pemberitahuan kerja lalai"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Nada dering penggera kerja lalai"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Sama seperti profil peribadi"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Gantikan bunyi profil kerja?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Gunakan bunyi profil peribadi?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Gantikan"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Bunyi profil kerja semasa akan digantikan dengan bunyi profil peribadi anda."</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Bunyi profil peribadi anda dan bukannya bunyi profil kerja semasa anda yang akan digunakan"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Nada dering"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Bunyi dan getaran lain"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Pilihan pemberitahuan"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Tiada kebenaran diberikan"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Tiada kebenaran diminta"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Semua apl"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Didayakan"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Apl yang dipasang"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Apl segera"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Peribadi"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Kerja"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Disekat"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Dengan URL domain"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Terperinci"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurasikan apl"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Apl tidak diketahui"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Lalai untuk kerja"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Input Bantu &amp; suara"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Apl Bantu"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Tiada"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Pilih apl Bantu"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Jadikan <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> pembantu anda?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Pembantu akan dapat membaca maklumat tentang apl yang digunakan pada sistem anda, termasuk maklumat yang kelihatan pada skrin anda atau yang dapat diakses dalam apl."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Setuju"</string>
@@ -2966,6 +2958,8 @@
     <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">"Pengoptimuman bateri"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Makluman penggunaan"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Tunjukkan semua apl"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Sembunyikan apl tambahan"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Tidak dioptimumkan"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Tidak dioptimumkan"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Mengoptimumkan penggunaan bateri"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Suhu warna sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan warna paparan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk mengenakan perubahan warna, matikan skrin"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Untuk menggunakan perubahan telephony monitor, but semula peranti"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Kemas kini sistem automatik"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL Terikat (memerlukan but semula)"</string>
     <string name="usage" msgid="2977875522080448986">"Penggunaan"</string>
@@ -3323,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Untuk menyemak pemberitahuan, leret ke bawah pada penderia cap jari di bahagian belakang telefon anda."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Untuk menyemak pemberitahuan, leret ke bawah pada penderia cap jari di bahagian belakang tablet anda."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Untuk menyemak pemberitahuan, leret ke bawah pada penderia cap jari di bahagian belakang peranti anda."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Gerak isyarat bantu"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Hidup"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Mati"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Pemuat but sudah dibuka"</string>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proksi HTTP global ditetapkan"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Pentadbir boleh mengunci peranti dan menetapkan semula kata laluan"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Pentadbir boleh memadamkan semua data peranti"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Pentadbir menetapkan bilangan percubaan kata laluan maksimum kepada <xliff:g id="COUNT_1">%d</xliff:g> sebelum memadamkan semua data peranti</item>
+      <item quantity="one">Pentadbir menetapkan bilangan percubaan kata laluan maksimum kepada <xliff:g id="COUNT_0">%d</xliff:g> sebelum memadamkan semua data peranti</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Pentadbir menetapkan bilangan percubaan kata laluan maksimum kepada <xliff:g id="COUNT_1">%d</xliff:g> sebelum memadamkan data profil kerja</item>
+      <item quantity="one">Pentadbir menetapkan bilangan percubaan kata laluan maksimum kepada <xliff:g id="COUNT_0">%d</xliff:g> sebelum memadamkan data profil kerja</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Peranti ini terurus."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Peranti ini diurus oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Ketahui lebih lanjut"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto &amp; Video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzik &amp; Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Permainan"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Apl lain"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fail"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Pengurus Storan: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Mati"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Hidup"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Permainan"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fail audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(dinyahpasang untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dilumpuhkan untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Apl autolengkap"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index b7789ee..9a922a4 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"တည်နေရာ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"အကောင့်များ"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"လုံခြုံရေးနှင့် မျက်နှာပြင်လော့ခ်"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"အသွင်ဝှက်ခြင်းနှင့် အထောက်အထားများ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"စကားဝှက်များ"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"ကန့်သတ်ရန် ဆက်တင်"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"စီမံခန့်ခွဲသူမှ ပိတ်ထားသည်"</string>
     <string name="security_status_title" msgid="5848766673665944640">"လုံခြုံရေး အခြေအနေ"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"တည်နေရာ၊ လက်ဗွေ"</string>
@@ -669,7 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"ကြိုးမဲ့ကို ရွေးချယ်ရန်"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"ဝိုင်ဖိုင်ဖွင့်နေသည် …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"ဝိုင်ဖိုင်ပိတ်နေသည် …"</string>
-    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"ကွန်ရက်များအားလုံးကို ကြည့်ရန်"</string>
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"ကွန်ရက်အားလုံးကို ကြည့်ရန်"</string>
     <string name="wifi_error" msgid="3207971103917128179">"အမှား"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz ဘန်းဤနိုင်ငံတွင်မရပါ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"လေယာဉ်ပျံပေါ်သုံးစနစ်"</string>
@@ -1260,7 +1261,7 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ဘလူးတုသ်တဆင့်ပြန်ချိတ်ဆက်"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"တဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"ဟော့စပေါ့နှင့် မိုဘိုင်း"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ဟော့စပေါ့ကို ဖွင့်ထားသည်။ မိုဘိုင်းဖုန်းကို မိုဒမ်အဖြစ် အသုံးပြုခြင်း"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ဟော့စပေါ့ကို ဖွင့်ထားသည်။ မိုဘိုင်းဖုန်းကို မိုဒမ်အဖြစ် အသုံးပြုနေသည်"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ဟော့စပေါ့ကို ဖွင့်ထားသည်"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"မိုဘိုင်းဖုန်းကို မိုဒမ်အဖြစ် အသုံးပြုခြင်း"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ဒေတာချွေတာမှုစနစ် ဖွင့်ထားစဉ်တွင် ထုတ်လွှင့်၍မရပါ သို့မဟုတ် ရွှေ့ပြောင်းဟော့စပေါ့ကို အသုံးပြု၍မရပါ"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"စက်ပစ္စည်းမျက်နှာပြင်လော့ခ်နှင့် အတူတူပင်ဖြစ်သည်"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"အပ်ပလီကေးရှင်းများအား စီမံခြင်း"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ထည့်သွင်းထားသောအပ်ပလီကေးရှင်းများကို စီမံခြင်းနှင့် ဖယ်ခြင်း"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"အက်ပ်အချက်အလက်များ"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"အပလီကေးရှင်းများကို စီမံမည်။ အမြန်သုံးနိုင်သောအတိုကောက်များကို ဖွင့်ခြင်းအား သတ်မှတ်မည်"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"အပ်ပလီကေးရှင်းဆက်တင်များ"</string>
     <string name="install_applications" msgid="4872012136210802181">"မူရင်းမသိရသော အရင်းအမြစ်များ"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"နေရာလွတ်အား စီမံနေသည်"</string>
     <string name="filter" msgid="2018011724373033887">"စီစစ်ရန်"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"စီစစ်ရန် ရွေးချယ်စရာများကို ရွေးပါ"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"အားလုံး"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"သုံးမရအောင် ပိတ်ထားသည်"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"အက်ပ်များ အားလုံး"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"ပိတ်ထားသော အက်ပ်များ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ဒေါင်းလုပ်ပြုလုပ်ပြီး"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"အလုပ်လုပ်နေသည်"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USBသိုလှောင်ကိရိယာ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD ကဒ်ပေါ်တွင်"</string>
     <string name="disabled" msgid="9206776641295849915">"ပိတ်ထားပြီး"</string>
     <string name="not_installed" msgid="2797554494953450291">"ဤအသုံးပြုသူအတွက် ထည့်သွင်းမထားပါ"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"ထည့်သွင်းထားသည်"</string>
     <string name="no_applications" msgid="7336588977497084921">"အက်ပ်များ မရှိပါ"</string>
     <string name="internal_storage" msgid="1584700623164275282">"စက်တွင်း သိုလှောင်ထားမှု"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"စက်အတွင်းသိမ်းဆည်းရန်နေရာ"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"ထည့်သွင်းရန်နည်းလမ်းများကို သတ်မှတ်ခြင်း"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"ဆက်တင်များ"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"ဆက်တင်များ"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"ရနိုင်သောထည့်သွင်းရန်နည်းလမ်းများ"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"စနစ်ဘာသာစကားများကို အသုံးပြုပါ"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>ဆက်တင်များ"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"ရရှိနိုင်သောထည့်သွင်းရန်နည်းလမ်းများ"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ဖန်မျက်နှာပြင်ပေါ်ရှိကီးဘုတ် ဆက်တင်များ"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"မျက်နှာပြင်ချဲ့မှု အော်တိုအပ်ဒိတ်"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"အက်ပ် အပြောင်းတွင်မျက်နှာပြင်ချဲ့မှုအပ်ဒိတ်လုပ်ရန်"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ဖွင့်ပိတ်ခလုတ်နှိပ်လျှင် ဖုန်းပြောရပ်ရန်"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"စကားဝှက်အားပြောပါ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"အကြီးစားမောက်စ်ညွှန်ပြပုံ"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"မိုနိုအသံ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"အသံဖွင့်နေစဉ် ချန်နယ်များကိုပေါင်းပါ"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"နောက်ဆုံး အားအပြည့် သွင်းမည့် အထိ သုံး"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"မျက်နှာပြင် အသုံးပြုမှု"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"မျက်နှာပြင် သုံးစွဲမှု"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"မိုဘိုင်းကွန်ရက် ရှာဖွေခြင်း"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးကတည်းက အက်ပ်အသုံးပြုမှု"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းကတည်းက စက်ပစ္စည်း အသုံးပြုမှု"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"အားသွင်းကြိုးဖြုတ်စဉ်မှဘတ္တရီအသုံးပြုနှုန်း"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ပြန်လည်အစမှလုပ်စဉ်မှ ဘက်ထရီအသုံးပြုမှု"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g>ကြာ ဘက်ထရီအသုံးပြုထားသည်"</string>
@@ -1923,9 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"အပိုရေတွက်မှု စွမ်းရည် အသုံးပြုမှု"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s ကြာ သုံးထားသည်"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"စုစုပေါင်း ဘက်ထရီ၏ %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"နောက်ဆုံးအကြိမ် အပြည့်အဝအားသွင်းခဲ့သည့် အချိန်မှစ၍ အသုံးပြုမှု ခွဲခြမ်းစိတ်ဖြာချက်"</string>
-    <string name="estimated_time_left" msgid="7514194472683370877">"ခန့်မှန်းကျန်ရှိချိန်"</string>
-    <string name="estimated_time_description" msgid="6722669204902760489">"အသုံးပြုမှုအပေါ် အခြေခံ၍ ခန့်မှန်းခြင်း ပြောင်းလဲနိုင်ပါသည်"</string>
+    <string name="estimated_time_left" msgid="7514194472683370877">"ခန့်မှန်း ကျန်ရှိချိန်"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"အားအပြည့်သွင်းရန်အတွက် ကြာချိန်"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"အသုံးပြုမှုအပေါ် အခြေခံ၍ ခန့်မှန်းသည့်အချိန် ပြောင်းလဲနိုင်ပါသည်"</string>
     <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>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\'အမြဲတမ်းဖွင့်ထားရန်\' ကို ပိတ်ထားသည်"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ဤအက်ပ်က ပံ့ပိုးမထားပါ"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"VPN မှတစ်ဆင့် ချိတ်ဆက်မှုများကိုသာ ခွင့်ပြုပါသည်"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN ချိတ်ဆက်မှု လိုအပ်ပါသလား။"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"ချိတ်ပိတ်ခြင်းကို ဖွင့်ထားသည်"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"ချိတ်ပိတ်ခြင်းကို ပိတ်ထားသည်"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"VPN ကိုယ်ရေးအချက်အလက်ကို အမြဲတမ်းချိတ်ဆက်ထားလျက် ရှိနေရန် ရွေးပါ။ ၎င်းသည် VPN ကို ချိတ်ဆက်ထားသောအခါမှသာ ကွန်ရက်အသွားအလာကို ခွင့်ပြုလိမ့်မည်။"</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"ကန့်သတ်ထားသော ကိုယ်ရေးအချက်အလက်များတွင် အကောင့်များ ထည့်၍မရပါ။"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"ဤစက်မှ <xliff:g id="USER_NAME">%1$s</xliff:g>ကို ဖျက်ရန်"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"လော့ခ်ချထားသော မျက်နှာပြင် ဆက်တင်များ"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"လော့ခ်မျက်နှာပြင်မှ အသုံးပြုသူများကို ထည့်ရန်"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"အသုံးပြုသူအသစ်"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"ကိုယ်ရေးအချက်အလက်အသစ်"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"သင့်ကို ဖယ်ရှားမလား။"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ဖုန်းခေါ်ဆိုမှုများ&amp; SMS ကို ဖွင့်မည်လား။"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ခေါ်ဆိုမှုနှင့် SMS မှတ်တမ်းကို ဤအသုံးပြုသူနှင့် မျှဝေပေးမည်။"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"အရေးပေါ်အချက်အလက်"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> အကြောင်း အချက်အလက်"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> အတွက် အချက်အလက်နှင့် အဆက်အသွယ်များ"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"အပလီကေးရှင်းနှင့် ပါရှိချက်များကို ခွင့်ပြုရန်"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ကန့်သတ်ချက်များရှိသော အပလီကေးရှင်းများ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"အပလီကေးရှင်းဆက်တင်းများကိုချဲ့ပြပါ"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">ဖျောက်ထားသည့် %d ခုကို ပြပါ</item>
       <item quantity="one">ဖျောက်ထားသည့် %d ခုကို ပြပါ</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"ကွန်ရက်နှင့် အင်တာနက်"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi၊ ဆယ်လူလာ၊ ဒေတာအသုံးပြုမှု၊ ဟော့စပေါ့"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"ကွန်ရက်နှင့် အင်တာနက်"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi၊ မိုဘိုင်း၊ ဒေတာအသုံးပြုမှု၊ ဟော့စပေါ့"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ချိတ်ဆက်ထားသော စက်ပစ္စည်းများ"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"ဘလူးတုသ်၊ NFC၊ ကာစ်"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"အက်ပ်များနှင့် အကြောင်းကြားချက်များ"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"ရလဒ်များ"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"Wi-Fi ၊ Wi-Fi ၊ ကွန်ယက်ချိတ်ဆက်မှု"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"စာတို၊ စာတိုရိုက်ခြင်း၊ စာများ၊ စာပို့ခြင်း"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"ဆဲလ်လူလာ၊ ဆဲလ်မိုဘိုင်းဆက်သွယ်ရေး ဝန်ဆောင်မှု၊ ကြိုးမဲ့၊ ဒေတာ၊ 4g၊ 3g၊ 2g၊ lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ဆယ်လူလာ၊ မိုဘိုင်းဆက်သွယ်ရေး ဝန်ဆောင်မှု၊ ကြိုးမဲ့၊ ဒေတာ၊ 4g၊ 3g၊ 2g၊ lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"Wi-Fi ၊ Wi-Fi ၊ ခေါ်ဆိုမှု၊ ခေါ်ဆိုခြင်း"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ဖွင့်တင်ပေးသူ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"မျက်နှာပြင်၊ ထိတွေ့မှုမျက်နှာပြင်"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"သတိပေးချက်"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"တုန်ခါရန်"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"အသံများ ဖွင့်ထားပါ"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"\'မနှောင့်ယှက်ရ\' ဦးစားပေးများ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ဦးစားပေးများသာ ခွင့်ပြုရန်"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"အလိုအလျောက်စည်းမျဉ်းများ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"မနှောင့်ယှက်ရမည့် အချိန်ဇယားကို သတ်မှတ်ပါ"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"မူရင်းအလုပ်အကြောင်းကြားချက်အသံ"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"မူရင်းအလုပ်သတိပေးချက် မြည်သံ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ကိုယ်ရေးကိုယ်တာပရိုဖိုင်အတိုင်းထားပါ"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"အလုပ်၏အသံများကို အစားထိုးမလား။"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ကိုယ်ရေး ပရိုဖိုင်အသံများကို သုံးလိုပါသလား။"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"အစားထိုးရန်"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"သင့်လက်ရှိအလုပ်ပရိုဖိုင်ဆိုင်ရာ အသံများကို သင်၏ကိုယ်ရေးကိုယ်တာပရိုဖိုင်ဆိုင်ရာအသံများနှင့် အစားထိုးလိုက်ပါမည်။"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"သင်၏ လက်ရှိ အလုပ်ပရိုဖိုင်အသံများအစား ကိုယ်ရေး ပရိုဖိုင်အသံများကို အသုံးပြုသွားပါမည်"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ဖုန်းမြည်သံများ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"အခြားအသံနှင့် တုန်ခါမှုများ"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"အကြောင်းကြားချက် ရွေးချယ်မှု"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ခွင့်ပြုထားသော ခွင့်ပြုချက်များ မရှိပါ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"တောင်းခံထားသော ခွင့်ပြုချက်များ မရှိပါ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"အက်ပ်များ အားလုံး"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"ဖွင့်ထား"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ထည့်သွင်းထားသည့် အက်ပ်များ"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ချက်ခြင်းသုံး အက်ပ်များ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ကိုယ်ရေး"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"အလုပ်"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ပိတ်ဆို့ထား"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ဒိုမိန်း URL များဖြင့်"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"အဆင့်မြင့်"</string>
     <string name="configure_apps" msgid="6685680790825882528">"အက်ပ်များ များ ပုံစံပြင်သတ်မှတ်ပါ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"အမည်မသိ အက်ပ်"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"အလုပ်အတွက် မူရင်း"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"အကူအညီ &amp; အသံဖြင့်စာရိုက်ခြင်း"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"အကူအညီပေးရေး အက်ပ်"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"မရှိ"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"ကူညီရေး အက်ပ်ကို ရွေးပါ"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> အား သင့်လက်ထောက်အဖြစ် ပြုမည်လား?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"ကူညီပေးသူသည် သင်၏ စနစ်ထဲတွင် သုံးနေသည့် အက်ပ်များ အကြောင်း အချက်အလက်များကို၊ သင်၏ မျက်နှာပြင် ပေါ်တွင် မြင်ရသည့် သို့မဟုတ် အက်ပ်များ အထဲတွင် ရယူသုံးနိုင်သည့် အချက်အလက်များ အပါအဝင်ကို၊ ဖတ်ရှုနိုင်မည်။"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"အိုကေ"</string>
@@ -2959,6 +2958,8 @@
     <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">"ဘက်ထရီအား သင့်မြတ်အောင် လုပ်ကိုင်မှု"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"သုံးစွဲမှုသတိပေးချက်များ"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"အက်ပ်အားလုံးပြရန်"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"အပိုအက်ပ်များကို ဝှက်ရန်"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"သင့်မြတ်အောင် မလုပ်ရသေး"</string>
     <string name="high_power_on" msgid="6216293998227583810">"သင့်မြတ်အောင် မလုပ်ရသေး"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ဘက်ထရီ အသုံးပြုမှု သင့်မြတ်အောင် လုပ်နေ"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"အေးသည့် အရောင်အပူချိန်"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ပိုအေးသည့် မျက်နှာပြင် အရောင်များကိုအသုံးပြုရန်"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"အရောင်ပြောင်းလဲမှု ပြုလုပ်ရန်၊ မျက်နှာပြင်ကိုပိတ်ပါ"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"တယ်လီဖုန်း ဆက်သွယ်မှုမော်နီတာကို ပြောင်းလဲမှု ပြုလုပ်ရန် စက်ပစ္စည်းကို ပြန်လည်စတင်ပါ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"အလိုအလျောက် စနစ်အပ်ဒိတ်များ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"ပေါင်းစည်းထားသည့် HALs (ပြန်လည် အစပြုရန် လိုအပ်ပါသည်)"</string>
     <string name="usage" msgid="2977875522080448986">"အသုံးပြုမှု"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"ဟန်ကို အထောက်အကူပေးရန်"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ကမ္ဘာသုံး HTTP ပရောက်စီကို သတ်မှတ်ထားပါသည်"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"စီမံခန့်ခွဲသူသည် စက်ပစ္စည်းကို လော့ခ်ချနိုင်ပြီး စကားဝှက်ကို ပြင်ဆင်သတ်မှတ်နိုင်ပါသည်"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"စီမံခန့်ခွဲသူသည် စက်ပစ္စည်းဒေတာများအားလုံးကို ဖျက်နိုင်ပါသည်"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">စက်ပစ္စည်းဒေတာများအားလုံးကို မဖျက်မီ စကားဝှက်စမ်းသပ်ထည့်သွင်းခြင်းကို <xliff:g id="COUNT_1">%d</xliff:g> ကြိမ်အထိ ခွင့်ပြုရန် စီမံခန့်ခွဲသူက သတ်မှတ်ထားပါသည်</item>
+      <item quantity="one">စက်ပစ္စည်းဒေတာများအားလုံးကို မဖျက်မီ စကားဝှက်စမ်းသပ်ထည့်သွင်းခြင်းကို <xliff:g id="COUNT_0">%d</xliff:g> ကြိမ်အထိ ခွင့်ပြုရန် စီမံခန့်ခွဲသူက သတ်မှတ်ထားပါသည်</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"ဤစက်ပစ္စည်းကို စီမံခန့်ခွဲထားပါသည်။"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ဤစက်ပစ္စည်းကို <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> က စီမံခန့်ခွဲထားပါသည်။"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ပိုမိုလေ့လာရန်"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ဓာတ်ပုံနှင့် ဗီဒီယိုများ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"တေးဂီတနှင့် အသံ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ဂိမ်းများ"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"အခြားအက်ပ်များ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ဖိုင်များ"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"သိုလှောင်ခန်း စီမံခန့်ခွဲမှုစနစ်− <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ပိတ်ထားသည်"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ဖွင့်ထားသည်"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ဂိမ်းများ"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"အသံဖိုင်များ"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"ဂီတ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(အသုံးပြုသူ <xliff:g id="USER">%s</xliff:g> အတွက် ဖြုတ်ထားသည်)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(အသုံးပြုသူ <xliff:g id="USER">%s</xliff:g> အတွက် ပိတ်ထားသည်)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"အလိုအလျောက် ဖြည့်စွက်ခြင်းအက်ပ်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3d357bd..a1efa61 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Posisjon"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontoer"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Sikkerhet og skjermlås"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Kryptering og legitimasjon"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Posisjon, skjermlås, SIM-kort-lås"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Passord"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Personvern"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Deaktivert av administratoren"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Sikkerhetsstatus"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Posisjon, fingeravtrykk"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Velg Wi-Fi-nettverk"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Slår på Wi-Fi …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Slår av Wi-Fi …"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Se alle nettverk"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Feil"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz-bånd er ikke tilgjengelig i dette landet"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"I flymodus"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-internettdeling"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Internettdeling"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Wi-Fi-sone og internettdeling"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Wi-Fi-sone på, internettdeling"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Wi-Fi-sone på"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Internettdeling"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kan ikke bruke internettdeling eller flyttbare Wi-Fi-soner mens Datasparing er på"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-internettdeling"</string>
@@ -1311,7 +1308,7 @@
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Bare enheten"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Posisjon er slått av"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Tillatelser på appnivå"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nylige stedsforespørsler"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nylige posisjonsforespørsler"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ingen apper har bedt om posisjonen din i det siste"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Posisjonstjenester"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Høy batteribruk"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Den samme som enhetslåsen"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apper"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerte apper"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"App-info"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrer apper, angi snarveier for hurtigstart"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Innstillinger for app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukjente kilder"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Styr plass"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Velg filteralternativer"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Slått av"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Alle apper"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Apper som er slått av"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Tredjeparts"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kjører"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På minnekort"</string>
     <string name="disabled" msgid="9206776641295849915">"Slått av"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ikke installert for brukeren"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Installert"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ingen apper."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"Intern lagring"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Konfigurer inndatametoder"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Innstillinger"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Innstillinger"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktive inndatametoder"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Bruk systemspråk"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Innstillinger for <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Velg aktive inndatametoder"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Innstillinger for skjermtastatur"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatisk oppdatering av skjermforstørrelsen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Oppdater skjermforstørrelsen ved appbytter"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Legg på med av/på-knappen"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Les inn passord"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Stor markør for mus/styreflate"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monolyd"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombiner kanaler når du spiller av lyd"</string>
@@ -1837,7 +1829,11 @@
     <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> gjenstår"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Batteriet er fulladet om <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Bruk siden forrige fullading"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Skjermbruk"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Strømforbruk fra skjermen"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Skanning etter mobilnettverk"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Appbruk siden sist batteriet var fulladet"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Enhetsbruk siden sist batteriet var fulladet"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteribruk siden strømmen ble trukket ut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteribruk siden omstart"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> på batteri"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overberegnet strømforbruk"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Brukt i %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s av total batteribruk"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Oversikt over bruk siden sist batteriet var fulladet"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Anslått tid som er igjen"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tid for full opplading"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Anslaget kan endres basert på bruk"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siste gang uten strøm i <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total bruk"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Alltid på er inaktiv"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Støttes ikke av denne appen"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Tillat bare tilkoblinger via VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Vil du kreve VPN-tilkobling?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Låsing aktiv"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Låsing inaktiv"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Velg en VPN-profil du vil forbli tilkoblet til. Nettverkstrafikk blir bare tillatt når du er tilkoblet denne VPN-en."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Begrensede profiler kan ikke legge til kontoer"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Slett <xliff:g id="USER_NAME">%1$s</xliff:g> fra denne enheten"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Innstillinger for låseskjermen"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Legg til brukere fra låseskjermen"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Ny bruker"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Ny profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vil du slette deg selv?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vil du slå på telefonsamtaler og SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Anrops- og tekstmeldingsloggen deles med denne brukeren."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informasjon for nødstilfeller"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informasjon om <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informasjon og kontakter for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillat apper og innhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apper med begrensninger"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utvidelsesinnstillinger for appen"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">Vis %d skjulte elementer</item>
       <item quantity="one">Vis %d skjult element</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Nettverk og Internett"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobilnett, databruk, Wi-Fi-sone"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Nettverk og Internett"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, databruk, Wi-Fi-sone"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Tilkoblede enheter"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apper og varsler"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Bruker og kontoer"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Standardapper"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Språk, sikkerhetskopiering, oppdateringer, om telefonen"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Språk, sikkerhetskopiering, oppdateringer, om enheten"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Innstillinger"</string>
     <string name="search_menu" msgid="6283419262313758339">"Søkeinnstillinger"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Søkeinnstillinger"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultater"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, Wi-Fi, nettverkstilkobling"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, sende tekstmelding, meldinger, sende meldinger"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobil, mobiloperatør, trådløs, data, 4G, 3G, 2G, LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilnett, mobil, mobiloperatør, trådløs, data, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, Wi-Fi, ring, ringing"</string>
     <string name="keywords_home" msgid="3626170808219458848">"appoversikt"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skjerm, berøringsskjerm"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Varsel"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrer"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Lyder ved oppstart"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Instillinger for Ikke forstyrr"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritet tillater bare"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Angi timeplan for Ikke forstyrr"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Standard varsellyd for jobb"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Standard alarmlyd for jobb"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Samme som den personlige profilen"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Bytte lyder for jobbprofilen?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Vil du bruke lyder for den personlige profilen din?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Erstatt"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"De nåværende lydene for jobbprofilen din blir byttet ut med lydene for den personlige profilen din"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Lydene for den personlige profilen din brukes i stedet for de nåværende lydene for jobbprofilen din"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Ringelyder"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Andre lyder og vibrasjoner"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Innstillinger for varsler"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Ingen tillatelser er gitt"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Ingen tillatelser er forespurt"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle apper"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Slått på"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Installerte apper"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant-apper"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personlig"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Jobb"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokkert"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med nettadresser på domenet"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avansert"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurer apper"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukjent app"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Jobbstandard"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistent og taleinndata"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Assistentapp"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ingen"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Velg assistentapp"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Vil du at <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> skal være assistenten din?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Assistenten kan lese informasjon om appene du bruker i systemet ditt, inkludert informasjon som er synlig på skjermen eller tilgjengelig i appene."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Godta"</string>
@@ -2966,6 +2958,8 @@
     <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">"Batterioptimalisering"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Bruksvarsler"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Vis alle apper"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Skjul ekstra apper"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ikke optimalisert"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ikke optimalisert"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimaliserer batteribruken"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kald fargetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Bruk kaldere skjermfarger"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"For å bruke fargeendringen, slå av skjermen"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Start enheten på nytt for å aktivere endringene i telefonmonitoren"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiske systemoppdateringer"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Sammensatte HAL-er (krever omstart)"</string>
     <string name="usage" msgid="2977875522080448986">"Bruk"</string>
@@ -3323,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"For å sjekke varslene dine, sveip ned på fingeravtrykksensoren på baksiden av telefonen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"For å sjekke varslene dine, sveip ned på fingeravtrykksensoren på baksiden av nettbrettet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"For å sjekke varslene dine, sveip ned på fingeravtrykksensoren på baksiden av enheten."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Assistansebevegelse"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"På"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Av"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Oppstartsinnlasteren er allerede låst opp"</string>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy-tjener er angitt"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratoren kan låse enheten og tilbakestille passordet"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratoren kan slette alle enhetsdata"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administratoren har angitt maksimalt antall forsøk på å oppgi passord til <xliff:g id="COUNT_1">%d</xliff:g> før alle enhetsdataene slettes</item>
+      <item quantity="one">Administratoren har angitt maksimalt antall forsøk på å oppgi passord til <xliff:g id="COUNT_0">%d</xliff:g> før alle enhetsdataene slettes</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administratoren har angitt maksimalt antall forsøk på å oppgi passord til <xliff:g id="COUNT_1">%d</xliff:g> før alle enhetsdataene slettes</item>
+      <item quantity="one">Administratoren har angitt maksimalt antall forsøk på å oppgi passord til <xliff:g id="COUNT_0">%d</xliff:g> før alle enhetsdataene slettes</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Denne enheten administreres."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Denne enheten administreres av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Finn ut mer"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Bilder og videoklipp"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musikk og lyd"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Spill"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andre apper"</string>
     <string name="storage_files" msgid="8581083146777364063">"Filer"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagringsadministrator: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Av"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"På"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Spill"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Lydfiler"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musikk"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(avinstallert for brukeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(slått av for brukeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Autofyll-app"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 7694c82..88497bf 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाताहरू"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"सुरक्षा र स्क्रिन लक"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"इन्क्रिप्सन र प्रमाणहरू"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"मेरो स्थान, स्क्रिन अनलक, SIM कार्ड लक, प्रामाणिक भण्डारण लक सेट गर्नुहोस्"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरो स्थान, स्क्रिन अनलक, भण्डारण लकका गोप्य डेटा सेट गर्नुहोस्"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"पासवर्डहरू"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"गोपनीयता"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"प्रशासकद्वारा असक्षम पारियो"</string>
     <string name="security_status_title" msgid="5848766673665944640">"सुरक्षाको स्थिति"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"स्थान, फिंगरप्रिन्ट"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fi चयन गर्नुहोस्"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi खुला गर्दै..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi निष्क्रिय पार्दै..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"सबै नेटवर्कहरू हेर्नुहोस्"</string>
     <string name="wifi_error" msgid="3207971103917128179">"त्रुटि"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"यो देशमा ५ GHz व्यान्ड उपलब्ध छैन"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"हवाइजहाज मोडमा"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लुटुथ टेथर गर्दै"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टेदर गर्दै"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"हटस्पट र टेदरिङ"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"हटस्पट सक्रिय छ, टेदरिङ"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"हटस्पट सक्रिय छ"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"टेदरिङ"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"डेटा सेभर अन हुँदा टेदरिङ वा पोर्टेबल हटस्पटहरूको प्रयोग गर्न सक्दैन"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB टेदर गर्दै"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"यन्त्रको स्क्रिन लक जस्तै"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"अनुप्रयोगहरू व्यवस्थापन गर्नुहोस्"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"स्थापित अनुप्रयोगहरू प्रबन्ध गर्नुहोस् र हटाउनुहोस्"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"अनुप्रयोगको जानकारी"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"अनुप्रयोगहरू प्रबन्ध गर्नुहोस्, छिटो लन्च सर्टकटहरू सेटअप गर्नुहोस्"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"अनुप्रयोग सेटिङहरू"</string>
     <string name="install_applications" msgid="4872012136210802181">"अज्ञात स्रोतहरू"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"ठाउँको प्रबन्ध गर्नुहोस्"</string>
     <string name="filter" msgid="2018011724373033887">"फिल्टर गर्नुहोस्"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"फिल्टर विकल्पहरू छान्नुहोस्"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"सबै"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"असक्षम पारियो"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"सबै अनुप्रयोगहरू"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"असक्षम पारिएका अनुप्रयोगहरू"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"डाउनलोड गरियो"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"चालु"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB भण्डारण"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD कार्डमा"</string>
     <string name="disabled" msgid="9206776641295849915">"असक्षम पारियो"</string>
     <string name="not_installed" msgid="2797554494953450291">"यो प्रयोगकर्ताको लागि स्थापित गरिएको छैन"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"स्थापना गरियो"</string>
     <string name="no_applications" msgid="7336588977497084921">"कुनै अनुप्रयोगहरू छैनन्"</string>
     <string name="internal_storage" msgid="1584700623164275282">"आन्तरिक भण्डारण"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"आन्तरिक भण्डारण"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"इनपुट विधिहरू सेटअप गर्नुहोस्"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"सेटिङहरू"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"सेटिङहरू"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"आगत विधिहरू सक्रिय गर्नुहोस्"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"प्रणालीका भाषाहरू प्रयोग गर्नुहोस्"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> सेटिङहरू"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"सक्रिय इनपुट विधिहरू चयन गर्नुहोस्"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"स्क्रिनमा किबोर्ड सेटिङहरू"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"स्क्रिन आवर्धन स्वतः अपडेट गर्नुहोस्"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"अनुप्रयोग ट्रान्जिसनहरूमा स्क्रिन आवर्धन अपडेट गर्नुहोस्"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"पावर बटनले कल समाप्त गर्दछ"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"पासवर्डहरू भन्नुहोस्"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"ठूलो माउस पोइन्टर"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"मोनो अडियो"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"अडियो प्ले गर्दा च्यानलहरूलाई संयोजन गर्नुहोस्"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"पूर्ण रूपले चार्जपछि प्रयोग गर्नुहोस्"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"स्क्रिनले गरेको पावरको प्रयोग"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रिनले गरेको पावरको खपत"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्क्यान गर्ने कार्य"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"पछिल्लो पटक पूर्ण रूपले चार्ज भएयता अनुप्रयोगको प्रयोग"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"पछिल्लो पटक पूर्ण रूपले चार्ज भएयता यन्त्रको प्रयोग"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग भएदेखि ब्याट्री प्रयोग"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"पुनःसेट गरेदेखि ब्याट्री प्रयोग"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> ब्याट्रिमा"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"बढी गिन्ती गरिएको उर्जा प्रयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s को लागि प्रयोग गरियो"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"समग्र ब्याट्रीको %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"पछिल्लो पटक पूरा चार्ज भए देखि ब्याट्रीको प्रयोग ब्रेकडाउन भयो"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"अनुमानित बाँकी समय"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"पूर्ण रूपले चार्ज हुन लाग्ने समय"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"प्रयोगको आधारमा तपाईंको अनुमान सही नहुन पनि सक्छ"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"सधैँ-सक्रिय भन्ने सुविधा निष्क्रिय छ"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"यो अनुप्रयोगले समर्थन गर्दैन"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"VPN मार्फत मात्र जडानहरूलाई अनुमति दिनुहोस्"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN जडान आवश्यक छ?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"लकडाउन सक्रिय छ"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"लकडाउन निष्क्रिय छ"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"सधैँ जडान भइरहन VPN प्रोफाइल चयन गर्नुहोस्। यस VPN जडान भएको बेला नेटवर्क ट्राफिकलाई मात्र अनुमति हुने छ।"</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"निषेध लगाइएको प्रोफाइलले खाताहरू थप गर्न सक्दैन"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"यस उपकरणबाट <xliff:g id="USER_NAME">%1$s</xliff:g> हटाउनुहोस्"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"लक स्क्रिन सेटिङहरू"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"लक स्क्रिनबाट प्रयोगकर्ताहरू थप्नुहोस्"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"नयाँ प्रयोगकर्ता"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"नयाँ प्रोफाइल"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"आफैंलाई हटाउने हो?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फोन कल तथा SMS सक्षम गर्ने हो?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"कल र SMS इतिहास यो प्रयोगकर्तासँग साझेदारी गरिने छ।"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आपतकालीन सूचना"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> को बारेमा जानकारी"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> का बारेमा जानकारी र सम्पर्क ठेगानाहरू"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"अनुप्रयोगहरू र सामग्री अनुमति दिनुहोस्"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबन्धको साथ अनुप्रयोगहरू"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"अनुप्रयोगको लागि सेटिङहरू विस्तार गर्नुहोस्"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">लुकाइएका %d वस्तुहरू देखाउनुहोस्</item>
       <item quantity="one">लुकाइएको %d वस्तु देखाउनुहोस्</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"नेटवर्क र इन्टरनेट"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, सेलुलर, डेटा उपयोग, हटस्पट"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क र इन्टरनेट"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, मोबाइल, डेटाको प्रयोग, हटस्पट"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"जडान गरिएका यन्त्रहरू"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"ब्लुटुथ, NFC, cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अनुप्रयोग सम्बन्धी &amp; सूचनाहरू"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"प्रयोगकर्ता रamp; खाता"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"पूर्वनिर्धारित अनुप्रयोगहरू"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"भाषाहरू, ब्याकअप, अद्यावधिकहरू, फोनको बारेमा"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"भाषाहरू, ब्याकअप, अद्यावधिकहरू, यन्त्रको बारेमा"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिङहरू"</string>
     <string name="search_menu" msgid="6283419262313758339">"खोज सेटिङहरू"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"खोज सेटिङहरू"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"परिणामहरू"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, नेटवर्क जडान"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"पाठ सन्देश, पाठ सन्देश पठाउने, सन्देशहरू, सन्देश प्रवाह"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"सेलुलर, सेल वाहक, वायरलेस, डेटा, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"सेलुलर, मोबाइल, सेल वाहक, वायरलेस, डेटा, 4G, 3G, 2G, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, कल गर्नुहोस्, कल गर्दै"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लन्चर"</string>
     <string name="keywords_display" msgid="8910345814565493016">"स्क्रिन, टचस्क्रिन"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"सतर्कता"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"भाइब्रेट"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"यन्त्र सक्रिय हुँदाका ध्वनिहरू"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"बाधा नपुर्याउँनुहोस् का प्राथमिकता"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"प्राथमिकताले मात्र अनुमति  दिन्छ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"स्वचालित नियमहरू"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"बाधा नपुर्याउने मोडको कार्यतालिका सेट गर्नु"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"कार्य सम्बन्धी सूचनाको पूर्वनिर्धारित टोन"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"कार्य सम्बन्धी अलार्मको पूर्वनिर्धारित रिङटोन"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"व्यक्तिगत प्रोफाइलको जस्तै"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"कार्य प्रोफाइलका ध्वनिहरूलाई प्रतिस्थापन गर्ने हो?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"व्यक्तिगत प्रोफाइका ध्वनिहरूको प्रयोग गर्ने हो?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"प्रतिस्थापन गर्नुहोस्"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"तपाईँको हालको कार्य प्रोफाइलका ध्वनिहरूलाई तपाईँको व्यक्तिगत प्रोफाइलका ध्वनिहरूले प्रतिस्थापन गरिनेछ"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"तपाईंको हालको कार्य प्रोफाइलका ध्वनिहरूको सट्टामा तपाईंको व्यक्तिगत प्रोफाइलमाका ध्वनिहरूको प्रयोग हुनेछ"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"रिङटोनहरू"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ध्वनि र कम्पन सम्बन्धी अन्य कुराहरू"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"सूचना सम्बन्धी प्राथमिकताहरू"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"कुनै अनुमतिहरू प्रदान गरिएको छैन"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"कुनै अनुमतिहरू अनुरोध गरिएको छैन"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"सबै अनुप्रयोगहरू"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"सक्षम गरियो"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"स्थापना गरिएका अनुप्रयोगहरू"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"तात्कालिक अनुप्रयोगहरू"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"रोकियो"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URLहरू मार्फत"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"उन्नत"</string>
     <string name="configure_apps" msgid="6685680790825882528">"अनुप्रयोगहरू कन्फिगर गर्नुहोस्"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अनुप्रयोग"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"कार्यका लागि पूर्वनिर्धारित"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"सहायक; आवाज इनपुट"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"सहायक अनुप्रयोग"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"कुनै पनि होइन"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"सहायक अनुप्रयोग छान्नुहोस्"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>लाई आफ्नो सहायक बनाउन चाहनुहुन्छ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"तपाईँको स्क्रिनमा देखिने वा अनुप्रयोगहरू भित्र पहुँचयोग्य जानकारी लगायत यो सहायकले तपाईँको प्रणालीमा प्रयोगमा रहेका अनुप्रयोगहरूकाबारे जानकारी पढ्न सक्षम हुनेछ।"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"सहमत छु"</string>
@@ -2966,6 +2958,8 @@
     <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">"ब्याट्री आफू अनुकूल"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ब्याट्रीको प्रयोग सम्बन्धी अलर्ट"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"सबै अनुप्रयोगहरू देखाउनुहोस्"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"अतिरिक्त अनुप्रयोगहरू लुकाउनु"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"आफू अनुकूल भएको छैन"</string>
     <string name="high_power_on" msgid="6216293998227583810">"आफू अनुकूल नगरिएको"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ब्याट्री प्रयोग आफू अनुकूल गर्दै"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"सुन्दर रंगको तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"अझ सुन्दर प्रदर्शनको रंगहरू प्रयोग गर्नुहोस्"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंगको परिवर्तन लागू गर्न स्क्रिन बन्द गर्नुहोस्"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलिफोनी मनिटरमा गरिएको परिवर्तनलाई लागू गर्न यन्त्रलाई पुनःबुट गर्नुहोस्"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वचालित प्रणाली अद्यावधिकहरू"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (पुन: बुट गर्नु आवश्यक छ)"</string>
     <string name="usage" msgid="2977875522080448986">"उपयोग"</string>
@@ -3325,6 +3320,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"सहायतामूलक इसारा"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3386,12 +3383,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"विश्वव्यापी HTTP प्रोक्सी सेट गरियो"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"प्रशासकले यन्त्र लक गर्न तथा पासवर्ड रिसेट गर्न सक्नुहुनेछ"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"प्रशासकले यन्त्रका सबै डेटा मेट्न सक्नुहुन्छ"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">प्रशासकले यन्त्रको सम्पूर्ण डेटा मेट्नुभन्दा पहिले पासवर्ड प्रविष्ट गर्ने अधिकतम प्रयासहरूको संख्यालाई <xliff:g id="COUNT_1">%d</xliff:g> पटकमा सेट गर्नुभएको छ</item>
+      <item quantity="one">प्रशासकले यन्त्रको सम्पूर्ण डेटा मेट्नुभन्दा पहिले पासवर्ड प्रविष्ट गर्ने अधिकतम प्रयासहरूको संख्यालाई <xliff:g id="COUNT_0">%d</xliff:g> पटकमा सेट गर्नुभएको छ</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"यो यन्त्र यसको मालिकले व्यवस्थापन गर्दछ।"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"यो यन्त्र <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ले व्यवस्थापन गर्दछ।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"थप जान्नुहोस्"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"तस्बिर र भिडियोहरू"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"संगीत र अडियो"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"खेलहरू"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"अन्य अनुप्रयोगहरू"</string>
     <string name="storage_files" msgid="8581083146777364063">"फाइलहरू"</string>
@@ -3402,9 +3409,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"भण्डारणको प्रबन्धक: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"निष्क्रिय"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"सक्रिय"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"खेलहरू"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"अडियो फाइलहरू"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"संगीत"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि स्थापना रद्द गरियो)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि असक्षम पारियो)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"स्वत: भरण अनुप्रयोग"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 85e6f5d..9954a8c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Locatie"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Beveiliging en schermvergrendeling"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Versleuteling en gegevens"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"\'Mijn locatie\', schermontgrendeling, SIM- en certificaatopslagvergrendeling instellen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, certificaatopslag vergrendelen"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Wachtwoorden"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Uitgeschakeld door beheerder"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Beveiligingsstatus"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Locatie, vingerafdruk"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Hetzelfde als de apparaatschermvergrendeling"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps beheren"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Geïnstalleerde apps beheren en verwijderen"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"App-info"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Apps beheren, sneltoetsen voor snelstarten instellen"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"App-instellingen"</string>
     <string name="install_applications" msgid="4872012136210802181">"Onbekende bronnen"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Ruimte beheren"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filteropties kiezen"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Alles"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Uitgeschakeld"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Alle apps"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Uitgeschakelde apps"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Gedownload"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Wordt uitgevoerd"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-opslag"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Op SD-kaart"</string>
     <string name="disabled" msgid="9206776641295849915">"Uitgeschakeld"</string>
     <string name="not_installed" msgid="2797554494953450291">"Niet geïnstalleerd voor deze gebruiker"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Geïnstalleerd"</string>
     <string name="no_applications" msgid="7336588977497084921">"Geen apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interne opslag"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"interne opslag"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Invoermethoden instellen"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Instellingen"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Instellingen"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Actieve invoermethoden"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Systeemtalen gebruiken"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Instellingen voor <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Actieve invoermeth. selecteren"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Instellingen voor schermtoetsenbord"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Schermvergroting automatisch updaten"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Schermvergroting updaten bij app-overgangen"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Aan/uit-knop beëindigt oproep"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Wachtwoorden voorlezen"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Grote muisaanwijzer"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monogeluid"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kanalen combineren bij het afspelen van geluid"</string>
@@ -1833,7 +1829,11 @@
     <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> tot accu leeg is"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> tot accu is opgeladen"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Gebruik sinds laatste volledige lading"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Schermgebruik"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Schermverbruik"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Scannen naar mobiele netwerken"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"App-gebruik sinds de laatste volledige lading"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Apparaatgebruik sinds de laatste volledige lading"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Accugebruik sinds losgekoppeld"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Accugebruik sinds herstel"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> op accu"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Te hoog berekend stroomgebruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s gebruikt"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s van totaal batterijgebruik"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Uitsplitsing van gebruik sinds de laatste volledige lading"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Geschatte resterende tijd"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tijd tot volledig opgeladen"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Schatting kan wijzigen op basis van gebruik"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sinds losgekoppeld"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sinds laatst losgekoppeld voor <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\'Altijd aan\' is inactief"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Niet ondersteund door deze app"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Alleen verbindingen via VPN toestaan"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN-verbinding vereisen?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Afschermen actief"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Afschermen niet actief"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecteer een VPN-profiel waarmee je altijd verbonden wilt blijven. Netwerkverkeer wordt alleen toegestaan bij verbinding met dit VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Beperkte profielen kunnen geen accounts toevoegen"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> verwijderen van dit apparaat"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Instellingen voor vergrendelingsscherm"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Gebruikers toevoegen vanaf vergrendelingsscherm"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nieuwe gebruiker"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nieuw profiel"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Wil je jezelf verwijderen?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefoonoproepen en sms inschakelen?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"De oproep- en sms-geschiedenis wordt gedeeld met deze gebruiker."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informatie bij nood"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informatie over <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informatie en contacten voor <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Apps en content toestaan"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps met beperkingen"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Inst. uitbreiden voor app"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">%d verborgen items weergeven</item>
       <item quantity="one">%d verborgen item weergeven</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Netwerk en internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wifi, mobiele verbinding, datagebruik, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Netwerk en internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"wifi, mobiel, datagebruik, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Verbonden apparaten"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, casten"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps en meldingen"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultaten"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, netwerkverbinding"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekst bericht, tekstbericht, sms, sms\'en, berichten, verzenden, sturen"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobiel, gsm, provider, draadloos, gegevens, data, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobiel, gsm, provider, draadloos, gegevens, data, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, oproep, gesprek, bellen, gebeld"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"scherm, touchscreen"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Waarschuwing"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Trillen"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Opstartgeluiden"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Voorkeuren voor \'Niet storen\'"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Als prioriteit toestaan"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatische regels"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Niet storen-planning instellen"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Standaardtoon werkmelding"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Standaardbeltoon werkalarm"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Hetzelfde als persoonlijk profiel"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Geluid werkprofiel vervangen?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Geluiden van persoonlijk profiel gebruiken?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Vervangen"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"De huidige geluiden van je werkprofiel worden vervangen door de huidige geluiden van je persoonlijke profiel"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"De geluiden van je persoonlijke profiel worden gebruikt in plaats van de huidige geluiden van je werkprofiel"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Beltonen"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Andere geluiden en trillingen"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Meldingsvoorkeuren"</string>
@@ -2823,7 +2824,7 @@
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Pincode voor beheerder opgeven"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Uit"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"Een scherm vastzetten"</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Scherm vastzetten"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"Wanneer deze instelling is ingeschakeld, kun je de functie \'Scherm vastzetten\' gebruiken om het huidige scherm in beeld te houden tot je het losmaakt.\n\nGa als volgt te werk als je \'Scherm vastzetten\' wilt gebruiken:\n\n1. Zorg dat de functie \'Scherm vastzetten\' is ingeschakeld.\n\n2. Open het scherm dat je wilt vastzetten.\n\n3. Tik op Overzicht.\n\n4. Veeg omhoog en tik op het speldpictogram."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Vraag patroon voor losmaken"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Vraag pin voor losmaken"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Geen rechten verleend"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Geen rechten aangevraagd"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle apps"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Ingeschakeld"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Geïnstalleerde apps"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant-apps"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Persoonlijk"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Werk"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Geblokkeerd"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Met domein-URL\'s"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Geavanceerd"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Apps configureren"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende app"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Standaard voor werk"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistent en spraakinvoer"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"App voor assistentie"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Geen"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"App \'Assistent kiezen\'"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> instellen als assistent?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"De assistent kan informatie over de gebruikte apps in je systeem lezen, waaronder informatie die zichtbaar is op je scherm of toegankelijk is in de apps."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Akkoord"</string>
@@ -2959,6 +2958,8 @@
     <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">"Accuoptimalisatie"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Gebruiksmeldingen"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Alle apps weergeven"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Extra apps verbergen"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Niet geoptimaliseerd"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Niet geoptimaliseerd"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Accuverbruik optimaliseren"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Koele kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koelere weergavekleuren gebruiken"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Schakel het scherm uit om de kleurwijziging toe te passen"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Start het apparaat opnieuw op om de wijziging in Telephony Monitor toe te passen"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatische systeemupdates"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HAL\'s (vereist opnieuw opstarten)"</string>
     <string name="usage" msgid="2977875522080448986">"Gebruik"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je telefoon."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je apparaat."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Gebaar voor assistent-app"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Aan"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Uit"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is al ontgrendeld"</string>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Algemene HTTP-proxy ingesteld"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Beheerder kan apparaat vergrendelen en wachtwoord resetten"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Beheerder kan alle apparaatgegevens verwijderen"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">De beheerder heeft het maximale aantal wachtwoordpogingen ingesteld op <xliff:g id="COUNT_1">%d</xliff:g> voordat alle apparaatgegevens worden gewist</item>
+      <item quantity="one">De beheerder heeft het maximale aantal wachtwoordpogingen ingesteld op <xliff:g id="COUNT_0">%d</xliff:g> voordat alle apparaatgegevens worden gewist</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">De beheerder heeft het maximale aantal wachtwoordpogingen ingesteld op <xliff:g id="COUNT_1">%d</xliff:g> voordat de gegevens van het werkprofiel worden gewist</item>
+      <item quantity="one">De beheerder heeft het maximale aantal wachtwoordpogingen ingesteld op <xliff:g id="COUNT_0">%d</xliff:g> voordat de gegevens van het werkprofiel worden gewist</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Dit apparaat wordt beheerd."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Dit apparaat wordt beheerd door <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Meer informatie"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foto\'s en video\'s"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muziek en audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andere apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Bestanden"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Opslagbeheer: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Uit"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aan"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiobestanden"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muziek"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(verwijderd voor gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(uitgezet voor gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App voor automatisch aanvullen"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 8b476f1..f147a81 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"ਟਿਕਾਣਾ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ਖਾਤੇ"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"ਸੁਰੱਖਿਆ ਅਤੇ ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ਮੇਰਾ ਨਿਰਧਾਰਿਤ ਸਥਾਨ, ਸਕ੍ਰੀਨ ਅਨਲੌਕ, SIM ਕਾਰਡ ਲੌਕ, ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ਮੇਰਾ ਟਿਕਾਣਾ, ਸਕ੍ਰੀਨ ਅਨਲੌਕ, ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"ਪਾਸਵਰਡ"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"ਪਰਦੇਦਾਰੀ"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਅਯੋਗ ਬਣਾਈ ਗਈ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ਸੁਰੱਖਿਆ ਅਵਸਥਾ"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"ਟਿਕਾਣਾ, ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi ਚੁਣੋ"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"ਸਭ ਨੈੱਟਵਰਕ ਵੇਖੋ"</string>
     <string name="wifi_error" msgid="3207971103917128179">"ਅਸ਼ੁੱਧੀ"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz ਬੈਂਡ ਇਸ ਦੇਸ਼ ਵਿੱਚ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ਏਅਰਪਲੇਨ ਮੋਡ ਵਿੱਚ"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth ਟੀਥਰਿੰਗ"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ਟੀਥਰਿੰਗ"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਹੈ, ਟੈਦਰਿੰਗ ਚਾਲੂ ਹੈ"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਹੈ"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ਟੈਦਰਿੰਗ ਚਾਲੂ ਹੈ"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ਡੈਟਾ ਸੇਵਰ ਚਾਲੂ ਹੋਣ \'ਤੇ ਟੀਥਰ ਜਾਂ ਪੋਰਟੇਬਲ ਹੌਟਸਪੌਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ਟੀਥਰਿੰਗ"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਲੌਕ ਵਰਗਾ"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"ਐਪਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ਇੰਸਟੌਲ ਕੀਤੇ ਐਪਸ ਵਿਵਸਥਿਤ ਕਰੋ ਅਤੇ ਹਟਾਓ"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"ਐਪ ਜਾਣਕਾਰੀ"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"ਐਪਸ ਵਿਵਸਥਿਤ ਕਰੋ, ਤਤਕਾਲ ਲੌਂਚ ਸ਼ਾਰਟਕੱਟ ਸੈਟ ਅਪ ਕਰੋ"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"ਐਪ ਸੈਟਿੰਗਾਂ"</string>
     <string name="install_applications" msgid="4872012136210802181">"ਅਗਿਆਤ ਸਰੋਤ"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"ਸਪੇਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="filter" msgid="2018011724373033887">"ਫਿਲਟਰ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ਫਿਲਟਰ ਚੋਣਾਂ ਚੁਣੋ"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"ਸਭ"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"ਅਯੋਗ ਬਣਾਇਆ"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"ਸਾਰੀਆਂ ਐਪਾਂ"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"ਅਯੋਗ ਬਣਾਈਆਂ ਐਪਾਂ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ਡਾਊਨਲੋਡ ਕੀਤਾ"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ਦੌੜ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB ਸਟੋਰੇਜ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD ਕਾਰਡ ਤੇ"</string>
     <string name="disabled" msgid="9206776641295849915">"ਅਯੋਗ ਬਣਾਇਆ"</string>
     <string name="not_installed" msgid="2797554494953450291">"ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"ਸਥਾਪਤ"</string>
     <string name="no_applications" msgid="7336588977497084921">"ਕੋਈ ਐਪਾਂ ਨਹੀਂ।"</string>
     <string name="internal_storage" msgid="1584700623164275282">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ਅੰਦਰਲੀ ਸਟੋਰੇਜ"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"ਇਨਪੁਟ ਵਿਧੀਆਂ ਸੈਟ ਅਪ ਕਰੋ"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"ਸੈਟਿੰਗਾਂ"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"ਸਰਗਰਮ ਇਨਪੁਟ ਵਿਧੀਆਂ"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"ਸਿਸਟਮ ਭਾਸ਼ਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ਸੈਟਿੰਗਾਂ"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"ਸਰਗਰਮ ਇਨਪੁਟ ਵਿਧੀਆਂ ਚੁਣੋ"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ਔਨਸਕ੍ਰੀਨ ਕੀ-ਬੋਰਡ ਸੈਟਿੰਗਾਂ"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"ਸਕ੍ਰੀਨ ਵਿਸਤਰੀਕਰਨ ਆਟੋ ਅੱਪਡੇਟ ਕਰੋ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ਐਪ ਟ੍ਰਾਂਜਿਸ਼ਨਾਂ ਤੇ ਸਕ੍ਰੀਨ ਵਿਸਤਰੀਕਰਨ ਅੱਪਡੇਟ ਕਰੋ"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ਪਾਵਰ ਬਟਨ ਕਾਲ ਖ਼ਤਮ ਕਰਦਾ ਹੈ"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"ਪਾਸਵਰਡ ਬੋਲੋ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"ਵੱਡਾ ਮਾਊਸ ਪੁਆਇੰਟਰ"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"ਮੋਨੋ ਔਡੀਓ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ਔਡੀਓ ਚਲਾਉਣ ਦੌਰਾਨ ਚੈਨਲਾਂ ਨੂੰ ਇਕੱਠਾ ਕਰੋ"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"ਆਖਰੀ ਪੂਰਾ ਚਾਰਜ ਤੋਂ ਬਾਅਗ ਵਰਤੋ"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"ਸਕ੍ਰੀਨ ਵਰਤੋਂ"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"ਸਕ੍ਰੀਨ ਖਪਤ"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਐਪ ਵਰਤੋਂ"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ਅਨਪਲਗ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"ਬੈਟਰੀ ਤੇ <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ਓਵਰ-ਕਾਉਂਟਿਡ ਪਾਵਰ ਵਰਤੋਂ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s ਲਈ ਵਰਤੀ ਗਈ"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"ਸਮੁੱਚੀ ਬੈਟਰੀ ਵਿੱਚੋਂ %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਦੇ ਵੇਰਵੇ"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"ਅਨੁਮਾਨਿਤ ਬਾਕੀ ਸਮਾਂ"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"ਪੂਰਾ ਚਾਰਜ ਹੋਣ ਵਿੱਚ ਬਾਕੀ ਸਮਾਂ"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ ਅਨੁਮਾਨ ਬਦਲ ਸਕਦਾ ਹੈ"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"ਹਮੇਸ਼ਾ-ਚਾਲੂ ਅਕਿਰਿਆਸ਼ੀਲ"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ਇਸ ਐਪ ਦੁਆਰਾ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"ਸਿਰਫ਼ VPN ਰਾਹੀਂ ਕਨੈਕਸ਼ਨਾਂ ਦੀ ਮਨਜ਼ੂਰੀ ਦਿਓ"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"ਕੀ VPN ਕਨੈਕਸ਼ਨ ਦੀ ਲੋੜ ਹੈ?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"ਲੌਕਡਾਊਨ ਕਿਰਿਆਸ਼ੀਲ"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"ਲੌਕਡਾਊਨ ਅਕਿਰਿਆਸ਼ੀਲ"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ਹਮੇਸ਼ਾਂ ਉਸ ਨਾਲ ਕਨੈਕਟ ਰਹਿਣ ਲਈ ਇੱਕ VPN ਪ੍ਰੋਫਾਈਲ ਚੁਣੋ। ਨੈੱਟਵਰਕ ਟ੍ਰੈਫਿਕ ਦੀ ਆਗਿਆ ਕੇਵਲ ਇਸ VPN ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਜਾਣ ਤੇ ਹੀ ਦਿੱਤੀ ਜਾਏਗੀ।"</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲਾਂ ਖਾਤੇ ਨਹੀਂ ਜੋੜ ਸਕਦੀਆਂ"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਮਿਟਾਓ"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"ਲੌਕ ਸਕ੍ਰੀਨ ਸੈਟਿੰਗਾਂ"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"ਲੌਕ ਸਕ੍ਰੀਨ ਤੋਂ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"ਨਵਾਂ ਉਪਭੋਗਤਾ"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"ਨਵੀਂ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"ਕੀ ਖੁਦ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ਕੀ ਫੋਨ ਕਾਲਾਂ ਅਤੇ SMS ਚਾਲੂ ਕਰਨੇ ਹਨ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ਕਾਲ ਅਤੇ SMS ਇਤਿਹਾਸ ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾਏਗਾ।"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ਸੰਕਟਕਾਲ ਜਾਣਕਾਰੀ"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਬਾਰੇ ਜਾਣਕਾਰੀ"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਦੀ ਜਾਣਕਾਰੀ ਅਤੇ ਸੰਪਰਕ"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ਐਪਸ ਅਤੇ ਸਮੱਗਰੀ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ਪ੍ਰਤਿਬੰਧਾਂ ਵਾਲੇ ਐਪਲੀਕੇਸ਼ਨ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਸੈਟਿੰਗਾਂ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="one">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ ਵਿਖਾਓ</item>
       <item quantity="other">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ ਵਿਖਾਓ</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"ਨੈੱਟਵਰਕ ਅਤੇ ਇੰਟਰਨੈੱਟ"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, ਸੈਲਿਊਲਰ, ਡੈਟਾ ਉਪਯੋਗ, ਹੌਟਸਪੌਟ"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"ਨੈੱਟਵਰਕ ਅਤੇ ਇੰਟਰਨੈੱਟ"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, ਮੋਬਾਈਲ, ਡੈਟਾ ਉਪਯੋਗ, ਹੌਟਸਪੌਟ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ਕਨੈਕਟ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"ਬਲੂਟੁੱਥ, NFC, ਕਾਸਟ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ਐਪਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"ਵਰਤੋਂਕਾਰ ਅਤੇ ਖਾਤੇ"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਾਂ"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"ਭਸ਼ਾਵਾਂ, ਬੈਕਅੱਪ, ਅੱਪਡੇਟ, ਫ਼ੋਨ ਬਾਰੇ"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"ਭਾਸ਼ਾਵਾਂ, ਬੈਕਅੱਪ, ਅੱਪਡੇਟ, ਡੀਵਾਈਸ ਬਾਰੇ"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="search_menu" msgid="6283419262313758339">"ਖੋਜ ਸੈੱਟਿੰਗਜ਼"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"ਖੋਜ ਸੈਟਿੰਗਾਂ"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"ਨਤੀਜੇ"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ਲਿਖਤ ਸੁਨੇਹਾ, ਟੈਕਸਟਿੰਗ, ਸੁਨੇਹੇ, ਮੈਸੇਜਿੰਗ"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"ਸੈਲੂਲਰ, ਸੈੱਲ ਕੈਰੀਅਰ, ਵਾਇਰਲੈੱਸ, ਡੈਟਾ, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, ਵਾਇਰਲੈੱਸ, ਡੈਟਾ, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, ਕਾਲ, ਕਾਲਿੰਗ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ਲੌਂਚਰ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ਸਕਰੀਨ, ਟੱਚਸਕਰੀਨ"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"ਚਿਤਾਵਨੀ"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ਚਾਲੂ ਹੋਣ \'ਤੇ ਵੱਜਣ ਵਾਲੀਆਂ ਧੁਨੀਆਂ"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"\'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਤਰਜੀਹਾਂ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ਕੇਵਲ ਤਰਜੀਹੀ ਦੀ ਆਗਿਆ ਹੈ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ਸਵੈਚਲਿਤ ਨਿਯਮ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਸਮਾਂ-ਸੂਚੀ ਨੂੰ ਸੈੱਟ ਕਰੋ"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਕਾਰਜ ਸੂਚਨਾ ਟੋਨ"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਕਾਰਜ ਅਲਾਰਮ ਰਿੰਗਟੋਨ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ਉਹੀ ਜੋ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਲਈ ਹੈ"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"ਕੀ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਬਦਲਣੀਆਂ ਹਨ?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਦੀ ਵਰਤੋਂ ਕਰੀਏ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ਬਦਲੋ"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"ਤੁਹਾਡੀਆਂ ਵਰਤਮਾਨ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਤੁਹਾਡੀਆਂ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਦੇ ਨਾਲ ਬਦਲੀਆਂ ਜਾਣਗੀਆਂ"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"ਤੁਹਾਡੀਆਂ ਵਰਤਮਾਨ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਦੀ ਬਜਾਏ ਤੁਹਾਡੀਆਂ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਦੀ ਵਰਤੋਂ ਕੀਤੀ ਜਾਵੇਗੀ"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ਰਿੰਗਟੋਨਾਂ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ਹੋਰ ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟਾਂ"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"ਸੂਚਨਾ ਤਰਜੀਹਾਂ"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ਕੋਈ ਅਨੁਮਤੀਆਂ ਨਹੀਂ ਦਿੱਤੀਆਂ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"ਕਿਸੇ ਅਨੁਮਤੀਆਂ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"ਸਾਰੀਆਂ ਐਪਾਂ"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"ਸਮਰੱਥ ਬਣਾਇਆ"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ਸਥਾਪਤ ਐਪਾਂ"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ਤਤਕਾਲ ਐਪਾਂ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ਨਿੱਜੀ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ਦਫ਼ਤਰ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ਬਲੌਕ ਕੀਤੀਆਂ"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ਡੋਮੇਨ URL ਨਾਲ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"ਉੱਨਤ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ਐਪਸ ਕੌਂਫਿਗਰ ਕਰੋ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ਅਗਿਆਤ ਐਪ"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"ਕੰਮ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"ਸਹਾਇਤਾ &amp; ਵੌਇਸ ਇਨਪੁਟ"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"ਸਹਾਇਤਾ ਐਪ"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"ਕੋਈ ਨਹੀਂ"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"ਸਹਾਇਤਾ ਐਪ ਚੁਣੋ"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"ਕੀ <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ਨੂੰ ਆਪਣਾ ਸਹਾਇਕ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"ਸਹਾਇਕ ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਮੌਜੂਦ ਵਰਤੋਂ ਵਿੱਚ ਹੋਣ ਵਾਲੇ ਐਪਸ ਬਾਰੇ ਜਾਣਕਾਰੀ ਪੜ੍ਹਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗਾ, ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਤੇ ਦ੍ਰਿਸ਼ਮਾਨ ਜਾਂ ਐਪਸ ਵਿੱਚ ਪਹੁੰਚਯੋਗ ਜਾਣਕਾਰੀ ਸਮੇਤ।"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"ਸਹਿਮਤ"</string>
@@ -2966,6 +2958,8 @@
     <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">"ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ਵਰਤੋਂ ਬਾਰੇ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"ਸਭ ਐਪਾਂ ਵਿਖਾਓ"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"ਵਾਧੂ ਐਪਾਂ ਲੁਕਾਓ"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ਅਨੁਕੂਲਿਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ਅਨੁਕੂਲਿਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ਬੈਟਰੀ ਦੇ ਉਪਯੋਗ ਨੂੰ ਅਨੁਕੂਲਿਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ਠੰਡਾ ਰੰਗ ਤਾਪਮਾਨ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ਵਧੇਰੇ ਠੰਡੇ ਡਿਸਪਲੇ ਰੰਗਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ਰੰਗ ਬਦਲਾਅ ਲਾਗੂ ਕਰਨ ਲਈ, ਸਕ੍ਰੀਨ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ਟੈਲੀਫ਼ੋਨੀ ਮੋਨੀਟਰ ਤਬਦੀਲੀ ਲਾਗੂ ਕਰਨ ਲਈ, ਡੀਵਾਈਸ ਨੂੰ ਰੀਬੂਟ ਕਰੋ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ਸਵੈਚਾਲਿਤ ਸਿਸਟਮ ਅੱਪਡੇਟਾਂ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (ਰੀਬੂਟ ਦੀ ਲੋੜ ਹੈ)"</string>
     <string name="usage" msgid="2977875522080448986">"ਵਰਤੋਂ"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"\"ਸਹਾਇਤਾ\" ਸੰਕੇਤ"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ਗਲੋਬਲ HTTP ਪ੍ਰੌਕਸੀ ਸੈੱਟ ਕੀਤੀ ਗਈ"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ਪ੍ਰਸ਼ਾਸਕ ਡੀਵਾਈਸ ਨੂੰ ਲੌਕ ਅਤੇ ਪਾਸਵਰਡ ਨੂੰ ਰੀਸੈੱਟ ਕਰ ਸਕਦਾ ਹੈ"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ਪ੍ਰਸ਼ਾਸਕ ਡੀਵਾਈਸ ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾ ਸਕਦਾ ਹੈ"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <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="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"ਇਸ ਡੀਵਾਈਸ ਪ੍ਰਬੰਧਨ ਅਧੀਨ ਹੈ।"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ਹੋਰ ਜਾਣੋ"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"ਸੰਗੀਤ ਅਤੇ ਔਡੀਓ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ਗੇਮਾਂ"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ਹੋਰ ਐਪਾਂ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ਫ਼ਾਈਲਾਂ"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ਬੰਦ"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ਚਾਲੂ"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ਗੇਮਾਂ"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ਔਡੀਓ ਫ਼ਾਈਲਾਂ"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"ਸੰਗੀਤ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g> ਲਈ ਅਣਸਥਾਪਤ ਕੀਤੀ)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g> ਲਈ ਅਯੋਗ ਬਣਾਈ)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ਆਟੋਫਿਲ ਐਪ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 358a731..6fd1c7a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -334,9 +334,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Lokalizacja"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konta"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Bezpieczeństwo i blokada ekranu"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Szyfrowanie i dane logowania"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych logowania"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Hasła"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Prywatność"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Wyłączone przez administratora"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Stan zabezpieczeń"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Lokalizacja, odcisk palca"</string>
@@ -1446,8 +1447,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Taka sama jak blokada ekranu urządzenia"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Zarządzaj aplikacjami"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Zarządzaj zainstalowanymi aplikacjami i usuwaj je."</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informacje o aplikacji"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Zarządzaj aplikacjami, konfiguruj skróty szybkiego uruchamiania."</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ustawienia aplikacji"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nieznane źródła"</string>
@@ -1509,16 +1509,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj miejscem"</string>
     <string name="filter" msgid="2018011724373033887">"Filtr"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Wybierz opcje filtra"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Wszystkie"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Wyłączone"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Wszystkie aplikacje"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Wyłączone aplikacje"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Pobrane"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Pracują"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Nośnik USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na karcie SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Wyłączone"</string>
     <string name="not_installed" msgid="2797554494953450291">"Dla tego użytk. niezainstalowana"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Zainstalowana"</string>
     <string name="no_applications" msgid="7336588977497084921">"Brak aplikacji"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Pamięć wewnętrzna"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"pamięć wewnętrzna"</string>
@@ -1696,8 +1695,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Konfiguruj metody wprowadzania"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Ustawienia"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Ustawienia"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktywne metody wprowadzania"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Użyj języków systemu"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Ustawienia <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Wybierz aktywne metody wprowadzania"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ustawienia klawiatury ekranowej"</string>
@@ -1741,7 +1738,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatyczna aktualizacja powiększenia ekranu"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aktualizuj powiększenie ekranu przy zmianie aplikacji"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Przycisk zasilania rozłącza"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Wypowiadaj hasła na głos"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Duży wskaźnik myszy"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Dźwięk mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Połącz kanały podczas odtwarzania dźwięku"</string>
@@ -1867,7 +1863,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Wykorzystanie od ostatniego naładowania"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Wykorzystanie przez ekran"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Zużycie przez ekran"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Skanowanie sieci komórkowej"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Wykorzystanie przez aplikacje od ostatniego naładowania"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Wykorzystanie przez urządzenie od ostatniego naładowania"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Użycie baterii od odłączenia"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Użycie baterii od zresetowania"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na baterii"</string>
@@ -1957,8 +1957,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zużycie energii obliczone z nadmiarem"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Wykorzystane w ciągu %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s całkowitego zużycia baterii"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Zestawienie użytkowania od ostatniego pełnego naładowania"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Szacowany pozostały czas"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Czas do pełnego naładowania"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Szacowany czas może się zmienić w zależności od wykorzystania"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odłączenia"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ostatnio odłączony na <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2350,6 +2352,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Tryb „Zawsze włączony” nieaktywny"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nieobsługiwane przez tę aplikację"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Zezwalaj tylko na połączenia przez VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Wymagać połączenia VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Blokada aktywna"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Blokada nieaktywna"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Wybierz stały profil VPN. Ruch w sieci będzie możliwy tylko po połączeniu z tą siecią VPN."</string>
@@ -2443,8 +2446,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profile z ograniczeniami nie mogą dodawać kont"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Usuń użytkownika <xliff:g id="USER_NAME">%1$s</xliff:g> z tego urządzenia"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Ustawienia ekranu blokady"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Dodawanie użytkowników na ekranie blokady"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nowy użytkownik"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nowy profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcesz usunąć siebie?"</string>
@@ -2472,7 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Włączyć SMS-y i rozmowy telefoniczne?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Historia połączeń i SMS-ów będzie dostępna dla tego użytkownika."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacje alarmowe"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informacje o użytkowniku <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informacje i kontakty dla użytkownika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Zezwól na aplikacje i zawartość"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacje z ograniczeniami"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozwiń ustawienia aplikacji"</string>
@@ -2594,8 +2596,8 @@
       <item quantity="other">Pokaż %d ukrytego elementu</item>
       <item quantity="one">Pokaż %d ukryty element</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Sieć i internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, sieć komórkowa, transmisja danych, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Sieć i internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilne, transmisja danych, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Połączone urządzenia"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, komunikacja NFC, przesyłanie"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacje i powiadomienia"</string>
@@ -2611,7 +2613,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Wyniki"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, połączenie sieciowe"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, pisanie SMS-ów, wiadomości, SMS-owanie"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"komórkowy, operator komórkowy, bezprzewodowe, dane, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"komórkowy, mobilne, operator komórkowy, bezprzewodowe, dane, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, dzwonić, połączenie, rozmowa"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, ekran dotykowy"</string>
@@ -2687,8 +2689,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Wibracje"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Włącz dźwięki"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Ustawienia Nie przeszkadzać"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tylko priorytetowe"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatyczne reguły"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Ustaw harmonogram Nie przeszkadzać"</string>
@@ -2705,9 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Domyślny dźwięk powiadomień w profilu do pracy"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Domyślny alarm w profilu do pracy"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Taki sam jak w profilu osobistym"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Zastąpić dźwięki w profilu do pracy?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Użyć dźwięków z profilu osobistego?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Zastąp"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Dźwięki w Twoim profilu do pracy zostaną zastąpione dźwiękami z Twojego profilu osobistego."</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Zamiast dźwięków z Twojego profilu do pracy zostaną użyte dźwięki z profilu osobistego"</string>
     <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="7447797716856573587">"Ustawienia powiadomień"</string>
@@ -2955,11 +2956,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Brak przyznanych uprawnień"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Brak próśb o przyznanie uprawnień"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Wszystkie aplikacje"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Włączone"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Zainstalowane aplikacje"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Aplikacje błyskawiczne"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobiste"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Do pracy"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Zablokowane"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Z URL-ami domeny"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Zaawansowane"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Skonfiguruj aplikacje"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nieznana aplikacja"</string>
@@ -2986,8 +2987,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Domyślne do pracy"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Asystent i rozpoznawanie mowy"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplikacja asystująca"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Brak"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Wybierz aplikację asystującą"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Ustawić aplikację <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> jako asystenta?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Asystent będzie mógł odczytywać informacje o aplikacjach używanych w systemie. Obejmuje to też informacje widoczne na ekranie i dostępne w aplikacjach."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Zgadzam się"</string>
@@ -3017,6 +3016,8 @@
     <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">"Optymalizacja baterii"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alerty o transmisji danych"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Pokaż wszystkie aplikacje"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ukryj aplikacje dodatkowe"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optymalizacji"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Bez optymalizacji"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Ma włączoną optymalizację baterii"</string>
@@ -3201,6 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Chłodna temperatura kolorów"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Używaj chłodniejszych kolorów na ekranie"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Aby zastosować zmianę kolorów, wyłącz ekran"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Aby zmiana ustawienia monitorowania telefonii zaczęła obowiązywać, zrestartuj urządzenie"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatyczne aktualizacje systemu"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Połączone warstwy HAL (wymaga zrestartowania)"</string>
     <string name="usage" msgid="2977875522080448986">"Wykorzystanie danych"</string>
@@ -3386,6 +3388,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Gest pomocy"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3459,12 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ustawiono globalny serwer proxy HTTP"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrator może zablokować urządzenie i zresetować hasło"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator może usunąć wszystkie dane z urządzenia"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="few">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem wszystkie dane urządzenia zostaną usunięte</item>
+      <item quantity="many">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem wszystkie dane urządzenia zostaną usunięte</item>
+      <item quantity="other">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem wszystkie dane urządzenia zostaną usunięte</item>
+      <item quantity="one">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_0">%d</xliff:g>. Potem wszystkie dane urządzenia zostaną usunięte</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="few">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem dane profilu do pracy zostaną usunięte</item>
+      <item quantity="many">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem dane profilu do pracy zostaną usunięte</item>
+      <item quantity="other">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_1">%d</xliff:g>. Potem dane profilu do pracy zostaną usunięte</item>
+      <item quantity="one">Administrator ustawił maksymalną liczbę prób wpisania hasła na <xliff:g id="COUNT_0">%d</xliff:g>. Potem dane profilu do pracy zostaną usunięte</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"To urządzenie jest zarządzane."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Tym urządzeniem zarządza <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">"  "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Więcej informacji"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Zdjęcia i filmy"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzyka i nagrania audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Gry"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Inne aplikacje"</string>
     <string name="storage_files" msgid="8581083146777364063">"Pliki"</string>
@@ -3475,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menedżer miejsca: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Wył."</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Wł."</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Gry"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Pliki audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzyka"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> – odinstalowano)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> – wyłączono)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacja do autouzupełniania"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index bbbdbdd..3cfd0ee 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Segurança e bloqueio de tela"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Desativada pelo administrador"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Status da segurança"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Localização, impressão digital"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Igual ao bloqueio de tela do dispositivo"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerenciar apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerenciar e remover apps instalados"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informações do app"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gerenciar apps, configurar atalhos de inicialização rápida"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Configurações do app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes desconhecidas"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Selecione as opções de filtro"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Todos"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Desativados"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Todos os apps"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Apps desativados"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Instalados"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Rodando"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Cartão SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desativado"</string>
     <string name="not_installed" msgid="2797554494953450291">"Não instalado para o usuário"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instalado"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nenhum app."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Espaço interno"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"armazenamento interno"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Configurar métodos de entrada"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Configurações"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Configurações"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Métodos ativos de entrada"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Usar idiomas do sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configurações de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Selec. métodos ativos de entrada"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configurações do teclado virtual"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atual. autom. da ampliação da tela"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atualiz. ampliação da tela em transições de aplic."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botão de ligar encerra a chamada"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Falar senhas"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Ponteiro do mouse grande"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Áudio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combinar canais ao reproduzir áudio"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Uso desde o último carregamento completo"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Uso da tela"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da tela"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Uso de apps desde a última carga completa"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Uso do dispositivo desde a última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso da bateria desde a redefinição"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na bateria"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Usada por %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Detalhamento de uso desde a última carga completa"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Tempo restante estimado"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tempo até a carga completa"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"A estimativa pode mudar conforme o uso"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desconectado"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quando foi desconectado pela última vez para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\"Sempre ativada\" inativo"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Não compatível com este app"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Permitir apenas conexões por VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Conexão VPN necessária?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Bloqueio total ativo"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Bloqueio total inativo"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecione um perfil de VPN para permanecer sempre conectado. O tráfego de rede somente será permitido quando conectado a esta VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Perfis restritos não podem adicionar contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Excluir <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Configurações de tela de bloqueio"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Adicionar usuários a partir da tela de bloqueio"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo usuário"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Excluir a si mesmo?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ativar chamadas telefônicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O histórico de chamadas e SMS será compartilhado com este usuário."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informações de emergência"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informações sobre <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informações e contatos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir apps e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir configuração para app"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="one">Mostrar %d item oculto</item>
       <item quantity="other">Mostrar %d itens ocultos</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Rede e Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, rede celular, uso de dados, ponto de acesso"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, dispositivo móvel, uso de dados, ponto de acesso"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, transmissão"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps e notificações"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, conexão de rede"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensagem de texto, enviar mensagens de texto, mensagens"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"celular, operadora de celular, sem fio, dados, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, dispositivo móvel, operadora de celular, sem fio, dados, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, chamada, chamando"</string>
     <string name="keywords_home" msgid="3626170808219458848">"tela de início"</string>
     <string name="keywords_display" msgid="8910345814565493016">"tela, touchscreen"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibração"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Ativar sons"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Preferências do \"Não perturbe\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade: só permite"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Definir programação \"Não perturbe\""</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Tom de notificação padrão de trabalho"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Toque padrão do alarme de trabalho"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Igual ao do perfil pessoal"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Substituir sons do perfil de trabalho?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Usar sons do perfil pessoal?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Substituir"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Os sons atuais do seu perfil de trabalho serão substituídos pelos sons do seu perfil pessoal"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Os sons do seu perfil pessoal serão usados em vez dos sons atuais do seu perfil de trabalho"</string>
     <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="7447797716856573587">"Preferências de notificação"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nenhuma permissão concedida"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nenhuma permissão solicitada"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Todos os apps"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Ativados"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Apps instalados"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Apps instantâneos"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Trabalho"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueados"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Com URLs de domínio"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"App desconhecido"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Padrão para trabalho"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assist. e entrada por voz"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"App de assistência"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Nenhuma"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Selecionar app assistente"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Tornar o app <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> seu assistente?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"O assistente lerá informações sobre apps em uso no seu sistema, incluindo informações visíveis na tela ou as que podem ser acessadas nos apps."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Aceito"</string>
@@ -2959,6 +2958,8 @@
     <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">"Otimização de bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todos os apps"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar apps extras"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizados"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Não otimizado"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Otimizando o uso de bateria"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para que a alteração do monitor de telefonia seja aplicada, reinicialize o dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações automáticas do sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (reinicialização necessária)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do smartphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do dispositivo."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto do Assistente"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP geral definido"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"O administrador pode bloquear o dispositivo e redefinir a senha"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O administrador pode excluir todos os dados do dispositivo"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir todos os dados do dispositivo</item>
+      <item quantity="other">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir todos os dados do dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir os dados do perfil de trabalho</item>
+      <item quantity="other">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir os dados do perfil de trabalho</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este dispositivo é gerenciado."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo é gerenciado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saber mais"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos e vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música e áudio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outros apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Arquivos"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gerenciador de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desativado"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ativado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Arquivos de áudio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App de preenchimento automático"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9f0fdc8..5f28f34 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Segurança e bloqueio de ecrã"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptação e credenciais"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Palavras-passe"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Desativado pelo administrador"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Estado de segurança"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Localização, impressão digital"</string>
@@ -1259,7 +1260,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Ligação Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ligação ponto a ponto"</string>
-    <string name="tether_settings_title_all" msgid="3216237959149430007">"Zona Wi-Fi e ligação tel."</string>
+    <string name="tether_settings_title_all" msgid="3216237959149430007">"Zona Wi-Fi e ligação por telemóvel"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Zona Wi-Fi ativada, ligação à Internet via telemóvel"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Zona Wi-Fi ativada"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Ligação à Internet via telemóvel"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"O mesmo que o bloqueio de ecrã do dispositivo"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerir aplicações"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerir e remover aplicações instaladas"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informações da aplicação"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gerir aplicações, configurar atalhos de início rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Definições da aplicação"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes desconhecidas"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Gerir espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Escolher opções de filtro"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Todas"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Desativadas"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Todas as aplicações"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Aplicações desativadas"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Transferidas"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Em execução"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"No cartão SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desativada"</string>
     <string name="not_installed" msgid="2797554494953450291">"Não instalado para utilizador"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instalada"</string>
     <string name="no_applications" msgid="7336588977497084921">"Sem aplicações."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Armaz. interno"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"armazenamento interno"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Configurar métodos de introdução"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Definições"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Definições"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Métodos de introdução activos"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Utilizar idiomas do sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Definições de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Escolher métodos introd. ativos"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Definições do teclado no ecrã"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atualiz. auto da ampliação do ecrã"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atualizar ampliação do ecrã em transições de aplic"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botão ligar/deslig. fim chamada"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Dizer palavras-passe"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Ponteiro do rato grande"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Áudio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combinar canais ao reproduzir áudio"</string>
@@ -1833,7 +1829,11 @@
     <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> a cobrar"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Utilização desde a última carga completa"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Utilização do ecrã"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo do ecrã"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Procura de redes móveis"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Utiliz. de aplicações desde o último carregamento completo"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Utiliz. do dispositivo desde o último carregamento completo"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateria utilizada desde que foi desligado"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Bateria utilizada desde a reposição"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> em bateria"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilização de energia contabilizada em excesso"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Utilizada durante %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Discriminação da utilização desde o último carregamento completo"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Tempo restante estimado"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tempo restante até ao carregamento completo"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"A estimativa pode mudar com base na utilização"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desligado"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde a última vez que foi desligado por <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Opção Sempre ligada inativa"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Incompatível com esta aplicação"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Permitir apenas ligações por VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Pretende exigir uma ligação VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Bloqueio ativo"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Bloqueio inativo"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecione um perfil de VPN para permanecer sempre ligado. O tráfego de rede só será permitido quando ligado a esta VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Os perfis restritos não podem adicionar contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar <xliff:g id="USER_NAME">%1$s</xliff:g> deste dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Definições do ecrã de bloqueio"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Adicionar utilizadores do ecrã de bloqueio"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo utilizador"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Eliminar-se a si próprio?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ativar chamadas telefónicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O histórico de chamadas e SMS será partilhado com este utilizador."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informações de emergência"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informações sobre <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informações e contactos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicações e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicações com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir defin. da aplicação"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Mostrar %d itens ocultos</item>
       <item quantity="one">Mostrar %d item oculto</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Rede e Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, dados móveis, utilização de dados, zona Wi-Fi"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, dispositivo móvel, utilização de dados, zona Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos ligados"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, transmitir"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicações e notificações"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"WiFi, Wi-Fi, ligação de rede"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensagem de texto, enviar mensagens de texto, mensagens"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"telemóvel, operador de telemóvel, dados, sem fios, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"telemóvel, dispositivo móvel, operador de telemóvel, sem fios, dados, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"WiFi, Wi-Fi, telefonar, chamadas"</string>
     <string name="keywords_home" msgid="3626170808219458848">"iniciador"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ecrã, ecrã tátil"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Ativar sons"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Preferências de Não incomodar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade permite apenas"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Def. horário de Não incomodar"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Tom de notif. de trab. pred."</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Toque de alarme de trab. pred."</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Igual ao do perfil pessoal"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Subst. sons perfil de trab.?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Pretende utilizar os sons do perfil pessoal?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Substituir"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Os sons atuais do seu perfil de trabalho serão substituídos pelos sons do seu perfil pessoal"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Os sons do seu perfil pessoal serão utilizados em vez dos sons atuais do seu perfil de trabalho"</string>
     <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="7447797716856573587">"Preferências de notificação"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nenhuma permissão concedida"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nenhuma permissão solicitada"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Todas as aplicações"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Ativadas"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Aplicações instaladas"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Aplicações instantâneas"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"De trabalho"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Com URLs de domínio"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar aplicações"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicação desconhecida"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Predefinição para o trabalho"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Entr. texto por voz e assist."</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplicação de assistência"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Nenhuma"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Escolher aplicação de assistência"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Pretende tornar <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> o seu assistente?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"O assistente pode ler informações sobre aplicações utilizadas no seu sistema, incluindo informações visíveis no ecrã ou acessíveis nas aplicações."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Aceitar"</string>
@@ -2959,6 +2958,8 @@
     <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">"Otimização da bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de utilização"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas as aplicações"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar aplicações adicionais"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizada"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Não otimizada"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Utilização otimizada da bateria"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura da cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar cores de visualização mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar uma alteração de cor, desligue o ecrã"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar a alteração ao Monitor de telefonia, reinicie o dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações do sistema automáticas"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HALs aglutinantes (requer o reinício)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do telemóvel."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do dispositivo."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto de assistência"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Ativados"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Desativados"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O carregador de arranque já está desbloqueado"</string>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global definido"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"O administrador pode bloquear o dispositivo e repor a palavra-passe"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O administrador pode eliminar todos os dados do dispositivo"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">O administrador definiu o número máximo de tentativas da palavra-passe como <xliff:g id="COUNT_1">%d</xliff:g> antes da eliminação de todos os dados do dispositivo</item>
+      <item quantity="one">O administrador definiu o número máximo de tentativas da palavra-passe como <xliff:g id="COUNT_0">%d</xliff:g> antes da eliminação de todos os dados do dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">O administrador definiu o número máximo de tentativas da palavra-passe como <xliff:g id="COUNT_1">%d</xliff:g> antes da eliminação de todos os dados do perfil de trabalho</item>
+      <item quantity="one">O administrador definiu o número máximo de tentativas da palavra-passe como <xliff:g id="COUNT_0">%d</xliff:g> antes da eliminação de todos os dados do perfil de trabalho</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este dispositivo é gerido."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo é gerido por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saiba mais"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos e vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música e áudio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outras aplicações"</string>
     <string name="storage_files" msgid="8581083146777364063">"Ficheiros"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestor de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desativado"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ativado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ficheiros de áudio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalar para o utilizador <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativ. para o utilizador <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplicação de preenchimento automático"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index bbbdbdd..3cfd0ee 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Segurança e bloqueio de tela"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Desativada pelo administrador"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Status da segurança"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Localização, impressão digital"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Igual ao bloqueio de tela do dispositivo"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerenciar apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerenciar e remover apps instalados"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informações do app"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gerenciar apps, configurar atalhos de inicialização rápida"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Configurações do app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes desconhecidas"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Selecione as opções de filtro"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Todos"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Desativados"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Todos os apps"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Apps desativados"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Instalados"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Rodando"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Cartão SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desativado"</string>
     <string name="not_installed" msgid="2797554494953450291">"Não instalado para o usuário"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instalado"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nenhum app."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Espaço interno"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"armazenamento interno"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Configurar métodos de entrada"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Configurações"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Configurações"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Métodos ativos de entrada"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Usar idiomas do sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configurações de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Selec. métodos ativos de entrada"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configurações do teclado virtual"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atual. autom. da ampliação da tela"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atualiz. ampliação da tela em transições de aplic."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botão de ligar encerra a chamada"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Falar senhas"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Ponteiro do mouse grande"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Áudio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combinar canais ao reproduzir áudio"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Uso desde o último carregamento completo"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Uso da tela"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da tela"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Uso de apps desde a última carga completa"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Uso do dispositivo desde a última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso da bateria desde a redefinição"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na bateria"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Usada por %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Detalhamento de uso desde a última carga completa"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Tempo restante estimado"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tempo até a carga completa"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"A estimativa pode mudar conforme o uso"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desconectado"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quando foi desconectado pela última vez para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\"Sempre ativada\" inativo"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Não compatível com este app"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Permitir apenas conexões por VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Conexão VPN necessária?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Bloqueio total ativo"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Bloqueio total inativo"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecione um perfil de VPN para permanecer sempre conectado. O tráfego de rede somente será permitido quando conectado a esta VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Perfis restritos não podem adicionar contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Excluir <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Configurações de tela de bloqueio"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Adicionar usuários a partir da tela de bloqueio"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo usuário"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Excluir a si mesmo?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ativar chamadas telefônicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O histórico de chamadas e SMS será compartilhado com este usuário."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informações de emergência"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informações sobre <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informações e contatos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir apps e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir configuração para app"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="one">Mostrar %d item oculto</item>
       <item quantity="other">Mostrar %d itens ocultos</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Rede e Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, rede celular, uso de dados, ponto de acesso"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, dispositivo móvel, uso de dados, ponto de acesso"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, transmissão"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps e notificações"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, conexão de rede"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensagem de texto, enviar mensagens de texto, mensagens"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"celular, operadora de celular, sem fio, dados, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, dispositivo móvel, operadora de celular, sem fio, dados, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, chamada, chamando"</string>
     <string name="keywords_home" msgid="3626170808219458848">"tela de início"</string>
     <string name="keywords_display" msgid="8910345814565493016">"tela, touchscreen"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibração"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Ativar sons"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Preferências do \"Não perturbe\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade: só permite"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Definir programação \"Não perturbe\""</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Tom de notificação padrão de trabalho"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Toque padrão do alarme de trabalho"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Igual ao do perfil pessoal"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Substituir sons do perfil de trabalho?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Usar sons do perfil pessoal?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Substituir"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Os sons atuais do seu perfil de trabalho serão substituídos pelos sons do seu perfil pessoal"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Os sons do seu perfil pessoal serão usados em vez dos sons atuais do seu perfil de trabalho"</string>
     <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="7447797716856573587">"Preferências de notificação"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nenhuma permissão concedida"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nenhuma permissão solicitada"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Todos os apps"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Ativados"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Apps instalados"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Apps instantâneos"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Trabalho"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueados"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Com URLs de domínio"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"App desconhecido"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Padrão para trabalho"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assist. e entrada por voz"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"App de assistência"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Nenhuma"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Selecionar app assistente"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Tornar o app <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> seu assistente?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"O assistente lerá informações sobre apps em uso no seu sistema, incluindo informações visíveis na tela ou as que podem ser acessadas nos apps."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Aceito"</string>
@@ -2959,6 +2958,8 @@
     <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">"Otimização de bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todos os apps"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar apps extras"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizados"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Não otimizado"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Otimizando o uso de bateria"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para que a alteração do monitor de telefonia seja aplicada, reinicialize o dispositivo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações automáticas do sistema"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (reinicialização necessária)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do smartphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do dispositivo."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto do Assistente"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP geral definido"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"O administrador pode bloquear o dispositivo e redefinir a senha"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O administrador pode excluir todos os dados do dispositivo"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir todos os dados do dispositivo</item>
+      <item quantity="other">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir todos os dados do dispositivo</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir os dados do perfil de trabalho</item>
+      <item quantity="other">O administrador definiu <xliff:g id="COUNT_1">%d</xliff:g> como o número máximo de tentativas de senha antes de excluir os dados do perfil de trabalho</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Este dispositivo é gerenciado."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo é gerenciado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saber mais"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotos e vídeos"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Música e áudio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outros apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Arquivos"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gerenciador de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Desativado"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ativado"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Arquivos de áudio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Música"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App de preenchimento automático"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a7b8a73..33a4699 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -332,9 +332,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Locație"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Conturi"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Securitate și blocarea ecranului"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptare și date de conectare"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setați Locația mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setați Locația mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Parole"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Confidențialitate"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Dezactivată de administrator"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Starea de securitate"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Locație, amprentă digitală"</string>
@@ -1436,8 +1437,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Aceeași ca blocarea ecranului dispozitivului"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestionați aplicații"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestionați și eliminați aplicațiile instalate"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informații despre aplicație"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gestionați aplicații, creați comenzi rapide pentru lansare rapidă"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Setări aplicații"</string>
     <string name="install_applications" msgid="4872012136210802181">"Surse necunoscute"</string>
@@ -1498,16 +1498,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Gestionați spațiul"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrați"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Alegeți opțiunile de filtrare"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Toate"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Dezactivate"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Toate aplicațiile"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Aplicații dezactivate"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descărcate"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Rulează"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Stocare USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pe cardul SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Dezactivată"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nu este instal. pt. utilizator"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Instalată"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nu există aplicații."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Stocare internă"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"memorie internă"</string>
@@ -1685,8 +1684,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Setați metode de introducere text"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Setări"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Setări"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metode active de introducere de text"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Folosește limbile sistemului"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Setări <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Alegeți metode de intrare active"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Setări pentru tastatura de pe ecran"</string>
@@ -1730,7 +1727,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizați auto. mărirea ecranului"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualiz. mărirea ecran. la tranziția între aplic."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Butonul de pornire închide"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Rostiți parolele"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Cursor mare pentru mouse"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combinați canalele când redați conținutul audio"</string>
@@ -1850,7 +1846,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Utilizare de la ultima încărc. completă"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Utilizarea ecranului"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Consumul ecranului"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Scanarea rețelei mobile"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Utilizarea aplicațiilor de la ultima încărcare completă"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Utilizarea dispozitivului de la ultima încărcare completă"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizarea bateriei de la deconectare"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilizarea bateriei de la resetare"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> pe baterie"</string>
@@ -1940,8 +1940,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumul supraevaluat al bateriei"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"S-a utilizat %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s din bateria încărcată complet"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Detalierea utilizării de la ultima încărcare completă"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Timp estimat rămas"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Timp rămas până la încărcarea completă"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Estimarea se poate modifica în funcție de utilizare"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> de la deconectare"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"De la ultima deconectare pentru <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2333,6 +2335,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Setarea Activată mereu este dezactivată"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nu este acceptată de această aplicație"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Permiteți numai conexiuni prin VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Este necesară conexiunea VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Blocare activă"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Blocare inactivă"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selectați un profil VPN pentru a rămâne conectat întotdeauna la rețea. Traficul de rețea va fi permis numai atunci când sunteți conectat(ă) la această rețea VPN."</string>
@@ -2422,8 +2425,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profilurile cu permisiuni limitate nu pot adăuga conturi"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Ștergeți <xliff:g id="USER_NAME">%1$s</xliff:g> de pe dispozitiv"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Setările ecranului de blocare"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Adăugați utilizatori din ecranul de blocare"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Utilizator nou"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Profil nou"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vă eliminați ca utilizator?"</string>
@@ -2451,7 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activați apelurile telefonice și SMS-urile?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Acest utilizator va avea acces la istoricul apelurilor și al SMS-urilor."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informații în caz de urgență"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informații despre <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informații și agendă pentru <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permiteți aplicații și conținut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicații cu restricții"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Extindeți setările aplicației"</string>
@@ -2572,8 +2574,8 @@
       <item quantity="other">Afișați %d de elemente ascunse</item>
       <item quantity="one">Afișați %d element ascuns</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Rețea și internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobil, utilizarea datelor, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Rețea și internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, utilizarea datelor, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispozitive conectate"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, proiecție"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicații și notificări"</string>
@@ -2589,7 +2591,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Rezultate"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, conexiune la rețea"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mesaj text, trimitere mesaje text, mesaje, trimitere mesaje"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobil, operator servicii mobile, date, wireless, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, mobil, operator servicii mobile, wireless, date, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, apel, apelare"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lansator"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ecran, ecran tactil"</string>
@@ -2665,8 +2667,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alertă"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrează"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Sunete la pornire"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Preferințe pentru Nu deranja"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"„Numai cu prioritate” permite"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reguli automate"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Setați programul Nu deranja"</string>
@@ -2683,9 +2684,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Ton prestabilit notificări serviciu"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Ton prestabilit alarmă serviciu"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Aceleași ca la profilul personal"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Înlocuiți sunetele profilului de serviciu?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Folosiți sunetele profilului personal?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Înlocuiți"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Sunetele actuale ale profilului de serviciu vor fi înlocuite cu cele ale profilului personal"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Se vor folosi sunetele profilului personal în locul sunetelor profilului de serviciu"</string>
     <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="7447797716856573587">"Preferințe privind notificările"</string>
@@ -2927,11 +2928,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nicio permisiune acordată"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nicio permisiunea solicitată"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Toate aplicațiile"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Activate"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Aplicații instalate"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Aplicații instantanee"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personale"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Serviciu"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocate"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Cu adrese URL de domeniu"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avansate"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurați aplicațiile"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicație necunoscută"</string>
@@ -2957,8 +2958,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Prestabilite pentru serviciu"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Asistent și intrare vocală"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplicația Asistent"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Niciuna"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Alegeți aplicația asistent"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Setați <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ca asistent?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Aplicația asistent va putea să citească informații despre aplicațiile în uz de pe sistem, inclusiv informațiile vizibile pe ecran sau accesibile în aplicații."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Sunt de acord"</string>
@@ -2988,6 +2987,8 @@
     <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">"Optimizarea bateriei"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alerte privind utilizarea"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Afișați toate aplicațiile"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ascundeți aplic. suplimentare"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimizate"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimizată"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Se optimizează utilizarea bateriei"</string>
@@ -3170,6 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura culorii: rece"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Folosiți culori mai reci pentru afișare"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pentru a aplica modificarea culorilor, dezactivați ecranul"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pentru a aplica modificarea pentru Telephony Monitor, reporniți dispozitivul"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizări automate de sistem"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Module HAL conectate (este necesară repornirea)"</string>
     <string name="usage" msgid="2977875522080448986">"Utilizare"</string>
@@ -3351,6 +3353,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Gest pentru asistență"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3418,12 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy global HTTP setat"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratorul poate să blocheze dispozitivul și să reseteze parola"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratorul poate să șteargă toate datele dispozitivului"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="few">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_1">%d</xliff:g> înainte de a șterge toate datele de pe dispozitiv</item>
+      <item quantity="other">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_1">%d</xliff:g> înainte de a șterge toate datele de pe dispozitiv</item>
+      <item quantity="one">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_0">%d</xliff:g> înainte de a șterge toate datele de pe dispozitiv</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="few">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_1">%d</xliff:g> înainte de a șterge datele din profilul de serviciu</item>
+      <item quantity="other">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_1">%d</xliff:g> înainte de a șterge datele din profilul de serviciu</item>
+      <item quantity="one">Administratorul a setat numărul maxim de încercări de introducere a parolei la <xliff:g id="COUNT_0">%d</xliff:g> înainte de a șterge datele din profilul de serviciu</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Acest dispozitiv este gestionat."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Acest dispozitiv este gestionat de <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Aflați mai multe"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotografii și videoclipuri"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzică și audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Jocuri"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Alte aplicații"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fișiere"</string>
@@ -3434,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Managerul spațiului de stocare: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Dezactivat"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activat"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Jocuri"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fișiere audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzică"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(dezinstalat pentru <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dezactivat pentru <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplicația pentru completare automată"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 460523a..ed4c06e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -334,9 +334,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Местоположение"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Аккаунты"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Безопасность и блокировка экрана"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрование и учетные данные"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Конфиденциальность"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Отключено администратором"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Статус безопасности"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Местоположение, цифровой отпечаток"</string>
@@ -687,8 +688,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Выбор сети Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Включение Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Отключение Wi-Fi…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Все сети"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Ошибка"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Частота 5 ГГц недоступна в этой стране"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Режим полета"</string>
@@ -1281,12 +1281,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-модем"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Режим модема"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Точка доступа и режим модема"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Точка доступа, режим модема"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Точка доступа"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Режим модема"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"В режиме экономии трафика нельзя подключаться к точкам доступа"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-модем"</string>
@@ -1450,8 +1447,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Использовать способ блокировки, как на устройстве"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управление приложениями"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление установленными приложениями и их удаление"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Сведения о приложениях"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Управление приложениями, настройка клавиш быстрого запуска"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Настройки приложения"</string>
     <string name="install_applications" msgid="4872012136210802181">"Неизвестные источники"</string>
@@ -1513,16 +1509,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Управление местом"</string>
     <string name="filter" msgid="2018011724373033887">"Фильтр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Выберите параметры фильтра"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Все"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Отключенные"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Все приложения"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Отключенные приложения"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Сторонние"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Работающие"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-накопитель"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD-карте"</string>
     <string name="disabled" msgid="9206776641295849915">"Отключено"</string>
     <string name="not_installed" msgid="2797554494953450291">"Не установлено"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Установлено"</string>
     <string name="no_applications" msgid="7336588977497084921">"Нет приложений"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Внутр. накопитель"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"внутренний накопитель"</string>
@@ -1700,8 +1695,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Настройка методов ввода"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Настройки"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Настройки"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Активные способы ввода"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Языки системы"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Настройки <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Выберите активные способы ввода"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Настройки экранной клавиатуры"</string>
@@ -1745,7 +1738,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Сохранять масштаб"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Сохранять масштаб при переходе между приложениями"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ВЫКЛ завершает вызов"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Озвучивать пароли"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Крупный указатель мыши"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Монофонический звук"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Объединять каналы при воспроизведении аудио"</string>
@@ -1871,7 +1863,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Использование с момента полной зарядки"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Использование экрана"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Потребление энергии экраном"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Сканирование мобильной сети"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Использование приложений с момента последней полной зарядки"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Использование устройства с момента последней полной зарядки"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Расход заряда батареи с момента отключения от сети питания"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Расход заряда батареи с момента перезагрузки"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> от батареи"</string>
@@ -1961,11 +1957,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Преувеличенное энергопотребление"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА·ч"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Использовано %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s заряда батареи"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Использование батареи с момента последней полной зарядки"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Расчетное время работы без подзарядки"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Время до полной зарядки"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Расчетное время может меняться в зависимости от интенсивности использования"</string>
     <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>
@@ -2356,6 +2352,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Неактивная"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Не поддерживается в этом приложении"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Подключаться только через VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Использовать сеть VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Блокировка включена"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Блокировка отключена"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Выберите постоянную сеть VPN: трафик будет разрешен только при подключении к этой сети."</string>
@@ -2449,8 +2446,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Пользователи с ограниченным доступом не могут добавлять аккаунты"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Удалить пользователя <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Настройки заблокированного экрана"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Добавление пользователей на заблокированном экране"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Новый пользователь"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Новый профиль"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Удалить ваш профиль?"</string>
@@ -2478,7 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Включить звонки и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Этот пользователь получит доступ к журналу звонков и SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Данные для экстренных случаев"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Информация о пользователе <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>: информация и контакты"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Разрешить приложения и контент"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничениями"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Развернуть настр. приложений"</string>
@@ -2600,8 +2596,8 @@
       <item quantity="many">Показать %d скрытых объектов</item>
       <item quantity="other">Показать %d скрытых объекта</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Сеть и Интернет"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, мобильные данные, передача данных, точка доступа"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Сеть и Интернет"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобильный Интернет, передача данных, точка доступа"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Подключенные устройства"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, трансляция"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Приложения и уведомления"</string>
@@ -2609,8 +2605,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Пользователь и аккаунты"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Приложения по умолчанию"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Язык, резервное копирование, обновления, сведения о телефоне"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Язык, резервное копирование, обновления, сведения об устройстве"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Настройки"</string>
     <string name="search_menu" msgid="6283419262313758339">"Поиск настроек"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Поиск настроек"</string>
@@ -2618,7 +2613,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Результаты"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, сетевое подключение"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"сообщение, обмен сообщениями, текст, SMS"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"мобильный, сотовый оператор, беспроводной, мобильный Интернет, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"сотовая сеть, мобильный Интернет, сотовый оператор, беспроводная сеть, передача данных, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, вызов, звонок"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Google Старт"</string>
     <string name="keywords_display" msgid="8910345814565493016">"экран, сенсорный экран"</string>
@@ -2694,8 +2689,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Оповещения"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибросигнал"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Звуки при включении устройства"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Настройки режима \"Не беспокоить\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Только важные"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Правила"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Задать режим \"Не беспокоить\""</string>
@@ -2712,9 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Звук уведомлений по умолчанию"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Сигнал будильника по умолчанию"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Совпадает с настройками в личном профиле"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Изменить настройки?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Использовать сигналы из личного профиля?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Да"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Сигналы в рабочем профиле будут заменены звуками, выбранными в личном."</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Вместо текущих звуковых сигналов, выбранных в рабочем профиле, будут использованы сигналы из личного профиля."</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Рингтоны"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Другие звуки и вибросигналы"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Настройки оповещений"</string>
@@ -2962,11 +2956,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"У приложения нет разрешений"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Приложение не запрашивало разрешения"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Все приложения"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Активные"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Установленные приложения"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Приложения с мгновенным запуском"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Личные"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Рабочие"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблокированные"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"С URL домена"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Дополнительные настройки"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Настроить приложения"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестное приложение"</string>
@@ -2993,8 +2987,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"По умолчанию для работы"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Помощник и голосовой ввод"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Помощник"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Нет"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Выберите приложение-помощник"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Назначить помощником приложение \"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>\"?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Ассистент сможет получать данные о программах в вашей системе, в том числе сведения с экрана и из приложений."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Разрешить"</string>
@@ -3024,6 +3016,8 @@
     <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">"Экономия заряда батареи"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Расход батареи"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Показать все приложения"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Скрыть доп. приложения"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Не экономят заряд"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не экономит заряд"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Экономия заряда включена"</string>
@@ -3208,6 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Холодные оттенки"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Использовать более холодные цвета на экране"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Для изменения цветовых настроек нужно отключить экран"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Чтобы включить Telephony Monitor, перезагрузите устройство"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматические обновления системы"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (требуется перезагрузка)"</string>
     <string name="usage" msgid="2977875522080448986">"Передача данных"</string>
@@ -3393,6 +3388,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Жест для вызова помощника"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3466,12 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Выбран глобальный прокси-сервер HTTP"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Администратор может заблокировать устройство и сбросить пароль"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Администратор может удалить все данные с устройства"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раз, то данные на устройстве будут удалены</item>
+      <item quantity="few">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раза, то данные на устройстве будут удалены</item>
+      <item quantity="many">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раз, то данные на устройстве будут удалены</item>
+      <item quantity="other">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раза, то данные на устройстве будут удалены</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раз, то данные рабочего профиля будут удалены</item>
+      <item quantity="few">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раза, то данные рабочего профиля будут удалены</item>
+      <item quantity="many">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раз, то данные рабочего профиля будут удалены</item>
+      <item quantity="other">Администратор установил, что если пароль будет введен неправильно <xliff:g id="COUNT_1">%d</xliff:g> раза, то данные рабочего профиля будут удалены</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Это управляемое устройство."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Этим устройством управляет <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Подробнее…"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Фото и видео"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музыка"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Игры"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Другие приложения"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлы"</string>
@@ -3482,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менеджер хранилища: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"отключен"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"включен"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Игры"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудиофайлы"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музыка"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(удалено у пользователя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(отключено для пользователя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Приложение для автозаполнения"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 4718cc8..ac2e584 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"ස්ථානය"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ගිණුම්"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"ආරක්ෂාව සහ තිර අගුල"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"සංකේතනය සහ අක්තපත්‍ර"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"මගේ ස්ථානය, තිර අගුළු ඇරීම, SIM පත් අගුල, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"මගේ ස්ථානය, තිර අගුළු ඇරීම, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"මුරපද"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"රහස්‍යතාව"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"පරිපාලක විසින් අබල කරන ලදී"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ආරක්ෂක තත්ත්වය"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"ස්ථානය, ඇඟිලි සලකුණ"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fi තෝරන්න"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi සක්‍රිය කරමින්..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi අක්‍රිය කරමින්..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"සියලු ජාල බලන්න"</string>
     <string name="wifi_error" msgid="3207971103917128179">"දෝෂය"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz කලාපය මෙම රටෙහි නොමැත"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"අහස්යානා ආකාරය තුළ"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"බ්ලූටූත් ටෙදරින්"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ටෙදරින්"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"හෝට් සපෝට් &amp; ටෙදරින්"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"හොට්ස්පොට් ක්‍රියාත්මකයි, ටෙදරින්"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"හොට්ස්පොට් ක්‍රියාත්මකයි"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ටෙදරින්"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"දත්ත සුරැකුම ක්‍රියාත්මක විට ටෙදර් කිරීමට හෝ අතේ ගෙන යා හැකි හොට්ස්පොට් භාවිත කිරීමට නොහැකිය"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ටෙදරින්"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"උපාංග තිර අගුල හා සමාන"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"යෙදුම් කළමනාකරණය කරන්න"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ස්ථාපිත යෙදුම් කළමනාකරණය කරන්න සහ ඉවත් කරන්න"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"යෙදුම් තොරතුරු"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"යෙදුම් කළමනාකරණය, ඉක්මන් පිවිසුම් කෙටිමං සකසන්න"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"යෙදුම් සැකසීම්"</string>
     <string name="install_applications" msgid="4872012136210802181">"නොදන්නා මුලාශ්‍ර"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"ඉඩ කළමනාකරණය"</string>
     <string name="filter" msgid="2018011724373033887">"පෙරහන කරන්න"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"පෙරහන් විකල්ප තෝරන්න"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"සියලු"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"අබලයි"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"සියලු යෙදුම්"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"අබල කළ යෙදුම්"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"බාගන්නා ලද"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ධාවනය වෙමින්"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB ආචයනය"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD කාඩ් පතෙහි තිබෙන"</string>
     <string name="disabled" msgid="9206776641295849915">"අබල කර ඇත"</string>
     <string name="not_installed" msgid="2797554494953450291">"මෙම පරිශීලකයා සඳහා ස්ථාපනය කර නොමැත"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"ස්ථාපනය කර ඇත"</string>
     <string name="no_applications" msgid="7336588977497084921">"යෙදුම් නොමැත."</string>
     <string name="internal_storage" msgid="1584700623164275282">"අභ්‍යන්තර ආචයනය"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"අභ්‍යන්තර ගබඩාව"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"ආදාන ක්‍රම සකසන්න"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"සැකසීම්"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"සැකසීම්"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"සක්‍රීය ආදායක මාර්ග"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"පද්ධති භාෂා භාවිත කරන්න"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> සැකසීම්"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"සක්‍රිය ආදාන ක්‍රම තෝරන්න"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"තිරයමත යතුරුපුවරු සැකසුම්"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"තිර විශාලනය ස්වයංක්‍රීයව යාවත්කාලීන කරන්න"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"යෙදුම් සංක්‍රමණයේදී තිර විශාලනය යාවත්කාලීන කරන්න"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"බල බොත්තම ඇමතුම අවසන් කරයි"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"මුරපද කියවන්න"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"විශාල මූසික දර්ශකය"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"ඒකල ශ්‍රව්‍යය"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ශ්‍රව්‍ය ධාවනය කරන විට නාලිකා ඒකාබද්ධ කරන්න"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"අවසාන සම්පූර්ණ ආරෝපණය තෙක් භාවිත කරන්න"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"තිර භාවිතය"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"තිර පරිභෝජනය"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"ජංගම ජාල පරිලෝකනය කරමින්"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"අවසන් පූර්ණ ආරෝපණයෙන් පසුව යෙදුම් භාවිතය"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"අවසන් පූර්ණ ආරෝපණයෙන් පසුව උපාංග භාවිතය"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"පේනුවෙන් ඉවත් කළ පසු බැටරි භාවිතය"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ප්‍රත්‍යාරම්භ කිරීමට පසු බැටරි භාවිතය"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"බැටරියෙන් <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"වැඩියෙන් ගණනය කළ බල භාවිතය"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$sක් භාවිත කරන ලදී"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"සමස්ත බැටරියෙන් %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"අවසන් පූර්ණ ආරෝපණයෙන් පසුව භාවිතා ප්‍රභේදනය"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"ඇස්තමේන්තුගත ඉතිරි කාලය"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"පූර්ණ ආරෝපණයට ගත වන වේලාව"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"භාවිතය මත පදනම්ව ඇස්තමේන්තුව වෙනස් විය හැකිය"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"සැම විටම ක්‍රියාත්මකයි අක්‍රියයි"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"මෙම යෙදුම මගින් සහාය නොදක්වයි"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"VPN හරහා වන සම්බන්ධතාවලට පමණක් ඉඩ දෙන්න"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN සම්බන්ධතාව අවශ්‍යද?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"අගුලු දැමීම සක්‍රියයි"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"අගුලු දැමීම අක්‍රියයි"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"සෑම විටම සම්බන්ධ වී පැවතීමට VPN පැතිකඩක් තෝරන්න. මෙම VPN හා සම්බන්ධවී ඇතිවිට පමණක් ජාල ගමනාගමනයට අවසර ඇත."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"සීමිත පැතිකඩ වලට ගිණුම් එක් කළ නොහැක"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"මෙම උපාංගයෙන් <xliff:g id="USER_NAME">%1$s</xliff:g> මකන්න"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"අගුලු තිර සැකසීම්"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"අගුලු තිරයෙන් පරිශීලකයන් එක් කරන්න"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"නව පරිශීලකයා"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"නව පැතිකඩ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"ඔබව මකන්නද?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"දුරකථන ඇමතුම් සහ SMS ක්‍රියාත්මක කරන්න?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"මෙම පරිශීලකයා සමඟ ඇමතුම් සහ SMS ඉතිහාසය බෙදාගන්නා ලදි."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"හදිසි අවස්ථා තොරතුරු"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> පිළිබඳ විස්තර"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> සඳහා තොරතුරු සහ සම්බන්ධතා"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"යෙදුම්වලට හා අන්තර්ගතයන්ට ඉඩ දෙන්න"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"සීමා කිරීම් සහිත යෙදුම්"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"යෙදුම සඳහා සැකසීම් දිගහරින්න"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="one">සඟවන ලද අයිතම %dක් පෙන්වන්න</item>
       <item quantity="other">සඟවන ලද අයිතම %dක් පෙන්වන්න</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"ජාලය සහ අන්තර්ජාලය"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, සෙලියුලර්, දත්ත භාවිතය, හොට්ස්පොට්"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"ජාලය සහ අන්තර්ජාලය"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, ජංගම, දත්ත භාවිතය, හොට්ස්පොට්"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"සම්බන්ධ කළ උපාංග"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"බ්ලුටූත්, NFC, විකාශය"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"යෙදුම් සහ දැනුම්දීම්"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"පරිශීලක සහ ගිණුම්"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"පෙරනිමි යෙදුම්"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"භාෂා, උපස්ථය, යාවත්කාලීන, දුරකථනය ගැන"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"භාෂා, උපස්ථය, යාවත්කාලීන, උපාංගය ගැන"</string>
     <string name="search_results_title" msgid="1796252422574886932">"සැකසීම්"</string>
     <string name="search_menu" msgid="6283419262313758339">"සැකසීම් සොයන්න"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"සැකසීම් සොයන්න"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"ප්‍රතිඵල"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi wi-fi ජාල සබැඳුම"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"පෙළ පණිවිඩය, පෙළ පණිවිඩ යැවීම, පණිවිඩ, පණිවිඩකරණය"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"සෙලියුලර්, සෙල් වාහකය, රැහැන් රහිත, දත්ත, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"සෙලියුලර්, ජංගම, සෙල් වාහකය, රැහැන් රහිත, දත්ත, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi ඇමතුම, අමතමින්"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ආරම්භකය"</string>
     <string name="keywords_display" msgid="8910345814565493016">"තිරය, ස්පර්ශ තිරය"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"ඇඟවීම"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"කම්පනය වන්න"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ශබ්ද බල ගන්වන්න"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"මනාපවලට බාධා ‍නොකරන්න"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ප්‍රමුඛතා පමණි ඉඩ දෙයි"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ස්වයංක්‍රීය රීති"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"බාධා නොකරන්න කාල සටහන සැකසීම"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"පෙරනිමි කාර්යාල දැනුම් දීම් හඬ"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"පෙරනිමි කාර්යාල එලාම නාද රිද්ම"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"පුද්ගලික පැතිකඩ හා සමානව"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"කා. පැතිකඩ හඩ ප්‍රතිස්ථා. කර.?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"පුද්ගලික පැතිකඩ හඬ භාවිත කරන්නද?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ප්‍රතිස්ථාපනය කරන්න"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"ඔබේ වත්මන් කාර්යාල පැතිකඩ හඬවල් ඔබේ පුද්ගලික පැතිකඩ හඬවල්වලින් ප්‍රතිස්ථාපනය වනු ඇත"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"ඔබේ පුද්ගලික පැතිකඩ හඬවල් ඔබේ වත්මන් කාර්යාල පැතිකඩ හඬව ල්වලින් ප්‍රතිස්ථාපනය වනු ඇත"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"නාද රිද්ම"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"වෙනත් ශබ්ද සහ කම්පන"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"දැනුම්දීම් මනාප"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"අවසර ලබා දී නැත"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"අවසර ඉල්ලා නැත"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"සියලු යෙදුම්"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"සබලයි"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ස්ථාපිත යෙදුම්"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"ක්ෂණික යෙදුම්"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"පුද්ගලික"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"කාර්යාලය"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"අවහිර කරන ලදි"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"වසම් URL සමග"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"උසස්"</string>
     <string name="configure_apps" msgid="6685680790825882528">"යෙදුම් වින්‍යාස කරන්න"</string>
     <string name="unknown_app" msgid="5275921288718717656">"නොදන්නා යෙදුම"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"වැඩ සඳහා පෙරනිමි"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"සහාය සහ හඬ ආදානය"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"සහාය යෙදුම"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"කිසිවක් නැත"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"සහාය යෙදුම තෝරන්න"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ඔබේ සහායක බවට පත් කරන්නද?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"සහායකට ඔබේ තිරය මත දෘශ්‍යමාන වන හෝ යෙදුම් තුළ පිවිසිය හැකි තොරතුරු ඇතුළුව, ඔබේ පද්ධතිය මත භාවිතයේ ඇති යෙදුම් පිළිබඳ කියවීමට හැකි වනු ඇත."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"එකඟ වේ"</string>
@@ -2966,6 +2958,8 @@
     <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">"බැටරි ප්‍රශස්තකරණය"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"භාවිත ඇඟවීම්"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"සියලුම යෙදුම් පෙන්වන්න"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"අමතර යෙදුම් සඟවන්න"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ප්‍රශස්තකරණය වී නොමැත"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ප්‍රශස්තකරණය වී නොමැත"</string>
     <string name="high_power_off" msgid="3393904131961263278">"බැටරි භාවිතය ප්‍රශස්තකරණය"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"සිසිල් වර්ණ උෂ්ණත්වය"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"වඩා සිසිල් සංදර්ශක වර්ණ භාවිත කිරීම"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"වර්ණ වෙනස් කිරීම යෙදීමට තිරය ක්‍රියාවිරහිත කරන්න"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor වෙනස්කම සක්‍රිය කිරීමට, උපාංගය නැවත පණ ගන්වන්න"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ස්වයංක්‍රිය පද්ධති යාවත්කාලීන"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (නැවත පණ ගැන්වීම අවශ්‍යයි)"</string>
     <string name="usage" msgid="2977875522080448986">"භාවිතය"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"ඉඟිතයට සහාය දක්වන්න"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ගෝලීය HTTP ප්‍රොක්සි සකසන ලදී"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"පරිපාලකට උපාංගය අගුලු දැමීමට සහ මුරපදය යළි සැකසීමට හැකිය"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"පරිපාලකට සියලු උපාංග දත්ත මැකීමට හැකිය"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <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="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"මෙම උපාංගය කළමනාකරණය කෙරේ."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"මෙම උපාංගය <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> මගින් කළමනාකරණය කෙරේ"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"තව දැන ගන්න"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ඡායාරූප සහ වීඩියෝ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"සංගීතය සහ ශ්‍රව්‍ය"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"ක්‍රීඩා"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"වෙනත් යෙදුම්"</string>
     <string name="storage_files" msgid="8581083146777364063">"ගොනු"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ගබඩා කළමනාකරු: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ක්‍රියාවිරහිතයි"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ක්‍රියාත්මකයි"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"ක්‍රීඩා"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ශ්‍රව්‍ය ගොනු"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"සංගීත"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> පරිශීලක සඳහා අස්ථාපනය කෙරිණි)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> පරිශීලක සඳහා අබල කෙරිණි)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"ස්වයං පිරවුම් යෙදුම"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2ee8491..f3a0c48 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -334,9 +334,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Účty"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Zabezpečenie a zámka obrazovky"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrovanie a poverenia"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavenie funkcie Moje poloha, odomknutie obrazovky a zamknutie úložiska poverení"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Heslá"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Ochrana súkromia"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Zakázané správcom"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Stav zabezpečenia"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Poloha, odtlačky prstov"</string>
@@ -687,8 +688,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Vybrať sieť Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Prebieha zapínanie siete Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Prebieha vypínanie Wi-Fi..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Zobraziť všetky siete"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Chyba"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"V tejto krajine nie je pásmo 5 GHz k dispozícii"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Režim v lietadle"</string>
@@ -1281,12 +1281,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Pripojenie cez Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Zdieľanie dát. pripojenia"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Hotspot a tethering"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot je zapnutý, tethering"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Hotspot je zapnutý"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Tethering"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Keď je Šetrič dát zapnutý, nie je možné zdieľať internetové pripojenie ani používať prenosné hotspoty"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Zdieľané pripojenie cez USB"</string>
@@ -1450,8 +1447,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Rovnaká ako zámka obrazovky zariadenia"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovať aplikácie"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Správa a odstraňovanie nainštalovaných aplikácií"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informácie o aplikácii"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Správa aplikácií a nastavenie rýchleho spustenia"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Nastavenia aplikácie"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznáme zdroje"</string>
@@ -1513,16 +1509,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Správa pamäte"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrovať"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Zvoľte možnosti filtra"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Všetko"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Zakázané"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Všetky aplikácie"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Zakázané aplikácie"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Stiahnuté"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Spustené"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Ukladací priestor USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na SD karte"</string>
     <string name="disabled" msgid="9206776641295849915">"Zakázané"</string>
     <string name="not_installed" msgid="2797554494953450291">"Pre tohto používateľa nenainš."</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Nainštalovaná"</string>
     <string name="no_applications" msgid="7336588977497084921">"Žiadne aplikácie."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interný ukl. priestor"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"interné úložisko"</string>
@@ -1700,8 +1695,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Nastavenie metód vstupu"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Nastavenia"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Nastavenia"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktívne metódy vstupu"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Použiť jazyky systému"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Nastavenia <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Zvoliť aktívne metódy vstupu"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavenia klávesnice na obrazovke"</string>
@@ -1745,7 +1738,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto. aktualiz. priblíž. obrazovky"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aktualizovať priblíž. obrazov. pri prechodoch apl."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Vypínač ukončí hovor"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Vyslovovať heslá"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Veľký kurzor myši"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Zvuk mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Pri prehrávaní zvuku kombinovať kanály"</string>
@@ -1871,7 +1863,11 @@
     <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">"Zostáva <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 nabitia"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Využitie od posledného úplného dobitia"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Využitie obrazovky"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Spotreba obrazovkou"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Vyhľadávanie mobilnej siete"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Využitie aplikácií od posledného úplného dobitia"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Využívanie zariadenia od posledného úplného dobitia"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využitie batérie od odpojenia"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Využitie batérie od obnovenia"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na batérii"</string>
@@ -1961,11 +1957,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadsadená spotreba energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Využívaná %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s z celkovej výdrže batérie"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Rozdelenie využitia od posledného úplného dobitia"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Odhadovaný zostávajúci čas:"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Čas do úplného nabitia"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Odhad sa môže líšiť v závislosti od intenzity využitia"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojenia"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Pri poslednom odpojení pre <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Využitie batérie celkom"</string>
@@ -2356,6 +2352,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Nastavenie Vždy zapnuté je deaktivované"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nepodporované touto aplikáciou"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Povoliť iba pripojenia cez VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Vyžadovať pripojenie VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Uzamknutie je aktívne"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Uzamknutie je neaktívne"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vyberte profil VPN, ku ktorému chcete mať vždy pripojenie. Sieťová premávka bude povolená len v prípade pripojenia k tejto sieti VPN."</string>
@@ -2449,8 +2446,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profily s obmedzeniami nemôžu pridávať účty"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Odstrániť zo zariadenia (<xliff:g id="USER_NAME">%1$s</xliff:g>)"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Nastavenia uzamknutej obrazovky"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Pridávať používateľov na uzamknutej obrazovke"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nový používateľ"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nový profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcete odstrániť svoj profil?"</string>
@@ -2478,7 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Zapnúť telefonické hovory a správy SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"S týmto používateľom sa bude zdieľať história hovorov a správ SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Núdzové informácie"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informácie o používateľovi <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informácie a kontakty používateľa <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Povoliť aplikácie a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikácie s obmedzením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbaliť nastavenia aplikácie"</string>
@@ -2600,8 +2596,8 @@
       <item quantity="other">Zobraziť %d skrytých položiek</item>
       <item quantity="one">Zobraziť %d skrytú položku</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Sieť a internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobilné dáta, spotreba dát, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Sieť a internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilné, spotreba dát, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pripojené zariadenia"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, prenos"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikácie a upozornenia"</string>
@@ -2609,8 +2605,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Používateľ a účty"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Predvolené aplikácie"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Jazyky, zálohovanie, aktualizácie, informácie o telefóne"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Jazyky, zálohovanie, aktualizácie, informácie o zariadení"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavenia"</string>
     <string name="search_menu" msgid="6283419262313758339">"Nastavenia vyhľadávania"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Nastavenia vyhľadávania"</string>
@@ -2618,7 +2613,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Výsledky"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, sieťové pripojenie"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"textová správa, poslať textovú správu, správy, posielanie textových správ"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobilné, mobilný operátor, bezdrôtový, dáta, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilné, mobil, mobilný operátor, bezdrôtové, dáta, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, hovor, volanie"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"obrazovka, dotyková obrazovka"</string>
@@ -2694,8 +2689,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozornenie"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrovanie"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Zvuky pri spustení"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Predvoľby funkcie Nerušiť"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritné"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatické pravidlá"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Nastaviť rozvrh režimu Nerušiť"</string>
@@ -2712,9 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Predv. tón prac. upozornenia"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Predvolený tón prac. budíka"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Rovnaké ako osobný profil"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Nahradiť zvuky prac. profilu?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Použiť zvuky osobného profilu?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Nahradiť"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Vaše súčasné zvuky pracovného profilu budú nahradené zvukmi osobného profilu"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Vaše aktuálne zvuky pracovného profilu budú nahradené zvukmi osobného profilu"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Tóny zvonenia"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Ďalšie zvuky a vibrácie"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Predvoľby upozornení"</string>
@@ -2962,11 +2956,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Neboli udelené žiadne povolenia"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Neboli požadované žiadne povolenia"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Všetky aplikácie"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Povolené"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Nainštalované aplikácie"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Okamžité aplikácie"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobné"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Pracovné"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokované"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S webovými adresami domény"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšírené"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurácia aplikácií"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznáma aplikácia"</string>
@@ -2993,8 +2987,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Predvolené na prácu"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Asistencia a hlasový vstup"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Asistenčná aplikácia"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Žiadna"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Výber pomocnej aplikácie"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Chcete urobiť z aplikácie <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> pomocnú aplikáciu?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Pomocník bude môcť čítať informácie o aplikáciách používaných vo vašom systéme vrátane údajov viditeľných na obrazovke alebo prístupných v aplikáciách."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Súhlasím"</string>
@@ -3024,6 +3016,8 @@
     <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">"Optimalizácia batérie"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozornenia na spotrebu"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Zobraziť všetky aplikácie"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Skryť ďalšie aplikácie"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimalizované"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimalizované"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimalizuje používanie batérie"</string>
@@ -3208,6 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Studená teplota farby"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Používať studenšie farby obrazovky"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ak chcete použiť zmenu farby, vypnite obrazovku"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ak chcete použiť zmenu monitorovania telefonických služieb, reštartujte zariadenie"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizácie systému"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Zväzky modulov HAL (vyžaduje reštart)"</string>
     <string name="usage" msgid="2977875522080448986">"Využitie"</string>
@@ -3393,6 +3388,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Upozornenia zobrazíte prejdením prstom nadol po senzore odtlačkov prstov na zadnej strane telefónu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Upozornenia zobrazíte prejdením prstom nadol po senzore odtlačkov prstov na zadnej strane tabletu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Upozornenia zobrazíte prejdením prstom nadol po senzore odtlačkov prstov na zadnej strane zariadenia."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto asistencie"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Zapnuté"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Vypnuté"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader je už odomknutý"</string>
@@ -3466,12 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Bol nastavený globálny proxy server protokolu HTTP"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Správca môže uzamknúť zariadenie a obnoviť heslo"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Správca môže zo zariadenia odstrániť všetky údaje"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="few">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia všetky dáta zariadenia, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="many">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia všetky dáta zariadenia, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia všetky dáta zariadenia, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="one">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia všetky dáta zariadenia, na hodnotu <xliff:g id="COUNT_0">%d</xliff:g></item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="few">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia dáta pracovného profilu, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="many">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia dáta pracovného profilu, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia dáta pracovného profilu, na hodnotu <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="one">Správca nastavil maximálny počet pokusov o zadanie hesla predtým, ako sa odstránia dáta pracovného profilu, na hodnotu <xliff:g id="COUNT_0">%d</xliff:g>.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Toto zariadenie je spravované."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Toto zariadenie spravuje organizácia <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Ďalšie informácie"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotky a videá"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Hudba a zvuk"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Hry"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ďalšie aplikácie"</string>
     <string name="storage_files" msgid="8581083146777364063">"Súbory"</string>
@@ -3482,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Správca úložiska: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Vypnutý"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Zapnutý"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Hry"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Zvukové súbory"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Hudba"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(odinštalované pre používateľa <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(vypnuté pre používateľa <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikácia automatického dopĺňania"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5ea22d5..6cacca6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -334,9 +334,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Varnost in zaklepanje zaslona"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifriranje in poverilnice"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavitev Moje lokacije, odklepanja zaslona, zaklepanja shrambe poverilnic"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Gesla"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Zasebnost"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Onemogočil skrbnik"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Stanje varnosti"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Lokacija, prstni odtis"</string>
@@ -687,8 +688,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Izberi Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Vklapljanje povezave Wi‑Fi …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Izklapljanje povezave Wi‑Fi …"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Pokaži vsa omrežja"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Napaka"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5-GHz pas ni na voljo v tej državi"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"V načinu za letalo"</string>
@@ -1281,12 +1281,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Internet prek Bluetootha"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Internet prek mob. napr."</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Dost. točka in int. pov."</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Dostopna točka je vklopljena, internetna povezava prek telefona"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Dostopna točka je vklopljena"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Internetna povezava prek telefona"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dokler je vklopljeno varčevanje s podatki, ni mogoče vzpostaviti povezave z internetom prek mobilnega telefona ali uporabljati prenosnih dostopnih točk."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Internetna povezava prek USB"</string>
@@ -1450,8 +1447,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Enako kot zaklepanje zaslona naprave"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljaj aplikacije"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje in odstranjevanje nameščenih aplikacij"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Podatki o aplikaciji"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Upravljanje aplikacij, nastavljanje bližnjic za hiter zagon"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Nastavitve aplikacij"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznani viri"</string>
@@ -1513,16 +1509,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostor"</string>
     <string name="filter" msgid="2018011724373033887">"Filtriraj"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Izberite možnosti filtriranja"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Vse"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Onemogočene"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Vse aplikacije"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Onemogočene aplikacije"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Preneseno"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Se izvaja"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Pomnilnik USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na kartici SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Onemogočeno"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ni namešč. za tega uporabnika"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Nameščeno"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ni aplikacij."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Notranja shramba"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"notranja shramba"</string>
@@ -1700,8 +1695,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Nastavitev načinov vnosa"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Nastavitve"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Nastavitve"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktivni načini vnosa"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Uporaba sistemskih jezikov"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Nastavitve za <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Izbira aktivnih načinov vnosa"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavitve zaslonske tipkovnice"</string>
@@ -1745,7 +1738,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Samodejno posodobi povečavo zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Posodabljanje povečave zaslona pri prehodih aplik."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Gumb za vklop konča klic"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Izgovarjanje gesel"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Velik kazalec miške"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono zvok"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Združevanje kanalov pri predvajanju zvoka"</string>
@@ -1871,7 +1863,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Uporaba od zadnje polne napolnjenosti"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Uporaba zaslona"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Poraba zaslona"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Pregledovanje mobilnih omrežij"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Poraba aplikacij od zadnje polne napolnjenosti akumulatorja"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Poraba naprave od zadnje polne napolnjenosti akumulatorja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uporaba akumulatorja po odklopu"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uporaba akumulatorja od ponastavitve"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Čas napajanja iz akumulatorja: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1961,11 +1957,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Preveč šteta uporaba energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Trajanje uporabe: %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s celotne napolnjenosti akumulatorja"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Razčlenjen prikaz porabe od zadnje polne napolnjenosti akumulatorja"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Približni preostali čas"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Preostali čas do polne napolnjenosti"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Ocena je odvisna od uporabe in se lahko spremeni"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odklopa"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Po zadnjem odklopu za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Skupna poraba"</string>
@@ -2356,6 +2352,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Način »vedno vklopljeno« ni dejaven"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ta aplikacija tega ne podpira"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Dovoli samo povezave prek omrežja VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Ali zahtevate povezavo VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Zaklep aktiven"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Zaklep neaktiven"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Izberite profil za navidezno zasebno omrežje (VPN), s katerim boste vedno povezani. Omrežni promet bo dovoljen samo prek tega omrežja VPN."</string>
@@ -2449,8 +2446,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profili z omejitvami ne morejo dodajati računov"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Izbris up. <xliff:g id="USER_NAME">%1$s</xliff:g> iz napr."</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Nastavitve zaklepanja zaslona"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Dodajanje uporabnikov na zaklenjenem zaslonu"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nov uporabnik"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nov profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Želite izbrisati sebe?"</string>
@@ -2478,7 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vklop telefonskih klicev in sporočil SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Zgodovina klicev in sporočil SMS bo dana v skupno rabo s tem uporabnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije za nujne primere"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informacije o uporabniku <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Podatki in stiki za uporabnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Omogočanje aplikacij in vsebine"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije z omejitvami"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Dodatne nastavitve za aplikacijo"</string>
@@ -2600,8 +2596,8 @@
       <item quantity="few">Pokaži %d skrite elemente</item>
       <item quantity="other">Pokaži %d skritih elementov</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Omrežje in internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobilno omrežje, prenesena količina podatkov, dostopna točka"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Omrežje in internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilno, prenesena količina podatkov, dostopna točka"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezane naprave"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije in obvestila"</string>
@@ -2609,8 +2605,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Uporabnik in računi"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Privzete aplikacije"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Jeziki, varnostno kopiranje, posodobitve, o telefonu"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Jeziki, varnostno kopiranje, posodobitve, o napravi"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavitve"</string>
     <string name="search_menu" msgid="6283419262313758339">"Nastavitve iskanja"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Nastavitve iskanja"</string>
@@ -2618,7 +2613,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Rezultati"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, omrežna povezava"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"sporočilo SMS, pošiljanje sporočil SMS, sporočila SMS, izmenjava sporočil SMS"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobilno, mobilni operater, brezžično, podatki, 4G, 3G, 2G, LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilno omrežje, mobilno, operater, brezžično, podatki, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, klic, klicanje"</string>
     <string name="keywords_home" msgid="3626170808219458848">"zaganjalnik"</string>
     <string name="keywords_display" msgid="8910345814565493016">"zaslon, zaslon na dotik"</string>
@@ -2694,8 +2689,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Opozorilo"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibriranje"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Zvoki ob zagonu"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Nastavitve načina »ne moti«"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"»Samo predn.« dovoljuje"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Samodejna pravila"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Nastavitev urnika za »ne moti«"</string>
@@ -2712,9 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Privzeti delovni ton obvestila"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Privzeti delovni ton alarma"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Kot v osebnem profilu"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Zamenj. zvokov v del. profilu?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Ali želite uporabiti zvoke iz osebnega profila?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Zamenjaj"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Trenutne zvoke v delovnem profilu bodo nadomestili zvoki iz osebnega profila"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Zvoki iz osebnega profila bodo uporabljeni namesto trenutnih zvokov v delovnem profilu"</string>
     <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="7447797716856573587">"Nastavitve obvestil"</string>
@@ -2962,11 +2956,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Ni odobrenih dovoljenj"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Ni zahtevanih dovoljenj"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Vse aplikacije"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Omogočeno"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Nameščene aplikacije"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Aplikacije brez nameščanja"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osebno"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Služba"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirano"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Z URL-ji domene"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Dodatno"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguriranje aplikacij"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznana aplikacija"</string>
@@ -2993,8 +2987,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Privzeto za delo"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Pomoč in glasovni vnos"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplikacija za pomoč"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Brez"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Izbira aplikacije za pomoč"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Ali želite, da je aplikacija <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> vaš pomočnik?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Pomočnik bo lahko bral podatke o aplikacijah, ki se uporabljajo v vašem sistemu, vključno s podatki, ki so vidni na zaslonu ali do katerih je mogoče dostopati v aplikacijah."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Strinjam se"</string>
@@ -3024,6 +3016,8 @@
     <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">"Optimizacija akumulatorja"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Opozorila o porabi"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Pokaži vse aplikacije"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Skrij dodatne aplikacije"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ni optimizirano"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ni optimizirano"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija uporabe akumulatorja"</string>
@@ -3208,6 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladnejša barvna temperatura"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Uporaba hladnejših barv zaslona"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Če želite uveljaviti spremembo barv, izklopite zaslon"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Če želite uveljaviti spremembo nadziranja telefonije, znova zaženite napravo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Samodejne sistemske posodobitve"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Povezovanje HAL (zahteva ponovni zagon)"</string>
     <string name="usage" msgid="2977875522080448986">"Uporaba"</string>
@@ -3393,6 +3388,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Poteza za pomoč"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3466,12 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globalni strežnik proxy za HTTP je nastavljen"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Skrbnik lahko zaklene napravo in ponastavi geslo"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Skrbnik lahko izbriše vse podatke v napravi"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo vsi podatki v napravi, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="two">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo vsi podatki v napravi, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="few">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo vsi podatki v napravi, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo vsi podatki v napravi, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo podatki delovnega profila, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="two">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo podatki delovnega profila, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="few">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo podatki delovnega profila, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">Skrbnik je največje število poskusov vpisa gesla, preden se izbrišejo podatki delovnega profila, nastavil na <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Ta naprava je upravljana."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"To napravo upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Več o tem"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotografije in videoposnetki"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Glasba in zvok"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
@@ -3482,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj shrambe: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Izklopljeno"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Vklopljeno"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Zvočne datoteke"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Glasba"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(odstranjeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogočeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacija s samodejnim izpolnjevanjem"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 4bd0cf2..3fbf752 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Vendndodhja"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Llogaritë"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Siguria dhe kyçja e ekranit"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptimi dhe kredencialet"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Cakto \"Vendndodhjen time\", shkyçjen e ekranit, kyçjen e kartës SIM, kyçjen e hapësirës për ruajtjen e kredencialeve"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Cakto \"Vendndodhja ime\", shkyçjen e ekranit, kyçjen e hapësirës ruajtëse të kredencialeve"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Fjalëkalimet"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privatësia"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Çaktivizuar nga administratori"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Statusi i sigurisë"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Vendndodhja, gjurma e gishtit"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Njësoj si kyçja e ekranit të pajisjes"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Menaxho aplikacionet"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Menaxho dhe hiq aplikacionet e instaluara"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Informacioni mbi aplikacionin"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Menaxho aplikacionet, konfiguro shkurtoret e hapjes së shpejtë"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Cilësimet e apl."</string>
     <string name="install_applications" msgid="4872012136210802181">"Burime të panjohura"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Menaxho hapësirën"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Zgjidh opsionet e filtrit"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Të gjitha"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Çaktivizuar"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Të gjitha aplikacionet"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Aplikacionet e çaktivizuara"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Të shkarkuara"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Vrapim"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Hapësira ruajtëse e USB-së"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Në kartën SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Çaktivizuar"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nuk është i instaluar për këtë përdorues"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"I instaluar"</string>
     <string name="no_applications" msgid="7336588977497084921">"Asnjë aplikacion."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Hapësira e brendshme ruajtëse"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"hapësira e brendshme për ruajtje"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Konfiguro metodat e hyrjes"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Cilësimet"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Cilësimet"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metodat aktive të hyrjeve"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Përdor gjuhët e sistemit"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Cilësimet e <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Zgjidh metodat aktive të hyrjes"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Cilësimet e tastierës në ekran"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Përditëso auto. zmadhimin e ekranit"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Përditëso zmadhimin e ekranit në kalimet e apl."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Butoni i fikjes mbyll telefonatën"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Thuaji fjalëkalimet me zë"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Kursor i madh miu"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audioja mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Ndërthur kanalet kur luan audion"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Përdorimi nga ngarkimi i fundit i plotë"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Përdorimi i ekranit"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumi i ekranit"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Skanimi i rrjetit celular"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Përdorimi i aplikacioneve që nga ngarkimi i fundit i plotë"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Përdorimi i pajisjes që nga ngarkimi i fundit i plotë"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Përdorimi i baterisë që nga heqja nga ngarkimi"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Përdorimi i baterisë që nga rivendosja"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> me bateri"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Përdorimi i energjisë i numëruar më shumë sa duhet"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Përdorur për %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s nga e gjithë bateria"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Analiza e përdorimit që nga ngarkimi i fundit i plotë"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Koha e vlerësuar e mbetur"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Koha deri në ngarkimin e plotë"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Vlerësimi mund të ndryshojë sipas përdorimit"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> që kur ka qenë në prizë"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kur ishte në prizë për herë të fundit për <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\"Gjithmonë ndezur\" joaktive"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Nuk mbështetet nga ky aplikacion"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Lejo vetëm lidhjet nëpërmjet VPN-së"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Të kërkohet lidhja e VPN-së?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Bllokimi aktiv"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Bllokimi joaktiv"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Zgjidh një profil VPN-je për të qëndruar gjithmonë i lidhur. Trafiku i rrjetit do të lejohet vetëm kur të lidhet me këtë VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profilet e kufizuar nuk mund të shtojnë llogari"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Fshije <xliff:g id="USER_NAME">%1$s</xliff:g> nga pajisja"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Cilësimet e ekranit të kyçjes"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Shto përdoruesit nga ekrani i kyçjes"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Përdorues i ri"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Profili i ri"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Do e fshish veten?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Të aktivizohen telefonatat dhe SMS-të?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Historiku i telefonatave dhe SMS-ve do të ndahet me këtë përdorues."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacioni i urgjencës"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Informacione rreth <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Informacionet dhe kontaktet për <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Lejo aplikacionet dhe përmbajtjen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacionet me kufizime"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Zgjeroji cilësimet për aplikacionin"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Shfaq %d artikuj të fshehur</item>
       <item quantity="one">Shfaq %d artikull të fshehur</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Rrjeti dhe interneti"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, celulare, përdorimi i të dhënave, zona e qasjes në internet"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Rrjeti dhe interneti"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, celular, përdorimi i të dhënave, zona e qasjes në internet"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pajisje të lidhura"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, transmetimi"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacionet dhe njoftimet"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Rezultatet"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, lidhje rrjeti"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mesazhe me tekst, dërgimi i mesazheve, mesazhe, mesazhim"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"celular, operator celular, me valë, të dhëna, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, celular, operator celular, pa tel, të dhëna, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, telefonatë, telefono"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Nisësi"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, ekran me prekje"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Sinjalizimi"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dridhje"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Aktivizo tingujt"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Preferencat për \"Mos shqetëso\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Vetëm njoftimet me prioritet"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Rregullat automatike"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Cakto planifikimin për \"Mos shqetëso\""</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Toni i parazgjedhur i njoftimeve të punës"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Zilja e parazgjedhur e alarmit të punës"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Njësoj si profili personal"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Të zëvendësohen tingujt e profilit të punës?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Të përdoren tingujt e profilit personal?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Zëvendëso"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Tingujt aktualë të profilit tënd të punës do të zëvendësohen me tingujt e profilit tënd personal"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Do të përdoren tingujt e profilit tënd personal në vend të tingujve aktualë të profilit të punës"</string>
     <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="7447797716856573587">"Preferencat e njoftimeve"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nuk është dhënë leje"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nuk është kërkuar leje"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Të gjitha apl."</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Të aktivizuara"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Aplikacionet e instaluara"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Aplikacionet e çastit"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personale"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Punë"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Të bllokuara"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Me URL-të e domenit"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Të përparuara"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguro aplikacionet"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikacion i panjohur"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Të parazgjedhura për punën"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Asistenti dhe hyrja zanore"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplikacioni i asistentit"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Asnjë"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Zgjidh aplikacionin e asistentit"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Bëje <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> asistentin tënd?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Asistenti do të jetë në gjendje të lexojë informacion rreth aplikacioneve në përdorim në sistemin tënd, duke përfshirë informacionin e dukshëm në ekran ose të qasshëm brenda aplikacioneve."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Pranoj"</string>
@@ -2959,6 +2958,8 @@
     <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">"Optimizimi i baterisë"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Sinjalizimet për përdorimin"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Shfaq të gjitha aplikacionet"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Fshih aplikacionet shtesë"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Jo të optimizuara"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nuk është i optimizuar"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizojnë përdorimin e baterisë"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura e ftohtë e ngjyrës"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Përdor ngjyra të ftohta të ekranit"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Për të zbatuar ndryshimin e ngjyrës, çaktivizoje ekranin"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Për të zbatuar ndryshimin e monitorit të telefonisë, rindizni pajisjen"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Përditësimet automatike të sistemit"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HALs e paketizuar (kërkon rinisje)"</string>
     <string name="usage" msgid="2977875522080448986">"Përdorimi"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Gjesti ndihmës"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Përfaqësuesi global HTTP i caktuar"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratori mund ta kyçë pajisjen dhe rivendosë fjalëkalimin"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratori mund të fshijë të gjitha të dhënat e pajisjes"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administratori e caktoi numrin maksimal të përpjekjeve për fjalëkalimin në <xliff:g id="COUNT_1">%d</xliff:g> para se të fshihen të gjitha të dhënat e pajisjes</item>
+      <item quantity="one">Administratori e caktoi numrin maksimal të përpjekjeve për fjalëkalimin në <xliff:g id="COUNT_0">%d</xliff:g> para se të fshihen të gjitha të dhënat e pajisjes</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administratori e caktoi numrin maksimal të përpjekjeve për fjalëkalimin në <xliff:g id="COUNT_1">%d</xliff:g> para se të fshihen të dhënat e profilit të punës</item>
+      <item quantity="one">Administratori e caktoi numrin maksimal të përpjekjeve për fjalëkalimin në <xliff:g id="COUNT_0">%d</xliff:g> para se të fshihen të dhënat e profilit të punës</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Kjo është një pajisje e menaxhuar."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Kjo pajisje menaxhohet nga <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Mëso më shumë"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotografitë dhe videot"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muzikë dhe audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Lojëra"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Aplikacionet e tjera"</string>
     <string name="storage_files" msgid="8581083146777364063">"Skedarët"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menaxheri i hapësirës ruajtëse: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Joaktiv"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktiv"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Lojëra"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Skedarët audio"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muzika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(çinstaluar për përdoruesin <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(çaktivizuar për përdoruesin <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Aplikacioni i plotësimit automatik"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 74bff25..d3c15e0 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -332,9 +332,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Налози"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Безбедност и закључавање екрана"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифровање и акредитиви"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подешавање Моје локације, откључавања екрана, закључавања складишта акредитива"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Лозинке"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Приватност"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Онемогућио је администратор"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Безбедносни статус"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Локација, отисак прста"</string>
@@ -1436,8 +1437,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Исто као закључавање екрана уређаја"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управљај апликацијама"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управљање инсталираним апликацијама и њихово уклањање"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Информације о апликацији"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Управљање апликацијама, подешавање пречица за брзо покретање"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Подешавања апликације"</string>
     <string name="install_applications" msgid="4872012136210802181">"Непознати извори"</string>
@@ -1498,16 +1498,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Управљај простором"</string>
     <string name="filter" msgid="2018011724373033887">"Филтрирај"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Избор опција филтера"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Све"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Онемогућено"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Све апликације"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Онемогућене апликације"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Преузето"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Покретање"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB меморија"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD картици"</string>
     <string name="disabled" msgid="9206776641295849915">"Онемогућено"</string>
     <string name="not_installed" msgid="2797554494953450291">"Није инстал. за овог корисника"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Инсталирана"</string>
     <string name="no_applications" msgid="7336588977497084921">"Нема апликација."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Интерно складиште"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"интерна меморија"</string>
@@ -1685,8 +1684,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Подешавање метода уноса"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Подешавања"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Подешавања"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Методе активног уноса"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Користи језике система"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> подешавања"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Избор метода активног уноса"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Подешавања тастатуре на екрану"</string>
@@ -1730,7 +1727,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Аутоматски ажурирај увелич. екрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ажурира увеличавање екрана при прелазу апликација"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Дугме укључи/искључи прекида позив"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Изговарај лозинке"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Велики показивач миша"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Моно звук"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Комбинујте канале када пуштате аудио садржај"</string>
@@ -1850,7 +1846,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Коришћење од последњег потпуног пуњења"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Коришћење екрана"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Потрошња за екран"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилних мрежа"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Коришћење апликација од последњег потпуног пуњења"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Коришћење уређаја од последњег потпуног пуњења"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Коришћење батерије након искључивања"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Коришћење батерије након поновног постављања"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> на батерији"</string>
@@ -1940,8 +1940,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Прекомерно израчуната потрошња енергије"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Користи се %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s укупног капацитета батерије"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Анализа потрошње од последњег потпуног пуњења"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Процењено преостало време"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Време до потпуног пуњења"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Процена може да се мења на основу коришћења"</string>
     <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>
@@ -2333,6 +2335,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Увек укључени VPN је неактиван"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ове апликација не подржава"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Дозволи само везе преко VPN-а"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Треба вам VPN веза?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Закључавање је активно"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Закључавање је неактивно"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Изаберите VPN профил са којим ћете увек бити повезани. Мрежни садржај ће бити дозвољен само када сте повезани са овим VPN-ом."</string>
@@ -2422,8 +2425,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ограничени профили не могу да додају налоге"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Избриши <xliff:g id="USER_NAME">%1$s</xliff:g> са уређаја"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Подешавања закључаног екрана"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Додајте кориснике са закључаног екрана"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Нови корисник"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Нови профил"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Желите ли да избришете себе?"</string>
@@ -2451,7 +2453,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Укључити телефонске позиве и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Историја позива и SMS-ова ће се делити са овим корисником."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Информације о хитном случају"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Информације о кориснику <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Информације и контакти за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволе за апликације и садржај"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликације са ограничењима"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подешавања апликације"</string>
@@ -2572,8 +2574,8 @@
       <item quantity="few">Прикажи %d скривене ставке</item>
       <item quantity="other">Прикажи %d скривених ставки</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Мрежа и интернет"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, мобилна мрежа, потрошња података, хотспот"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и интернет"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобилна мрежа, потрошња података, хотспот"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Повезани уређаји"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, пребацивање"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aпликације и обавештења"</string>
@@ -2589,7 +2591,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Резултати"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"WiFi, Wi-Fi, мрежна веза"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, слање SMS-ова, поруке, слање порука"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"мобилна, мобилни оператер, бежично, подаци, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"мобилна мрежа, мобилни подаци, мобилни оператер, бежично, подаци, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"WiFi, Wi-Fi, позив, позивање"</string>
     <string name="keywords_home" msgid="3626170808219458848">"покретач"</string>
     <string name="keywords_display" msgid="8910345814565493016">"екран, додирни екран"</string>
@@ -2665,8 +2667,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Обавештење"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибрација"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Звукови при укључивању"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Не узнемиравај – подешавања"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозвољени су само приоритети"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Аутоматска правила"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Подесите распоред за Не узнемиравај"</string>
@@ -2683,9 +2684,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Подразумевани звук за обавештењa за Work"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Подразумеванa мелодија звона за аларм за Work"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Исто као и за лични профил"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Заменити звуке профилa за Work?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Желите ли да користите звуке личног профила?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Замени"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Актуелни звуци профилa за Work ће бити замењени звуцима са личног профила"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Звуци са личног профилa ће се користити уместо актуелних звука профилa за Work"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Мелодије звона"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Други звуци и вибрације"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Подешавања обавештења"</string>
@@ -2927,11 +2928,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Ниједна дозвола није одобрена"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Ниједна дозвола није захтевана"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Све апликације"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Омогућене"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Инсталиране апликације"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Инстант апликације"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Личне"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Посао"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блокирана"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Са URL-овима домена"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Напредна"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Конфигуришите апликације"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
@@ -2957,8 +2958,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Подразумевана за посао"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Помоћ и гласовни унос"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Апликација за помоћ"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ништа"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Изаберите Апликацију за помоћ"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Желите ли да <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> буде апликација за помоћ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Помоћник ће моћи да чита информације о апликацијама које се користе у систему, укључујући информације које могу да се виде на екрану или којима може да се приступа у оквиру  апликација."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Прихватам"</string>
@@ -2988,6 +2987,8 @@
     <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">"Оптимизација батерије"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Обавештења о коришћењу"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Прикажи све апликације"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Сакриј додатне апликације"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Без оптимизације"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Без оптимизације"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Оптимизација коришћења батерије"</string>
@@ -3170,6 +3171,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Хладна температура боје"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи хладније боје екрана"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Да бисте применили промену боје, искључите екран"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Рестартујте уређај да бисте применили промену TelephonyMonitor-а"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аутоматска ажурирања система"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (захтева рестартовање)"</string>
     <string name="usage" msgid="2977875522080448986">"Потрошња"</string>
@@ -3351,6 +3353,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Покрет за помоћ"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3418,12 +3422,24 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глобални HTTP прокси је подешен"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Администратор може да закључава уређај и ресетује лозинку"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Администратор може да брише све податке са уређаја"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу сви подаци са уређаја</item>
+      <item quantity="few">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу сви подаци са уређаја</item>
+      <item quantity="other">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу сви подаци са уређаја</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу подаци профила за Work</item>
+      <item quantity="few">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу подаци профила за Work</item>
+      <item quantity="other">Администратор је подесио максималан број покушаја за унос лозинке на <xliff:g id="COUNT_1">%d</xliff:g>, после чега се бришу подаци профила за Work</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Овим уређајем се управља."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Овим уређајем управља <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Сазнајте више"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Слике и видео снимци"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музика и аудио"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Игре"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Друге апликације"</string>
     <string name="storage_files" msgid="8581083146777364063">"Датотеке"</string>
@@ -3434,9 +3450,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менаџер меморијског простора: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Искључено"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Укључено"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Игре"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио датотеке"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музика"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(деинсталирано за корисника <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(онемогућено за корисника <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Апликација за аутоматско попуњавање"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 525ba53..402cbed 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Plats"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konton"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Säkerhet och skärmlås"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Kryptering och användaruppgifter"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Sekretess"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Har inaktiverats av administratören"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Säkerhetsstatus"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Plats, fingeravtryck"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Samma som skärmlåset för enheten"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hantera appar"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hantera och ta bort installerade appar"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Appinformation"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Hantera appar, ställ in genvägar för snabbstart"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Appinställningar"</string>
     <string name="install_applications" msgid="4872012136210802181">"Okända källor"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Hantera utrymme"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrera"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Välj filteralternativ"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Alla"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Inaktiverade"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Alla appar"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Inaktiverade appar"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Nedladdade"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kör"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
     <string name="disabled" msgid="9206776641295849915">"Inaktiverat"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ej installerad för användaren"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Installerad"</string>
     <string name="no_applications" msgid="7336588977497084921">"Inga appar."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"lagring"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Konfigurera inmatningsmetoder"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Inställningar"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Inställningar"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktiva inmatningsmetoder"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Använda systemspråk"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-inställningar"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Välj aktiva inmatningsmetoder"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Inställningar för tangentbordet på skärmen"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Uppdatera skärmförstoring automatiskt"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Uppdatera skärmförstoring på appövergångar"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Använd knapp för att avsluta samtal"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Läs upp lösenord"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Stor muspekarikon"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monoljud"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombinera kanaler när du spelar upp ljud"</string>
@@ -1833,7 +1829,11 @@
     <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> återstår"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Ladda i <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> till"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Användning sedan senaste fulladdning"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Skärmens användning"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Skärmens förbrukning"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Genomsökning av mobilnätverk"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Appanvändning sedan batteriet senast var fulladdat"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Enhetsanvändning sedan batteriet senast var fulladdat"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriförbrukning sedan bortkoppling"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteriförbrukning sedan återställning"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> på batteri"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"För högt räknad strömförbrukning"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Använd i %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s av den totala batterianvändningen"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Analys av användningen sedan batteriet senast var fulladdat"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Beräknad återstående tid"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tid kvar tills batteriet är fulladdat"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Den beräknade tiden kan ändras utifrån användning"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedan bortkoppling"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedan senaste bortkoppling <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Alltid på har inaktiverats"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Stöds inte av den här appen"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Tillåt endast anslutningar via VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Ska VPN krävas vid anslutning?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Låsning har aktiverats"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Låsning har inaktiverats"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Välj en VPN-profil som du alltid vill vara ansluten till. Nätverkstrafik tillåts bara när du är ansluten till detta VPN."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Begränsade profiler kan inte lägga till konton"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Ta bort <xliff:g id="USER_NAME">%1$s</xliff:g> från enheten"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Inställningar för låsskärm"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Lägg till användare från låsskärmen"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Ny användare"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Ny profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vill du ta bort dig själv?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vill du aktivera telefonsamtal och sms?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Samtals- och sms-historiken delas med den här användaren."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Krisinformation"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Information om <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Information och kontakter för <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillåt appar och innehåll"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Appar med begränsningar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utöka appens inställningar"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">Visa %d dolda objekt</item>
       <item quantity="one">Visa %d dolt objekt</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Nätverk och internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobildata, dataanvändning, trådlös surfzon"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Nätverk och internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, dataanvändning, hotspot, trådlös surfzon"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Anslutna enheter"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, casta"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Appar och aviseringar"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Resultat"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, nätverksanslutning"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"textmeddelande, sms:a, meddelanden, skicka sms"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"mobiltelefon, mobiloperatör, trådlös, data, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobiltelefon, mobil, mobiloperatör, trådlös, data, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, samtal, ringer"</string>
     <string name="keywords_home" msgid="3626170808219458848">"översikt"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skärm, pekskärm"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Varning"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibration"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Ljud vid uppstart"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Stör ej inställningar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tillåt endast prioriterade"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiska regler"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Konfigurera schema för Stör ej"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Standardsignal – jobbavisering"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Standardsignal – jobbalarm"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Samma som i den personliga profilen"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Ersätta jobbprofilljuden?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Vill du använda ljuden i den personliga profilen?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Ersätt"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"De nuvarande ljuden i jobbprofilen ersätts med dem i den personliga profilen."</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Ljuden i den personliga profilen används i stället för de nuvarande ljuden i jobbprofilen"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Ringsignaler"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Andra ljud och vibrationer"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Aviseringsinställningar"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Inga behörigheter har beviljats"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Inga behörigheter har begärts"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alla appar"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Aktiverad"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Installerade appar"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Snabbappar"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personligt"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Arbetet"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blockerad"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med domänadresser"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avancerat"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurera appar"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Okänd app"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Standardinställning för jobbet"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistent och röstinmatning"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Assistentapp"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Ingen"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Välj assistentapp"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Vill du använda <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> som assistent?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Assistenten kan läsa information om apparna på systemet, inklusive information som visas på skärmen eller är åtkomlig i apparna."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Godkänn"</string>
@@ -2959,6 +2958,8 @@
     <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">"Batterioptimering"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Aviseringar om användning"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Visa alla appar"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Dölj extra appar"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Inte optimerade"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Inte optimerad"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Använder optimerad batteriförbrukning"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Sval färgtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Använd svalare färger på skärmen"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Stäng av skärmen om du vill tillämpa färgändringen"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Starta om enheten om du vill tillämpa ändringen för Telephony Monitor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiska systemuppdateringar"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Kopplade HAL (omstart krävs)"</string>
     <string name="usage" msgid="2977875522080448986">"Användning"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av mobilen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av surfplattan."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av enheten."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Assistentrörelse"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"På"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Av"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader har redan låsts upp"</string>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy har angetts"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administratören kan låsa enheten och återställa lösenordet"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administratören kan radera all data på enheten"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administratören har angett att all data på enheten ska raderas när fel lösenord har angetts <xliff:g id="COUNT_1">%d</xliff:g> gånger</item>
+      <item quantity="one">Administratören har angett att all data på enheten ska raderas när fel lösenord har angetts <xliff:g id="COUNT_0">%d</xliff:g> gång</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administratören har angett att all data i jobbprofilen ska raderas när fel lösenord har angetts <xliff:g id="COUNT_1">%d</xliff:g> gånger</item>
+      <item quantity="one">Administratören har angett att all data i jobbprofilen ska raderas när fel lösenord har angetts <xliff:g id="COUNT_0">%d</xliff:g> gång</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Den här enheten hanteras."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Den här enheten hanteras av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Läs mer"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Foton och videor"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musik och ljud"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Spel"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andra appar"</string>
     <string name="storage_files" msgid="8581083146777364063">"Filer"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagringshanteraren: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Inaktiverat"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktiverat"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Spel"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ljudfiler"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(har avinstallerats för <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(har inaktiverats för <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"App för autofyll"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 0210144..2200c39 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Kutambua Eneo"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akaunti"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Usalama na kufunga skrini"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Vitambulisho na usimbaji fiche"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati-tambulishi"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Manenosiri"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Faragha"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Msimamizi amezima mapendeleo ya mipangilio"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Hali ya usalama"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Mahali, alama ya kidole"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Chagua Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Inawasha Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Inazima Wi-Fi..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Angalia mitandao yote"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Hitilafu"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Mitabendi ya GHz 5 haipatikani katika nchi hii"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Hali ya ndege imewashwa"</string>
@@ -989,7 +989,7 @@
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Funga SIM kadi"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Fungua SIM kadi"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"PIN ya zamani ya SIM"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"Msimbo mpya wa PIN ya SIM"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"Nambari mpya ya PIN ya SIM"</string>
     <string name="sim_reenter_new" msgid="6523819386793546888">"Andika PIN mpya tena"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN ya SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN si sahihi!"</string>
@@ -1005,10 +1005,10 @@
     <string name="sim_change_data_message" msgid="1313940695939674633">"Je, ungependa kutumia <xliff:g id="NEW_SIM">%1$s</xliff:g> badala ya <xliff:g id="OLD_SIM">%2$s</xliff:g> kwa data ya vifaa vya mkononi?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"Unataka kubadili SIM kadi?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> ndiyo SIM ya pekee katika kifaa chako. Unataka kutumia SIM hii kupata huduma ya data, kupiga simu, na ujumbe wa SMS?"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Msimbo wa PIN ya SIM usio sahihi sasa lazima uwasiliane na mtoa huduma wako ili ufungue kifaa chako."</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Nambari ya PIN ya SIM uliyoweka si sahihi. Sasa lazima uwasiliane na mtoa huduma wako ili ukufungulie kifaa chako."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
-      <item quantity="other">Msimbo wa PIN ya SIM si sahihi, umebakisha majaribio <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
-      <item quantity="one">Msimbo wa PIN ya SIM si sahihi, umebakisha majaribio <xliff:g id="NUMBER_0">%d</xliff:g> kabla ya kulazimika kuwasiliana na mtoa huduma wako ili afungue kifaa chako.</item>
+      <item quantity="other">Nambari ya PIN ya SIM si sahihi. Una nafasi zingine <xliff:g id="NUMBER_1">%d</xliff:g> za kujaribu.</item>
+      <item quantity="one">Nambari ya PIN ya SIM si sahihi. Una nafasi zingine <xliff:g id="NUMBER_0">%d</xliff:g> za kujaribu kabla ulazimike kuwasiliana na mtoa huduma wako ili afungue kifaa chako.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Utendakazi wa PIN ya SIM umeshindwa!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Hali ya kompyuta kibao"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Shiriki intaneti kwa Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Inazuia"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Mtandao-hewa na usambazaji wa mtandao"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Mtandao-hewa umewashwa, inasambaza mtandao"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Mtandao-hewa umewashwa"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Inasambaza mtandao"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Haiwezi kusambaza mtandao au kutumia mitandao hewa wakati umewasha Kiokoa Data"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Shiriki intaneti kwa USB"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Sawa na njia ya kufunga skrini ya kifaa"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Dhibiti programu"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Dhibiti na ondoa programu zilizosakinishwa"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Maelezo ya programu"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Dhibiti programu, sanidi njia za mkato za kuzindua haraka"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Mipangilio ya programu"</string>
     <string name="install_applications" msgid="4872012136210802181">"Vyanzo visivyojulikana"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Dhibiti nafasi"</string>
     <string name="filter" msgid="2018011724373033887">"Kichujio"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Chagua chaguzi za vichujio"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Zote"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Imezimwa"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Programu zote"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Programu zilizozimwa"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Zilizopakuliwa"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Zinazotumika"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Hifadhi ya USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Kwenye kadi ya SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Imezimwa"</string>
     <string name="not_installed" msgid="2797554494953450291">"Haijasanidiwa kwa mtumiaji huyu"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Imesakinishwa"</string>
     <string name="no_applications" msgid="7336588977497084921">"Hakuna programu."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Hifadhi ya ndani"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"hifadhi ya mfumo"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Sanidi mbinu za ingizo"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Mipangilio"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Mipangilio"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Mbinu zinazotumika"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Tumia lugha za mfumo"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Mipangilio ya <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Chagua mbinu amilifu za ingizo"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Mipangilio ya kibodi kwenye skrini"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Sasisha otomatiki ukuzaji wa skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Sasisha ukuzaji wa skrini kwenye mipito ya  programu"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Kata simu kwa kitufe cha kuwasha/kuzima"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Tamka manenosiri"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Kielekezi kikubwa cha kipanya"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Sauti ya mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Changanya vituo inapocheza sauti"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Matumizi tangu mwisho ilipojazwa chaji"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Matumizi ya skrini"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Kutumia skrini"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Kutafuta mitandao ya simu"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Matumizi ya programu tangu betri ilipojaa chaji mwisho"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Matumizi ya kifaa tangu betri ilipojaa chaji mara ya mwisho"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utumizi wa betri tangu kuchopolewa"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utumiaji wa betri tangu iliposetiwa upya"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Chaji itadumu <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Hesabu ya matumizi ya nishati iliyopitiliza"</string>
     <string name="mah" msgid="95245196971239711">"mAh <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Hutumika kwa %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ya chaji yote ya betri"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Uchanganuzi wa matumizi ya betri tangu ilipochajiwa mara ya mwisho"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Kadirio la muda uliosalia"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Muda uliosalia ili ijae chaji"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Kadirio linaweza kubadilika kulingana na matumizi"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> tangu ilipoondolewa"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ilipochopolewa mara ya mwisho kwa <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Jumla ya utumiaji"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Katika hali tuli kila wakati"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Haiwezi kutumia programu hii"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Ruhusu miunganisho kupitia VPN pekee"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Je, unahitaji muunganisho wa VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Kipengele cha kufunga kinatumika"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Kipengele cha kufunga hakitumiki"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Chagua wasifu wa VPN ambapo utakuwa umeunganishwa kila mara. Trafiki ya mtandao itaruhusiwa tu unapounganishwa kwenye VPN."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Wasifu zilizodhibitiwa haziwezi kuongeza akaunti"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Futa <xliff:g id="USER_NAME">%1$s</xliff:g> kutoka kwenye kifaa hiki"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Mipangilio ya kufunga skrini"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ongeza watumiaji kutoka skrini iliyofungwa."</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Mtumiaji mpya"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Wasifu mpya"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Ungependa kujifuta?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ungependa kuwasha SMS na kupiga simu?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Rekodi ya simu zilizopigwa na SMS zilizopokelewa itashirikiwa na mtumiaji huyu."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Maelezo ya dharura"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Maelezo kuhusu <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Maelezo na anwani za <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Ruhusu programu na maudhui"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programu zilizo na vizuizi"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Panua mipangilio ya programu"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">Onyesha vipengee %d vilivyofichwa</item>
       <item quantity="one">Onyesha kipengee %d kilichofichwa</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Mtandao na intaneti"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, data ya simu, matumizi ya data, mtandao-hewa"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Mtandao na Intaneti"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, simu ya mkononi, matumizi ya data, mtandao-hewa"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Vifaa vilivyounganishwa"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, tuma"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programu na arifa"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Watumiaji na akaunti"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Programu chaguo-msingi"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Lugha, hifadhi rudufu, masasisho, kuhusu simu"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Lugha, hifadhi rudufu, masasisho, kuhusu kifaa"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Mipangilio"</string>
     <string name="search_menu" msgid="6283419262313758339">"Mipangilio ya utafutaji"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Mipangilio ya utafutaji"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Matokeo"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wi-fi, wi-fi, mtandao, muunganisho"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, kutuma SMS, ujumbe, kutuma ujumbe"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"vifaa vya mkononi, mtoa huduma wa vifaa vya mkononi, isiyotumia waya, data, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mtandao wa simu, rununu, mtoa huduma wa vifaa vya mkononi, isiyotumia waya, data, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, piga simi, upigaji simu"</string>
     <string name="keywords_home" msgid="3626170808219458848">"kifungua programu"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skrini, skrini ya kugusa"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Tahadhari"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Tetema"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Washa sauti"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Mapendeleo ya hali ya usinisumbue"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Ruhusu kipaumbele pekee"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sheria za otomatiki"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Weka ratiba ya Usinisumbue"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Toni chaguo-msingi ya arifa ya kazi"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Mlio chaguo-msingi wa kengele ya kazini"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Sawa na wasifu binafsi"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Ungependa kubadilisha sauti za wasifu wako wa kazini?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Ungependa kutumia sauti za wasifu wa binafsi?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Badilisha"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Sauti za wasifu wako wa sasa wa kazini zitabadilishwa na nafasi zao kuchuliwa na sauti za wasifu wako binafsi"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Sauti za wasifu wa binafsi zitatumika badala ya sauti za wasifu uliopo wa kazini"</string>
     <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="7447797716856573587">"Mapendeleo ya arifa"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Hakuna ruhusa zilizotolewa"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Hakuna ruhusa zilizoombwa"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Programu Zote"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Imewashwa"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Programu zilizosakinishwa"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Programu zinazofunguka papo hapo"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Binafsi"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Kazini"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Zilizozuiwa"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Zenye URL za kikoa"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Mipangilio ya kina"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Weka mipangilio ya programu"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Programu isiyojulikana"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Chaguo-msingi ya kazini"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Maagizo ya sauti na kuweka data kwa kutamka"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Programu ya maagizo ya sauti"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Hamna"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Chagua programu ya Mratibu"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Ungetaka kuweka <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> kuwa mratibu wako?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Mratibu itaweza kusoma maelezo kuhusu programu unazotumia katika mfumo wako, ikiwa ni pamoja na maelezo yanayoonekana kwenye skrini yako au yanayoweza kufikiwa kutoka ndani ya programu."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Kubali"</string>
@@ -2966,6 +2958,8 @@
     <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">"Uboreshaji wa betri"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Arifa za matumizi"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Onyesha programu zote"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ficha programu za ziada"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Haijaboreshwa"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Haijaboreshwa"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Kuboresha matumizi ya betri"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Halijoto ya rangi ya baridi"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Tumia rangi yenye halijoto ya baridi zaidi kwenye onyesho"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Zima skrini ili uweze kutekeleza ubadilishaji wa rangi"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ili kuweka mabadiliko ya kichunguzi cha shughuli za simu, washa kifaa tena"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Masasisho ya mfumo kiotomatiki"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (inahitaji kuwasha upya)"</string>
     <string name="usage" msgid="2977875522080448986">"Matumizi"</string>
@@ -3323,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole katika 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 katika 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="assist_gesture_title" msgid="7746563137898655539">"Ishara ya usaidizi"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Seva mbadala ya HTTP ya jumla iwekekwa"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Msimamizi anaweza kufunga kifaa na kubadilisha nenosiri"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Msimamizi anaweza kufuta data yote ya kifaa"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Msimamizi ameweka idadi ya juu za kujaribu kutumia nenosiri kuwa <xliff:g id="COUNT_1">%d</xliff:g> kabla ya kufuta data yote ya kifaa</item>
+      <item quantity="one">Msimamizi ameweka idadi ya juu za kujaribu kutumia nenosiri kuwa <xliff:g id="COUNT_0">%d</xliff:g> kabla ya kufuta data yote ya kifaa</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Msimamizi ameweka idadi ya juu zaidi ya kujaribu kutumia nenosiri kuwa <xliff:g id="COUNT_1">%d</xliff:g> kabla ya kufuta data ya wasifu wa kazini</item>
+      <item quantity="one">Msimamizi ameweka idadi ya juu zaidi ya kujaribu kutumia nenosiri kuwa <xliff:g id="COUNT_0">%d</xliff:g> kabla ya kufuta data ya wasifu wa kazini</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Kifaa hiki kinasimamiwa."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Kifaa hiki kinasimamiwa na <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Pata maelezo zaidi"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Picha na Video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Muziki na Sauti"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Michezo"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Programu zingine"</string>
     <string name="storage_files" msgid="8581083146777364063">"Faili"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Kidhibiti Hifadhi: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Kimezimwa"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Kimewashwa"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Michezo"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Faili za sauti"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Muziki"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(imeondolewa kwa mtumiaji <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(imezimwa kwa mtumiaji <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Programu ya kujaza otomatiki"</string>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index 70faa0f..b1ec4c7 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -21,10 +21,6 @@
     <dimen name="dashboard_padding_start">160dp</dimen>
     <dimen name="dashboard_padding_end">160dp</dimen>
 
-    <!-- Dashboard Header margin in its container -->
-    <dimen name="dashboard_header_margin_start">304dp</dimen>
-    <dimen name="dashboard_header_margin_end">304dp</dimen>
-
     <!-- ActionBar contentInsetStart -->
     <dimen name="actionbar_contentInsetStart">128dp</dimen>
     <dimen name="actionbar_subsettings_contentInsetStart">128dp</dimen>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index a0be467..981c936 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -42,10 +42,6 @@
     <dimen name="dashboard_padding_start">80dp</dimen>
     <dimen name="dashboard_padding_end">80dp</dimen>
 
-    <!-- Dashboard Header margin in its container -->
-    <dimen name="dashboard_header_margin_start">176dp</dimen>
-    <dimen name="dashboard_header_margin_end">176dp</dimen>
-
     <!-- Dashboard category padding start / end -->
     <dimen name="dashboard_category_padding_start">24dp</dimen>
     <dimen name="dashboard_category_padding_end">24dp</dimen>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 64ac501..efffce9 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"இருப்பிடம்"</string>
     <string name="account_settings_title" msgid="626177544686329806">"கணக்குகள்"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"பாதுகாப்பும் திரைப் பூட்டும்"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"என்கிரிப்ஷன் &amp; அனுமதிச் சான்றுகள்"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"கடவுச்சொற்கள்"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"தனியுரிமை"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"நிர்வாகி முடக்கியுள்ளார்"</string>
     <string name="security_status_title" msgid="5848766673665944640">"பாதுகாப்பு நிலை"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"இருப்பிடம், கைரேகை"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"சாதனத் திரைப் பூட்டைப் போன்றது"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"பயன்பாடுகளை நிர்வகி"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"நிறுவப்பட்ட பயன்பாடுகளை நிர்வகி மற்றும் அகற்று"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"பயன்பாட்டுத் தகவல்"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"அமைப்புகளை நிர்வகிக்கும், விரைவு துவக்கத்திற்கான குறுக்குவழிகளை அமைக்கும்"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"பயன்பாட்டு அமைப்பு"</string>
     <string name="install_applications" msgid="4872012136210802181">"அறியப்படாத மூலங்கள்"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"காலி இடத்தை நிர்வகி"</string>
     <string name="filter" msgid="2018011724373033887">"வடிகட்டு"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"வடிப்பான் விருப்பங்களைத் தேர்வுசெய்யவும்"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"எல்லாம்"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"முடக்கப்பட்டது"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"எல்லாப் பயன்பாடுகளும்"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"முடக்கிய பயன்பாடுகள்"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"பதிவிறக்கப்பட்டது"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"இயங்குகிறது"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB சேமிப்பகம்"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD கார்டில் உள்ளவை"</string>
     <string name="disabled" msgid="9206776641295849915">"முடக்கப்பட்டது"</string>
     <string name="not_installed" msgid="2797554494953450291">"இவருக்கு நிறுவப்படவில்லை"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"நிறுவப்பட்டது"</string>
     <string name="no_applications" msgid="7336588977497084921">"பயன்பாடுகள் இல்லை."</string>
     <string name="internal_storage" msgid="1584700623164275282">"அகச் சேமிப்பிடம்"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"அகச் சேமிப்பகம்"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"உள்ளீட்டு முறைகளை அமை"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"அமைப்பு"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"அமைப்பு"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"செயலில் உள்ள உள்ளீட்டு முறைகள்"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"முறைமை மொழிகளைப் பயன்படுத்து"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> அமைப்பு"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"செயலில் உள்ள உள்ளீட்டு முறைகளைத் தேர்வுசெய்க"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"திரை விசைப்பலகை அமைப்பு"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"திரை உருப்பெருக்கத்தைத் தானாகப் புதுப்பி"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"பயன்பாட்டு மாற்றங்களில் திரை உருப்பெருக்கத்தைப் புதுப்பிக்கவும்"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"பவர் பொத்தான் அழைப்பை நிறுத்தும்"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"கடவுச்சொற்களைக் கூறவும்"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"பெரிய மவுஸ் பாயிண்டர்"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"மோனோ ஆடியோ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ஆடியோ இயக்கத்தில் இருக்கும் போது சேனல்களை ஒன்றிணைக்கலாம்"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"முழு சார்ஜ் ஆனதிலிருந்து இயங்கும் பயன்பாடுகள்"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"திரை உபயோகம்"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"திரை நுகர்வு"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"மொபைல் நெட்வொர்க்கை ஸ்கேன் செய்தல்"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"கடைசியாக பேட்டரியை முழு சார்ஜ் செய்ததிலிருந்து ஆப் உபயோகம்"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"கடைசியாக பேட்டரியை முழு சார்ஜ் செய்ததிலிருந்து சாதன உபயோகம்"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"செருகல் நீக்கப்பட்டதிலிருந்து பேட்டரியின் பயன்பாடு"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"மீட்டமைக்கப்பட்டதிலிருந்து பேட்டரி பயன்பாடு"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> இல் பேட்டரி அளவு"</string>
@@ -1923,8 +1923,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ஆற்றல் பயன்பாடு அதிகமாகப் பயன்படுத்தப்பட்டது"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s பயன்படுத்தப்பட்டது"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"மொத்த பேட்டரியில் %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"கடைசியாகப் பேட்டரியை முழுவதுமாகச் சார்ஜ் செய்ததிலிருந்து அதன் உபயோகம் குறித்த விவரம்"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"கணக்கிடப்பட்ட மீதமுள்ள நேரம்"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"முழு சார்ஜ் ஆவதற்கான நேரம்"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"உபயோகத்தின் அடிப்படையில், கணக்கிடப்பட்ட நேரம் மாறக்கூடும்"</string>
     <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>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\"எப்போதும் இயங்கு\" செயலில் இல்லை"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"இந்தப் பயன்பாடு ஆதரிக்கவில்லை"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"VPN மூலம் மட்டும் இணைப்புகளை அனுமதி"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN இணைப்பு வேண்டுமா?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"பூட்டப்பட்டுள்ளது"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"பூட்டப்பட்டிருக்கவில்லை"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"எப்போதும் இணைந்திருக்க வேண்டிய VPN சுயவிவரத்தைத் தேர்ந்தெடுக்கவும். இந்த VPN உடன் இணைந்திருக்கும்போது மட்டுமே நெட்வொர்க்கின் டிராஃபிக் அனுமதிக்கப்படும்."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"வரையறுக்கப்பட்ட சுயவிவரங்களால் கணக்குகளைச் சேர்க்க முடியாது"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"சாதனத்திலிருந்து <xliff:g id="USER_NAME">%1$s</xliff:g> ஐ நீக்கு"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"பூட்டுத் திரை அமைப்புகள்"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"பூட்டுத் திரையிலிருந்து பயனர்களைச் சேர்"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"புதியவர்"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"புதிய சுயவிவரம்"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"உங்களை நீக்கவா?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ஃபோன் அழைப்புகள் &amp; SMSஐ இயக்கவா?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"அழைப்பும் SMS வரலாறும் இவருடன் பகிரப்படும்."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"அவசரத் தகவல்"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> பற்றிய தகவல்"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>க்கான தகவலும் தொடர்புகளும்"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"பயன்பாடுகளையும் உள்ளடக்கத்தையும் அனுமதி"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"வரையறைகளுடனான பயன்பாடுகள்"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"பயன்பாட்டிற்கான அமைப்புகளை விரிவுபடுத்து"</string>
@@ -2550,10 +2552,10 @@
       <item quantity="other">மறைந்துள்ள %d உருப்படிகளைக் காட்டு</item>
       <item quantity="one">மறைந்துள்ள %d உருப்படியைக் காட்டு</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"நெட்வொர்க் &amp; இணையம்"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"வைஃபை, செல்லுலார், தரவு உபயோகம், ஹாட்ஸ்பாட்"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"நெட்வொர்க் &amp; இணையம்"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"வைஃபை, மொபைல், தரவு உபயோகம், ஹாட்ஸ்பாட்"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"இணைத்த சாதனங்கள்"</string>
-    <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"புளூடூத், NFC, அனுப்பு"</string>
+    <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"புளூடூத், NFC, அனுப்புதல்"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"பயன்பாடுகள் &amp; அறிவிப்புகள்"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"அனுமதிகள், இயல்புப் பயன்பாடுகள்"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"பயனர் &amp; கணக்குகள்"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"முடிவுகள்"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"வைஃபை, வை-ஃபை, நெட்வொர்க் இணைப்பு"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"உரைச் செய்தி, செய்தியிடல், செய்திகள், செய்தி அனுப்புதல்"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"செல்லுலார், செல் கேரியர், வயர்லெஸ், டேட்டா, 4ஜி, 3ஜி, 2ஜி, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"செல்லுலார், மொபைல், செல் கேரியர், வயர்லெஸ், தரவு, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"வைஃபை, வை-ஃபை, அழைப்பு, அழைத்தல்"</string>
     <string name="keywords_home" msgid="3626170808219458848">"துவக்கி"</string>
     <string name="keywords_display" msgid="8910345814565493016">"திரை, டச்ஸ்கிரீன்"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"விழிப்பூட்டல்"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"அதிர்வு"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ஒலிகளை இயக்கு"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"தொந்தரவு செய்ய வேண்டாம்"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"முதன்மை அனுமதிப்பவை:"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"தானியங்கு விதிகள்"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"தொந்தரவு செய்யக்கூடாத நேரம்"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"பணி அறிவிப்பின் இயல்பு டோன்"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"பணி அலாரத்தின் இயல்பு ரிங்டோன்"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"தனிப்பட்ட சுயவிவரத்தைப் போன்றது"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"பணி விவர ஒலிகளை மாற்றவா?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"தனிப்பட்ட சுயவிவர ஒலிகளைப் பயன்படுத்தவா?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"மாற்று"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"உங்கள் பணி விவர ஒலிகளானது தனிப்பட்ட சுயவிவர ஒலிகளாக மாற்றப்படும்"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"உங்கள் தற்போதைய பணி விவர ஒலிகளுக்குப் பதிலாக, தனிப்பட்ட சுயவிவர ஒலிகள் பயன்படுத்தப்படும்"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ரிங்டோன்கள்"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"பிற ஒலிகள் மற்றும் அதிர்வுகள்"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"அறிவிப்பு விருப்பத்தேர்வுகள்"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"அனுமதிகள் எதுவும் வழங்கப்படவில்லை"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"அனுமதிகள் எதையும் கோரவில்லை"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"எல்லா பயன்பாடுகளும்"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"இயக்கப்பட்டவை"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"நிறுவிய பயன்பாடுகள்"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"இன்ஸ்டண்ட் பயன்பாடுகள்"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"தனிப்பட்டவை"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"பணியிடம்"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"தடுக்கப்பட்டவை"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"டொமைன் URLகளுடன்"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"மேம்பட்டவை"</string>
     <string name="configure_apps" msgid="6685680790825882528">"பயன்பாடுகளை உள்ளமை"</string>
     <string name="unknown_app" msgid="5275921288718717656">"அறியப்படாத பயன்பாடு"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"பணிக்கான இயல்பு அமைப்புகள்"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"அசிஸ்ட் &amp; குரல் உள்ளீடு"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"அசிஸ்ட் பயன்பாடு"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"ஏதுமில்லை"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"அசிஸ்ட் பயன்பாட்டைத் தேர்வுசெய்க"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>ஐ அசிஸ்டண்ட் பயன்பாடாக அமைக்கவா?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"உங்கள் திரையில் தெரியும் தகவல் அல்லது பயன்பாடுகளுக்குள் அணுகத்தக்க தகவல் உள்பட உங்கள் சாதனத்தில் உபயோகத்தில் இருக்கும் பயன்பாடுகள் பற்றிய தகவலை அசிஸ்டண்ட் படிக்க முடியும்."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"ஏற்கிறேன்"</string>
@@ -2959,6 +2958,8 @@
     <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">"பேட்டரி மேம்படுத்தல்"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"உபயோகம் குறித்த எச்சரிக்கைகள்"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"எல்லா பயன்பாடுகளையும் காட்டு"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"கூடுதல் பயன்பாடுகளை மறை"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"மேம்படுத்தப்படாதவை"</string>
     <string name="high_power_on" msgid="6216293998227583810">"மேம்படுத்தப்படாதது"</string>
     <string name="high_power_off" msgid="3393904131961263278">"பேட்டரி உபயோகத்தை மேம்படுத்தும்"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"நீல நிற வெப்பநிலை"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"நீல வண்ணங்களைத் திரைக்குப் பயன்படுத்து"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"வண்ண மாற்றத்தைப் பயன்படுத்த, திரையை முடக்கவும்"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"டெலிஃபோனி மானிட்டரில் செய்த மாற்றத்தைப் பயன்படுத்த, சாதனத்தை மறுதொடக்கம் செய்யவும்"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"தானியங்கு முறைமை புதுப்பிப்புகள்"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"பைண்டர் செய்யப்பட்ட HALகள் (மறுதொடக்கம் செய்ய வேண்டும்)"</string>
     <string name="usage" msgid="2977875522080448986">"பயன்பாடு"</string>
@@ -3316,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"அசிஸ்ட் சைகை"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"குளோபல் HTTP ப்ராக்ஸி அமைக்கப்பட்டுள்ளது"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"நிர்வாகியானவர் சாதனத்தைப் பூட்டலாம், கடவுச்சொல்லை மீட்டமைக்கலாம்"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"நிர்வாகியானவர் சாதனத் தரவு முழுவதையும் நீக்கலாம்"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">அதிகபட்சமாக <xliff:g id="COUNT_1">%d</xliff:g> முறை கடவுச்சொல்லை உள்ளிட முயற்சி செய்யும் வகையில் நிர்வாகி அமைத்துள்ளார். மேலும் ஒருமுறை தவறான கடவுச்சொல்லை உள்ளிட்டால் சாதனத்தின் எல்லாத் தரவும் நீக்கப்படும்</item>
+      <item quantity="one">அதிகபட்சமாக <xliff:g id="COUNT_0">%d</xliff:g> முறை கடவுச்சொல்லை உள்ளிட முயற்சி செய்யும் வகையில் நிர்வாகி அமைத்துள்ளார். மேலும் ஒருமுறை தவறான கடவுச்சொல்லை உள்ளிட்டால் சாதனத்தின் எல்லாத் தரவும் நீக்கப்படும்</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"இந்தச் சாதனம் நிர்வகிக்கப்படுகிறது."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"இந்தச் சாதனத்தை நிர்வகிப்பது: <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"மேலும் அறிக"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"படங்கள் &amp; வீடியோக்கள்"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"இசை &amp; ஆடியோ"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"கேம்கள்"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"பிற பயன்பாடுகள்"</string>
     <string name="storage_files" msgid="8581083146777364063">"கோப்புகள்"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"சேமிப்பக நிர்வாகி: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ஆஃப்"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ஆன்"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"கேம்கள்"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ஆடியோ கோப்புகள்"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"இசை"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>க்கு நிறுவல்நீக்கப்பட்டது)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>க்கு முடக்கப்பட்டது)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"தன்னிரப்பிப் பயன்பாடு"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index ff9f971..4872713 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"స్థానం"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ఖాతాలు"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"భద్రత &amp; స్క్రీన్ లాక్"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"గుప్తీకరణ &amp; ఆధారాలు"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, సిమ్ కార్డు లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయి"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయండి"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"పాస్‌వర్డ్‌లు"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"గోప్యత"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"నిర్వాహకుడు నిలిపివేసారు"</string>
     <string name="security_status_title" msgid="5848766673665944640">"భద్రత స్థితి"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"స్థానం, వేలిముద్ర"</string>
@@ -373,7 +374,7 @@
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"మీ వేలిని సెన్సార్‌పై ఉంచి, మీకు వైబ్రేషన్ అనుభూతి కలిగిన తర్వాత దాన్ని తీసివేయండి"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"కొనసాగించండి"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"మీ వేలిముద్రలోని వివిధ భాగాలన్నింటినీ జోడించడానికి మీ వేలిని కొద్దిగా అటూ ఇటూ జరపండి"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"వేలిముద్ర జోడించబడింది!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"వేలిముద్ర జోడించబడింది.!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"మీకు ఈ చిహ్నం కనిపించినప్పుడల్లా, మీరు గుర్తింపు కోసం లేదా కొనుగోలు ప్రామాణీకరణ కోసం మీ వేలిముద్రను ఉపయోగించవచ్చు."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"మీ పరికరం సక్రియం చేయడానికి మరియు అన్‌లాక్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకితే సరిపోతుంది."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"మీకు ఈ చిహ్నం కనిపించినప్పుడు, కొనుగోళ్లు చేయడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి కూడా మీకు అధికారం ఉంటుంది."</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fiను ఎంచుకోండి"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fiను ప్రారంభిస్తోంది…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fiని ఆపివేస్తోంది…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"అన్ని నెట్‌వర్క్‌లను చూడండి"</string>
     <string name="wifi_error" msgid="3207971103917128179">"లోపం"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"ఈ దేశంలో 5 GHz బ్యాండ్ అందుబాటులో లేదు"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ఎయిర్‌ప్లైన్ మోడ్‌లో"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"బ్లూటూత్ టీథరింగ్"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"టీథరింగ్"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"హాట్‌స్పాట్ &amp; టీథెరింగ్"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"హాట్‌స్పాట్ ఆన్, టీథెరింగ్"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"హాట్‌స్పాట్ ఆన్"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"టీథెరింగ్"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"డేటా సేవర్ ఆన్‌లో ఉన్నప్పుడు టీథర్ చేయలేరు లేదా పోర్టబుల్ హాట్‌స్పాట్‌లను ఉపయోగించలేరు"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB టీథరింగ్"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"పరికర స్క్రీన్ లాక్ లాంటిది"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"అనువర్తనాలను నిర్వహించు"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలను నిర్వహించు మరియు తీసివేయి"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"అనువర్తన సమాచారం"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"అనువర్తనాలను నిర్వహించండి, శీఘ్ర ప్రారంభ సత్వరమార్గాలను సెటప్ చేయండి"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"అనువర్తన సెట్టింగ్‌లు"</string>
     <string name="install_applications" msgid="4872012136210802181">"తెలియని మూలాలు"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"నిల్వ ఖాళీని నిర్వహించు"</string>
     <string name="filter" msgid="2018011724373033887">"ఫిల్టర్ చేయి"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ఫిల్టర్ ఎంపికలను ఎంచుకోండి"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"అన్నీ"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"నిలిపివేయబడింది"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"అన్ని అనువర్తనాలు"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"నిలిపివేయబడిన అనువర్తనాలు"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"డౌన్‌లోడ్ చేయబడినవి"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"అమలయ్యేవి"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB నిల్వ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD కార్డులో"</string>
     <string name="disabled" msgid="9206776641295849915">"నిలిపివేయబడింది"</string>
     <string name="not_installed" msgid="2797554494953450291">"ఈ విని. కోసం ఇన్‌స్టా. చేయలేదు"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"ఇన్‌స్టాల్ చేయబడింది"</string>
     <string name="no_applications" msgid="7336588977497084921">"అనువర్తనాలు లేవు."</string>
     <string name="internal_storage" msgid="1584700623164275282">"అంతర్గత నిల్వ"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"అంతర్గత నిల్వ"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"ఇన్‌పుట్ పద్ధతులను సెటప్ చేయండి"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"సెట్టింగ్‌లు"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"సెట్టింగ్‌లు"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"సక్రియ ఇన్‌పుట్ పద్ధతులు"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"సిస్టమ్ భాషలను ఉపయోగించు"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> సెట్టింగ్‌లు"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"సక్రియ ఇన్‌పుట్ పద్ధతులను ఎంచుకోండి"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"స్క్రీన్‌లో కీబోర్డ్ సెట్టింగ్‌లు"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"స్క్రీన్ వర్ధనాన్ని స్వయంచాలకంగా నవీకరించండి"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"అనువర్తన పరివర్తనాల్లో స్క్రీన్ వర్ధనాన్ని నవీకరించండి"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"పవర్ బటన్ కాల్‌ను ముగిస్తుంది"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"పాస్‌వర్డ్‌లను చదివి వినిపించు"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"పెద్ద మౌస్ పాయింటర్"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"మోనో ఆడియో"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ఆడియో ప్లే చేసేటప్పుడు ఛానెల్‌లను మిళితం చేస్తుంది"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"పూర్తిగా ఛార్జ్ అయినప్పటి నుండి ఉపయోగిస్తున్నవి"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"స్క్రీన్ వినియోగం"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"స్క్రీన్ ఉపయోగం"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"మొబైల్ నెట్‌వర్క్ స్కానింగ్"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"చివరిసారి పూర్తి ఛార్జింగ్ తర్వాత అనువర్తన వినియోగం"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"చివరిసారి పూర్తిగా ఛార్జ్ చేసిన తర్వాత పరికర వినియోగం"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"అన్‌ప్లగ్ చేసినప్పటి నుండి బ్యాటరీ వినియోగం"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"రీసెట్ చేసినప్పటి నుండి బ్యాటరీ వినియోగం"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"బ్యాటరీలో <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"అధిక గణన విద్యుత్ శక్తి వినియోగం"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s పాటు ఉపయోగించబడింది"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"మొత్తం బ్యాటరీలో %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"చివరిసారి పూర్తిగా ఛార్జింగ్ పెట్టిన తర్వాత వినియోగ గణాంకాలు"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"అంచనా వేసిన సమయం మిగిలి ఉంది"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"పూర్తిగా ఛార్జ్ కావడానికి సమయం"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"వినియోగం ఆధారంగా అంచనాలో మార్పు జరగవచ్చు"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"ఎల్లప్పుడూ-ఆన్‌లో ఉంచడం నిష్క్రియంగా ఉంది"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"ఈ అనువర్తనం మద్దతు ఇవ్వదు"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"కేవలం VPN ద్వారా మాత్రమే కనెక్షన్‌లను అనుమతించు"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN కనెక్షన్ అవసరమా?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"నిరోధాన్ని సక్రియం చేస్తుంది"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"నిరోధాన్ని నిష్క్రియం చేస్తుంది"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ఎల్లప్పుడూ కనెక్ట్ చేయబడి ఉండటానికి VPN ప్రొఫైల్‌ను ఎంచుకోండి. ఈ VPNకి కనెక్ట్ అయి ఉన్నప్పుడు మాత్రమే నెట్‌వర్క్ ట్రాఫిక్ అనుమతించబడుతుంది."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"పరిమిత ప్రొఫైల్‌లు ఖాతాలను జోడించడం సాధ్యపడదు"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"ఈ పరికరం నుండి <xliff:g id="USER_NAME">%1$s</xliff:g>ని తొలగించు"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"లాక్ స్క్రీన్ సెట్టింగ్‌లు"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"లాక్ స్క్రీన్ నుండి వినియోగదారులను జోడించండి"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"కొత్త వినియోగదారు"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"కొత్త ప్రొఫైల్"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"మిమ్మల్ని తొలగించాలా?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ఫోన్ కాల్‌లు &amp; SMSను ఆన్ చేయాలా?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"కాల్ మరియు SMS చరిత్ర ఈ వినియోగదారుతో భాగస్వామ్యం చేయబడుతుంది."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"అత్యవసర సమాచారం"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> గురించి సమాచారం"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> కోసం సమాచారం &amp; పరిచయాలు"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"అనువర్తనాలు మరియు కంటెంట్‌ను అనుమతించండి"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"పరిమితులు గల అనువర్తనాలు"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"అనువర్తన సెట్టిం. విస్తరింపజేయి"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">%d దాచబడిన అంశాలను చూపుతుంది</item>
       <item quantity="one">%d దాచబడిన అంశాన్ని చూపుతుంది</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"నెట్‌వర్క్ &amp; ఇంటర్నెట్"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, సెల్యులార్, డేటా వినియోగం, హాట్‌స్పాట్"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"నెట్‌వర్క్ &amp; ఇంటర్నెట్"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, మొబైల్, డేటా వినియోగం, హాట్‌స్పాట్"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"కనెక్ట్ చేసిన పరికరాలు"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"బ్లూటూత్, NFC, ప్రసారం చేయి"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"అనువర్తనాలు &amp; నోటిఫికేషన్‌లు"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"వినియోగదారు &amp; ఖాతాలు"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"డిఫాల్ట్ అనువర్తనాలు"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"భాషలు, బ్యాకప్, నవీకరణలు, ఫోన్ గురించి"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"భాషలు, బ్యాకప్, నవీకరణలు, పరికరం గురించి"</string>
     <string name="search_results_title" msgid="1796252422574886932">"సెట్టింగ్‌లు"</string>
     <string name="search_menu" msgid="6283419262313758339">"శోధన సెట్టింగ్‌లు"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"శోధన సెట్టింగ్‌లు"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"ఫలితాలు"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, నెట్‌వర్క్ కనెక్షన్"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"వచన సందేశం, వచనం పంపడం, సందేశాలు, సందేశం పంపడం"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"సెల్యులార్, సెల్ క్యారియర్, వైర్‌లెస్, డేటా, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"సెల్యులార్, మొబైల్, సెల్ క్యారియర్, వైర్‌లెస్, డేటా, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, కాల్, కాలింగ్"</string>
     <string name="keywords_home" msgid="3626170808219458848">"లాంచర్"</string>
     <string name="keywords_display" msgid="8910345814565493016">"స్క్రీన్, టచ్‌స్క్రీన్"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"హెచ్చరిక"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"వైబ్రేట్"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"పవర్ ఆన్ చేసేటప్పుడు ధ్వనులు"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"అంతరాయం కలిగించవద్దు ప్రాధాన్యతలు"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"కేవలం ప్రాధాన్యమైనవి అనుమతించ."</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"స్వయంచాలక నిబంధనలు"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"అంతరాయం వద్దు షెడ్యూల్ సెటప్"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"డిఫాల్ట్ కార్యాలయ నోటిఫికేషన్ టోన్"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"డిఫాల్ట్ కార్యాలయ అలారం టోన్"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"వ్యక్తిగత ప్రొఫైల్‌లో వలె ఉంచబడతాయి"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"కార్యాలయ ప్రొఫైల్ శబ్దాలు భర్తీ చేయాలా?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"వ్యక్తిగత ప్రొఫైల్ ధ్వనులను ఉపయోగించాలా?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"భర్తీ చేయి"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"మీ ప్రస్తుత కార్యాలయ ప్రొఫైల్ శబ్దాలు మీ వ్యక్తిగత ప్రొఫైల్ శబ్దాలతో భర్తీ చేయబడతాయి"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"మీ ప్రస్తుత కార్యాలయ ప్రొఫైల్ ధ్వనులకు బదులుగా మీ వ్యక్తిగత ప్రొఫైల్ ధ్వనులు ఉపయోగించబడతాయి"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"రింగ్‌టోన్‌లు"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ఇతర ధ్వనులు మరియు వైబ్రేషన్‌లు"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"నోటిఫికేషన్ ప్రాధాన్యతలు"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"అనుమతులు మంజూరు కాలేదు"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"అనుమతులను అభ్యర్థించలేదు"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"అన్ని అనువర్తనాలు"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"ప్రారంభించబడినవి"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలు"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"తక్షణ అనువర్తనాలు"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"వ్యక్తిగతం"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"కార్యాలయం"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"బ్లాక్ చేయబడినవి"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"డొమైన్ URLలు కలిగి ఉన్నవి"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"అధునాతనం"</string>
     <string name="configure_apps" msgid="6685680790825882528">"అనువర్తనాలను కాన్ఫిగర్ చేయండి"</string>
     <string name="unknown_app" msgid="5275921288718717656">"తెలియని అనువర్తనం"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"కార్యాలయం కోసం డిఫాల్ట్"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"సహాయకం &amp; వాయిస్ ఇన్‌పుట్"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"సహాయక అనువర్తనం"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"ఏదీ లేదు"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"సహాయక అనువర్తనాన్ని ఎంచుకోండి"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>ని మీ సహాయకంగా చేయాలా?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"సహాయకం మీ సిస్టమ్‌లో వినియోగంలో ఉన్న అనువర్తనాల గురించిన సమాచారం, అలాగే మీ స్క్రీన్‌పై కనిపించే లేదా అనువర్తనాల్లో ప్రాప్యత చేసే సమాచారం చదవగలుగుతుంది."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"అంగీకరిస్తున్నాను"</string>
@@ -2966,6 +2958,8 @@
     <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">"బ్యాటరీ అనుకూలీకరణ"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"వినియోగ హెచ్చరికలు"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"అనువర్తనాలన్నీ చూపు"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"అదనపు అనువర్తనాలను దాచు"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"అనుకూలీకరించనివి"</string>
     <string name="high_power_on" msgid="6216293998227583810">"అనుకూలీకరించబడలేదు"</string>
     <string name="high_power_off" msgid="3393904131961263278">"బ్యాటరీ వినియోగాన్ని అనుకూలీకరిస్తోంది"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"ప్రశాంత వర్ణము ఉష్ణోగ్రత"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ప్రశాంత భావనను కలిగించే ప్రదర్శన రంగులను ఉపయోగిస్తుంది"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"రంగు మార్పును వర్తింపజేయడానికి, స్క్రీన్‌ను ఆఫ్ చేయండి"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"టెలిఫోనీ మానిటర్ మార్పును వర్తింపజేయాలంటే, పరికరాన్ని రీబూట్ చేయండి"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"స్వయంచాలక సిస్టమ్ నవీకరణలు"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"బైండర్ చేసిన HALలు (రీబూట్ అవసరం)"</string>
     <string name="usage" msgid="2977875522080448986">"వినియోగం"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"సహాయక సంజ్ఞ"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"గ్లోబల్ HTTP ప్రాక్సీ సెట్ చేయబడింది"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"నిర్వాహకులు పరికరాన్ని లాక్ చేయగలరు మరియు పాస్‌వర్డ్‌ని రీసెట్ చేయగలరు"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"పరికరంలో ఉన్న మొత్తం డేటాని నిర్వాహకులు తొలగించగలరు"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">మొత్తం పరికర డేటాని తొలగించడం కంటే ముందు గరిష్ట పాస్‌వర్డ్‌ ప్రయత్నాల సంఖ్యను <xliff:g id="COUNT_1">%d</xliff:g>కి నిర్వాహకులు సెట్ చేసారు</item>
+      <item quantity="one">మొత్తం పరికర డేటాని తొలగించడం కంటే ముందు గరిష్ట పాస్‌వర్డ్‌ ప్రయత్నాల సంఖ్యను <xliff:g id="COUNT_0">%d</xliff:g>కి నిర్వాహకులు సెట్ చేసారు</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"ఈ పరికరం నిర్వహణలో ఉంది."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"ఈ పరికరం <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ద్వారా నిర్వహించబడుతోంది."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"మరింత తెలుసుకోండి"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"ఫోటోలు &amp; వీడియోలు"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"సంగీతం &amp; ఆడియో"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"గేమ్‌లు"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ఇతర అనువర్తనాలు"</string>
     <string name="storage_files" msgid="8581083146777364063">"ఫైల్‌లు"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"నిల్వ నిర్వాహికి: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ఆఫ్‌లో ఉంది"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ఆన్‌లో ఉంది"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"గేమ్‌లు"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ఆడియో ఫైల్‌లు"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"సంగీతం"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>కు అన్ఇన్‌స్టాల్ చేయబడింది)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>కు నిలిపివేయబడింది)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"స్వీయ పూరింపు అనువర్తనం"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 27234d8..219d418 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"ตำแหน่ง"</string>
     <string name="account_settings_title" msgid="626177544686329806">"บัญชี"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"ความปลอดภัยและการล็อกหน้าจอ"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"การเข้ารหัสลับและข้อมูลรับรอง"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"รหัสผ่าน"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"ความเป็นส่วนตัว"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"ปิดใช้โดยผู้ดูแลระบบ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"สถานะความปลอดภัย"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"ตำแหน่ง ลายนิ้วมือ"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"เลือก Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"กำลังเปิด WiFi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"กำลังปิด WiFi…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"ดูเครือข่ายทั้งหมด"</string>
     <string name="wifi_error" msgid="3207971103917128179">"ข้อผิดพลาด"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"แถบความถี่ 5 GHz ไม่พร้อมใช้งานในประเทศนี้"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ในโหมดใช้งานบนเครื่องบิน"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ปล่อยสัญญาณบลูทูธ"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"การปล่อยสัญญาณ"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"ฮอตสปอตและเน็ตผ่านมือถือ"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ฮอตสปอตเปิดอยู่ กำลังเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ฮอตสปอตเปิดอยู่"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"การเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ไม่สามารถเชื่อมต่ออินเทอร์เน็ตผ่านมือถือหรือใช้โหมดฮอตสปอตแบบพกพาขณะที่การประหยัดอินเทอร์เน็ตเปิดอยู่"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"ปล่อยสัญญาณผ่าน USB"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"เหมือนกับล็อกหน้าจออุปกรณ์"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"จัดการแอปพลิเคชัน"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"จัดการและนำแอปพลิเคชันที่ติดตั้งไว้ออก"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"ข้อมูลแอป"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"จัดการแอปพลิเคชัน ตั้งค่าทางลัดสำหรับเริ่มใช้งานด่วน"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"การตั้งค่าแอปพลิเคชัน"</string>
     <string name="install_applications" msgid="4872012136210802181">"ไม่รู้จักที่มา"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"จัดการพื้นที่"</string>
     <string name="filter" msgid="2018011724373033887">"ตัวกรอง"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"เลือกตัวเลือกตัวกรอง"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"ทั้งหมด"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"ปิดอยู่"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"แอปทั้งหมด"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"แอปที่ปิดใช้งาน"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ดาวน์โหลดแล้ว"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ที่กำลังใช้งาน"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ที่เก็บข้อมูล USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"บนการ์ด SD"</string>
     <string name="disabled" msgid="9206776641295849915">"ปิดอยู่"</string>
     <string name="not_installed" msgid="2797554494953450291">"ไม่ได้ติดตั้งสำหรับผู้ใช้นี้"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"ติดตั้งแล้ว"</string>
     <string name="no_applications" msgid="7336588977497084921">"ไม่มีแอปใดๆ"</string>
     <string name="internal_storage" msgid="1584700623164275282">"ที่เก็บข้อมูลภายใน"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ที่จัดเก็บข้อมูลภายใน"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"ตั้งค่าวิธีการป้อนข้อมูล"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"การตั้งค่า"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"การตั้งค่า"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"วิธีการป้อนข้อมูลที่ใช้งาน"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"ใช้ภาษาของระบบ"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"การตั้งค่าของ <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"เลือกวิธีการป้อนข้อมูลที่ใช้งาน"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"การตั้งค่าแป้นพิมพ์บนหน้าจอ"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"อัปเดตการขยายหน้าจอโดยอัตโนมัติ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"อัปเดตการขยายหน้าจอเมื่อเปลี่ยนแอปพลิเคชัน"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"กดปุ่มเปิด/ปิดเพื่อวางสาย"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"พูดรหัสผ่าน"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"ตัวชี้เมาส์ขนาดใหญ่"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"เสียงแบบโมโน"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"รวมแชนเนลเมื่อเล่นไฟล์เสียง"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"ใช้ตั้งแต่ชาร์จเต็มครั้งล่าสุด"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"การใช้งานหน้าจอ"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"การใช้งานหน้าจอ"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"การสแกนเครือข่ายมือถือ"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"การใช้งานแอปนับตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"การใช้งานอุปกรณ์นับตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"การใช้แบตเตอรี่ตั้งแต่ถอดปลั๊ก"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"การใช้แบตเตอรี่ตั้งแต่รีเซ็ต"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> เมื่อใช้แบตเตอรี่"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"การใช้พลังงานที่คำนวณมากเกินไป"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"ใช้มานาน %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ของแบตเตอรี่ทั้งหมด"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"รายละเอียดการใช้งานนับตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"เวลาที่เหลือโดยประมาณ"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"เวลาที่ใช้ชาร์จจนเต็ม"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"การประมาณการอาจเปลี่ยนไปตามการใช้งาน"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\"เปิดใช้เสมอ\" ไม่ทำงาน"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"แอปนี้ไม่สนับสนุน"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"อนุญาติการเชื่อมต่อผ่าน VPN เท่านั้น"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"ต้องใช้การเชื่อมต่อ VPN ไหม"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"ใช้งานการปิดล็อกอยู่"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"ไม่ได้ใช้งานการปิดล็อก"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"เลือกโปรไฟล์ VPN เพื่อคงการเชื่อมต่อเอาไว้ตลอดเวลา การเข้าใช้เครือข่ายจะได้รับอนุญาตเฉพาะเมื่อมีการเชื่อมต่อกับ VPN นี้เท่านั้น"</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"โปรไฟล์ที่ถูกจำกัดไม่สามารถเพิ่มบัญชีได้"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"ลบ <xliff:g id="USER_NAME">%1$s</xliff:g> จากอุปกรณ์นี้"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"การตั้งค่าหน้าจอล็อก"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"เพิ่มผู้ใช้จากหน้าจอล็อก"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"ผู้ใช้ใหม่"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"โปรไฟล์ใหม่"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"ลบตัวคุณเองหรือไม่"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"เปิดโทรศัพท์และ SMS ไหม"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ระบบจะแชร์ประวัติการโทรและ SMS กับผู้ใช้รายนี้"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ข้อมูลสำหรับกรณีฉุกเฉิน"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"ข้อมูลเกี่ยวกับ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"ข้อมูลและรายชื่อติดต่อสำหรับ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"อนุญาตแอปและเนื้อหา"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"แอปพลิเคชันที่มีข้อจำกัด"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ขยายการตั้งค่าของแอปพลิเคชัน"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">แสดงรายการที่ซ่อน %d รายการ</item>
       <item quantity="one">แสดงรายการที่ซ่อน %d รายการ</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"เครือข่ายและอินเทอร์เน็ต"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi เครือข่ายมือถือ ปริมาณการใช้อินเทอร์เน็ต ฮอตสปอต"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"เครือข่ายและอินเทอร์เน็ต"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, อุปกรณ์เคลื่อนที่, ปริมาณการใช้อินเทอร์เน็ต, ฮอตสปอต"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"อุปกรณ์ที่เชื่อมต่อ"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"บลูทูธ, NFC, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"แอปและการแจ้งเตือน"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"ผู้ใช้และบัญชี"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"แอปเริ่มต้น"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"ภาษา การสำรองข้อมูล อัปเดต เกี่ยวกับโทรศัพท์"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"ภาษา การสำรองข้อมูล อัปเดต เกี่ยวกับอุปกรณ์"</string>
     <string name="search_results_title" msgid="1796252422574886932">"การตั้งค่า"</string>
     <string name="search_menu" msgid="6283419262313758339">"การตั้งค่าการค้นหา"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"การตั้งค่าการค้นหา"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"ผลลัพธ์"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, การเชื่อมต่อเครือข่าย"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ข้อความ, การส่งข้อความ, ข้อความ, การส่งข้อความ"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"มือถือ, ผู้ให้บริการมือถือ, ไร้สาย, ข้อมูล, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"มือถือ, อุปกรณ์เคลื่อนที่, ผู้ให้บริการมือถือ, ไร้สาย, เน็ต, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, โทร, การโทร"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"หน้าจอ, หน้าจอสัมผัส"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"การแจ้งเตือน"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"สั่น"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"เสียงเปิดเครื่อง"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"ค่ากำหนด \"ห้ามรบกวน\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"อนุญาตเฉพาะเรื่องสำคัญ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"กฎอัตโนมัติ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"ตั้งค่ากำหนดการห้ามรบกวน"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"เสียงแจ้งเตือนเริ่มต้นของงาน"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"เสียงปลุกเริ่มต้นของงาน"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"เหมือนกับโปรไฟล์ส่วนตัว"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"เปลี่ยนเสียงในโปรไฟล์งานไหม"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ใช้เสียงในโปรไฟล์ส่วนตัวใช่ไหม"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"แทนที่"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"ระบบจะใช้เสียงในโปรไฟล์ส่วนตัวของคุณแทนเสียงในโปรไฟล์งานปัจจุบัน"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"ระบบจะใช้เสียงในโปรไฟล์ส่วนตัวของคุณแทนเสียงในโปรไฟล์งานปัจจุบัน"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"เสียงเรียกเข้า"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"เสียงอื่นๆ และการสั่น"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"ค่ากำหนดการแจ้งเตือน"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ไม่มีการมอบสิทธิ์"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"ไม่มีการขอสิทธิ์"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"แอปทั้งหมด"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"เปิดใช้แล้ว"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"แอปที่ติดตั้ง"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant Apps"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ส่วนตัว"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"งาน"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ถูกบล็อก"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ที่มี URL โดเมน"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"ขั้นสูง"</string>
     <string name="configure_apps" msgid="6685680790825882528">"กำหนดค่าแอป"</string>
     <string name="unknown_app" msgid="5275921288718717656">"แอปที่ไม่รู้จัก"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"ค่าเริ่มต้นสำหรับงาน"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"แอปผู้ช่วยและข้อมูลเสียง"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"แอปผู้ช่วย"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"ไม่มี"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"เลือกแอปผู้ช่วย"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"ให้ <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> เป็นผู้ช่วยของคุณใช่ไหม"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"ผู้ช่วยจะสามารถอ่านข้อมูลเกี่ยวกับแอปที่ใช้งานอยู่ในระบบของคุณ รวมถึงข้อมูลที่ปรากฏบนหน้าจอหรือที่เข้าถึงได้ภายในแอป"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"ยอมรับ"</string>
@@ -2966,6 +2958,8 @@
     <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">"การเพิ่มประสิทธิภาพแบตเตอรี่"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"การแจ้งเตือนการใช้งาน"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"แสดงแอปทั้งหมด"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"ซ่อนแอปอื่นๆ"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ไม่ได้เพิ่มประสิทธิภาพ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ไม่ได้เพิ่มประสิทธิภาพ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"เพิ่มประสิทธิภาพการใช้แบตเตอรี"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"อุณหภูมิสีเย็น"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ใช้สีแสดงผลที่เย็นกว่านี้"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"หากต้องการใช้การเปลี่ยนสี ให้ปิดหน้าจอ"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"เริ่มต้นอุปกรณ์ใหม่เพื่อให้การเปลี่ยนแปลงการตรวจสอบโทรศัพท์มีผล"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"การอัปเดตระบบอัตโนมัติ"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (ต้องเริ่มต้นใหม่)"</string>
     <string name="usage" msgid="2977875522080448986">"การใช้งาน"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"ท่าทางสัมผัสการช่วยเหลือ"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ตั้งค่าพร็อกซี HTTP ส่วนกลางแล้ว"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ผู้ดูแลระบบสามารถล็อกอุปกรณ์และรีเซ็ตรหัสผ่าน"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ผู้ดูแลระบบสามารถลบข้อมูลทั้งหมดในอุปกรณ์"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">ผู้ดูแลระบบได้กำหนดจำนวนครั้งสูงสุดในการใส่รหัสผ่านไว้ที่ <xliff:g id="COUNT_1">%d</xliff:g> ครั้งก่อนลบข้อมูลทั้งหมดในอุปกรณ์</item>
+      <item quantity="one">ผู้ดูแลระบบได้กำหนดจำนวนครั้งสูงสุดในการใส่รหัสผ่านไว้ที่ <xliff:g id="COUNT_0">%d</xliff:g> ครั้งก่อนลบข้อมูลทั้งหมดในอุปกรณ์</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"อุปกรณ์นี้มีการจัดการ"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"อุปกรณ์เครื่องนี้จัดการโดย <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"เรียนรู้เพิ่มเติม"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"รูปภาพและวิดีโอ"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"เพลงและเสียง"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"เกม"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"แอปอื่นๆ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ไฟล์"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ตัวจัดการพื้นที่เก็บข้อมูล: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ปิด"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"เปิด"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"เกม"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ไฟล์เสียง"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"เพลง"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ถอนการติดตั้งแล้วสำหรับ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ปิดใช้อยู่สำหรับ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"แอปการป้อนอัตโนมัติ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 08508dd..32bd66f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasyon"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Mga Account"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Seguridad at lock ng screen"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Pag-encrypt at mga kredensyal"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng imbakan ng kredensyal"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng imbakan ng kredensyal"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Mga Password"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Na-disable ng administrator"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Status ng seguridad"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Lokasyon, fingerprint"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Pumili ng Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Ino-on ang Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Ino-off ang Wi-Fi..."</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Tingnan ang lahat ng network"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Hindi available sa bansang ito ang 5 GHz band"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Nasa Airplane mode"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Pag-tether ng Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Nagte-tether"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Hotspot at Pag-tether"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Naka-on ang hotspot, pag-tether"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Naka-on ang hotspot"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Pag-tether"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Hindi makapag-tether o makagamit ng mga portable hotspot habang naka-on ang Data Saver"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Pag-tether ng USB"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Kapareho ng screen lock ng device"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pamahalaan ang apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pamahalaan at alisin ang naka-install na apps"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Impormasyon ng app"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Pamahalaan ang apps, mag-set up ng mga shortcut ng mabilisang paglunsad"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Mga setting ng app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Hindi kilalang pinagmumulan"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Pamahalaan ang espasyo"</string>
     <string name="filter" msgid="2018011724373033887">"I-filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Pumili ng mga opsyon ng filter"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Lahat"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Naka-disable"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Lahat ng app"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Mga naka-disable na app"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Na-download"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Tumatakbo"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Imbakan na USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sa SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"Naka-disable"</string>
     <string name="not_installed" msgid="2797554494953450291">"Hindi naka-install para sa user na ito"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Naka-install"</string>
     <string name="no_applications" msgid="7336588977497084921">"Walang apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Panloob na storage"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Mag-set up ng paraan ng pag-input"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Mga Setting"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Mga Setting"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Mga aktibong paraan ng pag-input"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Gamitin ang mga wika ng system"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> (na) setting"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Pumili aktibong pamamaraan ng input"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Mga setting ng keyboard ng onscreen"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"I-auto update pag-magnify ng screen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"I-update pag-magnify ng screen sa app transition"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tatapusin ng power button ang tawag"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Sabihin ang mga password"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Malaking pointer ng mouse"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono audio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Pagsamahin ang mga channel kapag nagpapatugtog"</string>
@@ -1837,7 +1829,11 @@
     <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> natitira"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> upang ma-charge"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Paggamit mula noong huling full charge"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Paggamit ng screen"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Pagkonsumo ng screen"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Pag-scan ng mobile network"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Paggamit ng app simula noong huling nakumpleto ang charge"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Paggamit ng device simula noong huling nakumpleto ang charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Paggamit ng baterya mula nang hindi nakasaksak"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Paggamit ng baterya mula ng ini-reset"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> sa baterya"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sobrang nakalkulang paggamit ng power"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> (na) mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Ginamit nang %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ng pangkalahatang baterya"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Breakdown ng paggamit simula noong huling nakumpleto ang charge"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Tinatayang natitirang oras"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tagal bago mapuno ang baterya"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Maaaring magbago ang pagtatantya batay sa paggamit"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> mula nang na-unplug"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Habang huling naka-unplug para sa <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Mga kabuuan ng paggamit"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Hindi aktibo ang Always-on"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Hindi sinusuportahan ng app na ito"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Payagan lang ang mga koneksyon sa pamamagitan ng VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Gawing mandatoryo ang pagkonekta sa VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Aktibo ang lockdown"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Hindi aktibo ang lockdown"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pumili ng VPN profile kung saan palaging mananatiling nakakonekta. Papayagan lang ang trapiko ng network kapag nakakonekta sa VPN na ito."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Hindi makakapagdagdag ng mga account sa mga pinaghihigpitang profile"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Tanggal <xliff:g id="USER_NAME">%1$s</xliff:g> dito device"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Mga setting ng lock screen"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Magdagdag ng mga user mula sa lock screen"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Bagong user"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Bagong profile"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"I-delete ang iyong sarili?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"I-on ang mga pagtawag sa telepono at SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Ibabahagi sa user na ito ang history ng pagtawag at SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Impormasyong pang-emergency"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Impormasyon tungkol kay <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Impormasyon at mga contact para kay <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Payagan ang apps at nilalaman"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Mga application na may mga paghihigpit"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Palawakin ang mga setting para sa application"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="one">Ipakita ang %d nakatagong item</item>
       <item quantity="other">Ipakita ang %d na nakatagong item</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Network at internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, cellular, paggamit ng data, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Network at Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, paggamit ng data, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Mga nakakonektang device"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Mga app at notification"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"User at mga account"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Mga default na app"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Mga wika, backup, mga update, tungkol sa telepono"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Mga wika, backup, mga update, tungkol sa device"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Mga Setting"</string>
     <string name="search_menu" msgid="6283419262313758339">"Mga setting ng paghahanap"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Mga setting ng paghahanap"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Mga Resulta"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, koneksyon sa network"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"text message, pag-text, mga mensahe, pagmemensahe"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"cellular, carrier ng cell, wireless, data, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellular, mobile, cell carrier, wireless, data, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, tawag, pagtawag"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"screen, touchscreen"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerto"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Mag-vibrate"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"I-on ang mga tunog"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Kagustuhan sa huwag istorbohin"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Pinapayagan lang ng priyoridad"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Mga awtomatikong panuntunan"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"I-set, Iskedyul ng Huwag Istorbohin"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Default notif. tone sa trabaho"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Default na alarm sa trabaho"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Pareho sa personal na profile"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Palitan tunog sa profile sa trabaho?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Gamitin ang mga tunog sa personal na profile?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Palitan"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Papalitan ang kasalukuyang mga tunog sa profile sa trabaho ng mga tunog sa iyong personal na profile"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Gagamitin ang mga tunog sa iyong personal na profile sa halip na ang iyong mga kasalukuyang tunog sa profile sa trabaho"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Mga Ringtone"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Iba pang mga tunog at pag-vibrate"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Mga kagustuhan sa notification"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Walang ibinigay na mga pahintulot"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Walang hiniling na mga pahintulot"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Lahat ng app"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Naka-enable"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Mga naka-install na app"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Mga instant na app"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Trabaho"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Na-block"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"May mga URL ng domain"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Mag-configure ng mga app"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Hindi kilalang app"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Default para sa trabaho"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Tulong at voice input"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"App ng tulong"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Wala"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Pumili ng Assist app"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Gawing assistant mo ang <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Mababasa ng assistant na ito ang impormasyon tungkol sa mga app na ginagamit sa iyong system, kasama na ang impormasyong nakikita sa iyong screen o naa-access sa mga app."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Sumasang-ayon"</string>
@@ -2966,6 +2958,8 @@
     <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">"Pag-optimize ng baterya"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Mga alerto sa paggamit"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Ipakita ang lahat ng app"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Itago ang mga karagdagang app"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Hindi naka-optimize"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Hindi naka-optimize"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Pag-optimize sa paggamit ng baterya"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Malamig na temperatura ng kulay"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gumamit ng mas malalamig na kulay ng display"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Upang ilapat ang pagbabago sa kulay, i-off ang screen"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Upang ilapat ang pagbabago sa telephony monitor, i-reboot ang device"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mga awtomatikong pag-update ng system"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Mga Naka-binderize na HAL (kailangang mag-reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Paggamit"</string>
@@ -3323,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Upang makita ang iyong mga notification, mag-swipe pababa sa sensor para sa fingerprint sa likod ng telepono mo."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Upang makita ang iyong mga notification, mag-swipe pababa sa sensor para sa fingerprint sa likod ng tablet mo."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Upang makita ang iyong mga notification, mag-swipe pababa sa sensor para sa fingerprint sa likod ng device mo."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Galaw para sa tulong"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"I-on"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"I-off"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Naka-unlock na ang bootloader"</string>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Naitakda na ang pangkalahatang HTTP proxy"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Maaaring i-lock ng admin ang device at i-reset ang password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Maaaring i-delete ng admin ang lahat ng data ng device"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Itinakda ng admin ang maximum na mga pagsubok ng password sa <xliff:g id="COUNT_1">%d</xliff:g> bago na-delete ang lahat ng data ng device</item>
+      <item quantity="other">Itinakda ng admin ang maximum na mga pagsubok ng password sa <xliff:g id="COUNT_1">%d</xliff:g> bago na-delete ang lahat ng data ng device</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Itinakda ng admin ang maximum na mga pagsubok ng password sa <xliff:g id="COUNT_1">%d</xliff:g> bago na-delete ang data ng profile sa trabaho</item>
+      <item quantity="other">Itinakda ng admin ang maximum na mga pagsubok ng password sa <xliff:g id="COUNT_1">%d</xliff:g> bago na-delete ang data ng profile sa trabaho</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Pinamamahalaan ang device na ito."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Pinamamahalaan ng <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ang device na ito."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Matuto pa"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Mga Larawan at Video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musika at Audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Mga Laro"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Iba pang mga app"</string>
     <string name="storage_files" msgid="8581083146777364063">"Mga File"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Manger ng Storage: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Naka-off"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Naka-on"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Mga Laro"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Mga audio file"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musika"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(na-uninstall para kay user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(na-disable para kay user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Autofill na app"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d1b658c..8338cad 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Konum"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hesaplar"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Güvenlik ve ekran kilidi"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Şifreleme ve kimlik bilgileri"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Şifreler"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Gizlilik"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Yönetici tarafından devre dışı bırakıldı"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Güvenlik durumu"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Konum, parmak izi"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Kablosuz bağlantı seç"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Kablosuz açılıyor…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Kablosuz kapatılıyor…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Tüm ağları göster"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Hata"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz bant genişliği bu ülkede kullanılamıyor"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Uçak modunda"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth tethering"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Hotspot ve Tethering"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot açık, tethering"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Hotspot açık"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Tethering"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Veri Tasarrufu açıkken taşınabilir hotspot\'lara bağlanılamaz veya kullanılamaz"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Cihaz ekranı kilidiyle aynı"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Uygulamaları yönet"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Yüklü uygulamaları yönet ve kaldır"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Uygulama bilgileri"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Uygulamaları yönet, hızlı başlatma kısayolları ayarla"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Uygulama ayarları"</string>
     <string name="install_applications" msgid="4872012136210802181">"Bilinmeyen kaynaklar"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Alanı yönet"</string>
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filtre seçeneklerini belirleyin"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Tümü"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Devre dışı"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Tüm uygulamalar"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Devre dışı bırakılan uygulamalar"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"İndirilenler"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Çalışanlar"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB bellek"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartta"</string>
     <string name="disabled" msgid="9206776641295849915">"Devre dışı"</string>
     <string name="not_installed" msgid="2797554494953450291">"Bu kullanıcı için yüklü değil"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Yüklendi"</string>
     <string name="no_applications" msgid="7336588977497084921">"Uygulama yok."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Dahili Bellek"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"dahili depolama"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Giriş yöntemlerini ayarla"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Ayarlar"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Ayarlar"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Etkin giriş yöntemleri"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Sistem dillerini kullan"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ayarları"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Etkin giriş yöntemlerini seçin"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekran klavyesi ayarları"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekran büyütmeyi otomatik güncelle"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Uygulama geçişlerinde ekran büyütmeyi güncelle"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Güç düğmesi çağrıyı sonlandırır"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Şifreleri sesli olarak oku"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Geniş fare işaretçisi"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono ses"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Ses çalınırken kanalları birleştir"</string>
@@ -1837,7 +1829,11 @@
     <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> kaldı"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Şarj olmasına <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> var"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Tamamen şarj olduktan sonra kullanım"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Ekranın pil kullanımı"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın pil tüketimi"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobil ağ tarama"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Son tam şarjdan sonraki uygulama kullanımı"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Son yapılan tam şarjdan sonraki cihaz kullanımı"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten sonra pil kullanımı"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sıfırlamadan itibaren pil kullanımı"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Pilde <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Fazla hesaplanan güç kullanımı"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s kullandı"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"Toplam pilden %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Son tam şarjdan sonraki kullanım dökümü"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Kalan tahmini süre"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Tamamen şarj olma süresi"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Tahmin, kullanıma bağlı olarak değişiklik gösterebilir"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Fişten çekildikten itibaren <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> için fişten son çekildikten itibaren"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kullanım toplamı"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Her zaman açık olma seçeneği devre dışı"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Bu uygulama tarafından desteklenmiyor"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Sadece VPN üzerinden bağlantılara izin ver"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN bağlantısı gerekiyor mu?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Tam gizlilik etkin"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Tam gizlilik etkin değil"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Her zaman bağlı kalacak bir VPN profili seçin. Ağ trafiğine yalnızca bu VPN\'ye bağlanıldığında izin verilir."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Kısıtlanmış profiller hesap ekleyemez"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Bu cihazdan sil: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Kilit ekranı ayarları"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Kilit ekranından kullanıcı ekleme"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Yeni kullanıcı"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Yeni profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Kendinizi silmek istiyor musunuz?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefon çağrıları ve SMS açılsın mı?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Çağrı ve SMS geçmişi bu kullanıcıyla paylaşılacak."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Acil durum bilgileri"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> ile ilgili bilgiler"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> için bilgi ve kişiler"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Uygulamalara ve içeriğe izin ver"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Kısıtlamalı uygulamalar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Uygulama ayarlarını genişlet"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">Gizli %d öğeyi göster</item>
       <item quantity="one">Gizli %d öğeyi göster</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Ağ ve İnternet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Kablosuz, hücresel, veri kullanımı, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Ağ ve İnternet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Kablosuz, mobil, veri kullanımı, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Bağlı cihazlar"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, yayınlama"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Uygulamalar ve bildirimler"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Kullanıcı ve hesaplar"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Varsayılan uygulamalar"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Diller, yedek, güncellemeler, telefon hakkında"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Diller, yedek, güncellemeler, cihaz hakkında"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ayarlar"</string>
     <string name="search_menu" msgid="6283419262313758339">"Arama ayarları"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Arama ayarları"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Sonuçlar"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"kablosuz, kablosuz, ağ bağlantısı"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"kısa mesaj, kısa mesaj gönderme, mesajlar, mesajlaşma"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"hücresel, cep telefonu operatörü, kablosuz, veri, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"hücresel, mobil, cep telefonu operatörü, kablosuz, veri, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"kablosuz, kablosuz, çağrı, telefon etme"</string>
     <string name="keywords_home" msgid="3626170808219458848">"başlatıcı"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, dokunmatik ekran"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Uyarı"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Titreşim"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Açılış sesleri"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Rahatsız etmeyin tercihleri"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Yalnızca öncelik şunlara izin verir"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Otomatik kurallar"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Rahatsız Etmeyin ayarını yapın"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Varsayılan iş bildirimi sesi"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Varsayılan iş alarmı zil sesi"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Kişisel profille aynı"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"İş profili seslerini değiştir?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Kişisel profil sesleri kullanılsın mı?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Değiştir"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Mevcut iş profili sesleriniz kişisel profil seslerinizle değiştirilecek"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Mevcut iş profili seslerinizin yerine kişisel profil sesleriniz kullanılacak"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Zil sesleri"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Diğer sesler ve titreşimler"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Bildirim tercihleri"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Hiçbir izin verilmedi"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Hiçbir izin istenmedi"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Tüm uygulamalar"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Etkin olanlar"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Yüklü uygulamalar"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Hazır uygulamalar"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Kişisel uygulamalar"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"İş uygulamaları"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Engellenenler"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Alan URL\'leri ile"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"İleri düzey"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Uygulamaları yapılandır"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Bilinmeyen uygulama"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"İş için varsayılan"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Yardım ve ses girişi"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Yardım uygulaması"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Yok"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Asistan uygulamasını seçin"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> uygulaması yardımcınız olsun mu?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Asistan, ekranınızda görünür olan veya uygulamaların içinden erişilebilen bilgiler dahil olmak üzere sisteminizde kullanılan uygulamalar hakkındaki bilgileri okuyabilecektir."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Kabul ediyorum"</string>
@@ -2966,6 +2958,8 @@
     <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">"Pil optimizasyonu"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Kullanım uyarıları"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Tüm uygulamaları göster"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ekstra uygulamaları gizle"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Optimize edilmeyenler"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Optimize edilmedi"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Pil kullanımı optimize ediliyor"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Soğuk renk sıcaklığı"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Daha soğuk ekran renkleri kullan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Renk değişikliğini uygulamak için ekranı kapatın"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony monitor değişikliğini uygulamak için cihazı yeniden başlatın"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Otomatik sistem güncellemeleri"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binder uygulanmış HAL\'ler (yeniden başlatma gerekir)"</string>
     <string name="usage" msgid="2977875522080448986">"Kullanım"</string>
@@ -3323,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Bildirimlerinizi kontrol etmek için telefonunuzun arkasındaki parmak izi sensöründe parmağınızı hızlıca aşağı kaydırın."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Bildirimlerinizi kontrol etmek için tabletinizin arkasındaki parmak izi sensöründe parmağınızı hızlıca aşağı kaydırın."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Bildirimlerinizi kontrol etmek için cihazınızın arkasındaki parmak izi sensöründe parmağınızı hızlıca aşağı kaydırın."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Asistan hareketi"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Açık"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Kapalı"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Önyükleyici kilidi zaten açık"</string>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Genel HTTP proxy\'si ayarlanmış"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Yönetici cihazı kilitleyebilir ve şifreyi sıfırlayabilir"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Yönetici tüm cihaz verilerini silebilir"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Yönetici, tüm cihaz verilerini silmeden önceki maksimum şifre girişi deneme sayısını <xliff:g id="COUNT_1">%d</xliff:g> olarak ayarladı.</item>
+      <item quantity="one">Yönetici, tüm cihaz verilerini silmeden önceki maksimum şifre girişi deneme sayısını <xliff:g id="COUNT_0">%d</xliff:g> olarak ayarladı.</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Yönetici, iş profili verilerini silmeden önceki maksimum şifre girişi deneme sayısını <xliff:g id="COUNT_1">%d</xliff:g> olarak ayarladı.</item>
+      <item quantity="one">Yönetici, iş profili verilerini silmeden önceki maksimum şifre girişi deneme sayısını <xliff:g id="COUNT_0">%d</xliff:g> olarak ayarladı.</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Bu cihaz yönetilen bir cihazdır."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tarafından yönetiliyor."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Daha fazla bilgi"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Fotoğraflar ve Videolar"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Müzik ve Ses"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Oyunlar"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Diğer uygulamalar"</string>
     <string name="storage_files" msgid="8581083146777364063">"Dosyalar"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Depolama Yöneticisi: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Kapalı"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Açık"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Oyunlar"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ses dosyaları"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Müzik"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> için yükleme kaldırıldı)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> için devre dışı bırakıldı)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Otomatik doldurma uygulaması"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 11a7401..d9d6c7f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -334,9 +334,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Місцезнаходження"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Облікові записи"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Безпека та блокування екрана"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрування й облікові дані"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Паролі"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Конфіденційність"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Вимкнено адміністратором"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Статус безпеки"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Місцезнаходження та цифровий відбиток"</string>
@@ -1446,8 +1447,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Те саме блокування, що й на пристрої"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Керувати програмами"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Керувати встановленими програмами та видаляти їх"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Про додаток"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Керування програмами, налаштування клавіш швидкого запуску"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Налаштування програми"</string>
     <string name="install_applications" msgid="4872012136210802181">"Невідомі джерела"</string>
@@ -1509,16 +1509,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Кер. простором"</string>
     <string name="filter" msgid="2018011724373033887">"Фільтрув."</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Вибрати параметри фільтра"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Усі"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Вимкнені"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Усі додатки"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Вимкнені додатки"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Завантажені"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Запущені"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Носій USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На карті SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Вимкнено"</string>
     <string name="not_installed" msgid="2797554494953450291">"Не встановлено для цього користувача"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Установлено"</string>
     <string name="no_applications" msgid="7336588977497084921">"Додатків немає."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Внутр. пам\'ять"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"внутрішня пам’ять"</string>
@@ -1696,8 +1695,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Налаштувати методи введення"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Налаштування"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Налаштування"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Активні методи введення"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Використовувати мови системи"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Налашт-ня <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Вибрати активні методи введення"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Налашт-ня екранної клавіатури"</string>
@@ -1741,7 +1738,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Автоматично оновлювати збільшення"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Оновлювати збільшення екрана в інших програмах"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Кнопка живл. закінчує виклик"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Диктувати паролі"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Великий курсор"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Монофонічне аудіо"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Об’єднувати канали під час відтворення аудіо"</string>
@@ -1867,7 +1863,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"Використання після ост. повного зарядж."</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Використання заряду екраном"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Споживання заряду екраном"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Сканування мобільної мережі"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Використання додатком після останнього повного заряджання"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Використання пристроєм після останнього повного заряджання"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Споживання акумулятора з часу відключення"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Споживання акумулятора з моменту перезавантаження"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> від акумулятора"</string>
@@ -1957,8 +1957,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Переоцінене енергоспоживання"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА/год"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Використовується %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s усього заряду"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Статистика використання після останнього повного заряджання"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Залишилося приблизно"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Час до повного заряджання"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Оцінка може змінюватися залежно від використання"</string>
     <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>
@@ -2350,6 +2352,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Постійна мережа неактивна"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Цей додаток не підтримує"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Дозволити під’єднання лише через мережу VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Вимагати з’єднання VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Активна повна конфіденційність"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Неактивна повна конфіденційність"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Виберіть профіль мережі VPN і не від’єднуйтесь від неї. Мережевий трафік дозволятиметься лише за умови під’єднання до цієї VPN."</string>
@@ -2443,8 +2446,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Обмежені профілі не можуть додавати облікові записи"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> – видалити з пристрою"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Параметри блокування екрана"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Додавайте користувачів на заблокованому екрані"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Новий користувач"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Новий профіль"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Видалити ваш профіль?"</string>
@@ -2472,7 +2474,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Увімкнути телефонні дзвінки й SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Цей користувач матиме доступ до історії дзвінків і SMS"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Інформація для екстрених випадків"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Інформація про користувача <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Інформація та контакти користувача <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволи для програм і вмісту"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Програми з обмеженнями"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Розгорнути налаштув. програм"</string>
@@ -2594,8 +2596,8 @@
       <item quantity="many">Показати %d схованих елементів</item>
       <item quantity="other">Показати %d схованого елемента</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Мережа й Інтернет"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, мобільний трафік, використання трафіку та точка доступу"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Мережа й Інтернет"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобільний, використання трафіку, точка доступу"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Під’єднані пристрої"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC та трансляція"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Додатки та сповіщення"</string>
@@ -2611,7 +2613,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Результати"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, мережа, з’єднання"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"текстове повідомлення, писати, повідомлення, обмін повідомленнями"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"мобільний, оператор мобільного зв’язку, без дротів, трафік, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"мобільний зв’язок, мобільний, оператор мобільного зв’язку, без дротів, трафік, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, дзвінок, телефонувати"</string>
     <string name="keywords_home" msgid="3626170808219458848">"панель запуску"</string>
     <string name="keywords_display" msgid="8910345814565493016">"екран, сенсорний екран"</string>
@@ -2687,8 +2689,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Сповіщення"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вібросигнал"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Увімкнути звуки"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Параметри опції \"Не турбувати\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозволити лише пріоритетні"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Авторежим"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Вибрати режим \"Не турбувати\""</string>
@@ -2705,9 +2706,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Сигнал робочих сповіщень"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Сигнал робочого будильника"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Такі самі, як в особистому профілі"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Замінити звуки робоч. профілю?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Використовувати звуки особистого профілю?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Замінити"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Поточні звуки робочого профілю буде замінено на звуки особистого профілю"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Поточні звуки робочого профілю буде замінено на звуки особистого профілю"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Сигнали дзвінка"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Інші звуки та вібросигнали"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Налаштування сповіщень"</string>
@@ -2955,11 +2956,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Немає дозволів"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Немає запитів на дозволи"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Усі додатки"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Увімкнені"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Установлені додатки"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Додатки з миттєвим запуском"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Особисті"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Робочі"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблоковані"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"З URL-адресами домену"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Розширені налаштування"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Налаштування додатків"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Невідомий додаток"</string>
@@ -2986,8 +2987,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"За умовчанням для роботи"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Помічник і голосовий ввід"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Додаток-помічник"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Немає"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Виберіть додаток-помічник"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Зробити додаток <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> помічником?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Помічник матиме доступ до інформації про додатки у вашій системі, зокрема до даних на екрані та в додатках."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Прийняти"</string>
@@ -3017,6 +3016,8 @@
     <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">"Оптимізація акумулятора"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Сповіщення про використання"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Показати всі додатки"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Сховати зайві додатки"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Додатки без оптимізації"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не оптимізовано"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Використання акумулятора оптимізується"</string>
@@ -3201,6 +3202,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Холодна температура кольорів"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Використовувати холодніші кольори дисплея"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Щоб змінити кольори, вимкніть екран"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Щоб застосувати зміни у функції Telephony Monitor, перезапустіть пристрій"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматичне оновлення системи"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Зв’язані модулі HAL (потрібно перезапустити)"</string>
     <string name="usage" msgid="2977875522080448986">"Використання"</string>
@@ -3386,6 +3388,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Допоміжний жест"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3459,12 +3463,26 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Установлено глобальний проксі-сервер HTTP"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Адміністратор може заблокувати пристрій і скинути пароль"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Адміністратор може видалити всі дані пристрою"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спробу введення пароля, перш ніж усі дані пристрою буде видалено</item>
+      <item quantity="few">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроби введення пароля, перш ніж усі дані пристрою буде видалено</item>
+      <item quantity="many">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроб введення пароля, перш ніж усі дані пристрою буде видалено</item>
+      <item quantity="other">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроби введення пароля, перш ніж усі дані пристрою буде видалено</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спробу введення пароля, перш ніж усі дані профілю буде видалено</item>
+      <item quantity="few">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроби введення пароля, перш ніж усі дані профілю буде видалено</item>
+      <item quantity="many">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроб введення пароля, перш ніж усі дані профілю буде видалено</item>
+      <item quantity="other">Адміністратор налаштував <xliff:g id="COUNT_1">%d</xliff:g> спроби введення пароля, перш ніж усі дані профілю буде видалено</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Цим пристроєм керує адміністратор."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Цим пристроєм керує <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Докладніше"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Фото й відео"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Музика й аудіо"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Ігри"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Інші додатки"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файли"</string>
@@ -3475,9 +3493,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Диспетчер пам’яті: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Вимкнено"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Увімкнено"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Ігри"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудіофайли"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Музика"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(видалено для користувача <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(вимкнено для користувача <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Додаток автозаповнення"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 7f7e161..0811e03 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"مقام"</string>
     <string name="account_settings_title" msgid="626177544686329806">"اکاؤنٹس"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"سیکیورٹی اور اسکرین لاک"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"مرموز کاری اور اسناد"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"‏میرا مقام، اسکرین اَن لاک، SIM کارڈ لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"میرا مقام، اسکرین ان لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"پاس ورڈز"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"رازداری"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"منتظم نے غیر فعال کی"</string>
     <string name="security_status_title" msgid="5848766673665944640">"سیکیورٹی کی صورتحال"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"مقام، فنگر پرنٹ"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"‏Wi‑Fi منتخب کریں"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"‏Wi‑Fi آن ہو رہا ہے…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"‏Wi‑Fi آف ہو رہا ہے…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"سبھی نیٹ ورک دیکھیں"</string>
     <string name="wifi_error" msgid="3207971103917128179">"خرابی"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"‏اس ملک میں ‎5 GHz بینڈ دستیاب نہیں"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ہوائی جہاز وضع میں"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ مربوط کرنا"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"مربوط کرنا"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"ہاٹ اسپاٹ اور ربط بنانا"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ہاٹ اسپاٹ، ربط بنانا  آن ہے"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ہاٹ اسپاٹ آن ہے"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ربط بنانا آن ہے"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ڈیٹا سیور آن ہوتے ہوئے ربط نہیں بنایا جا سکتا یا پورٹیبل ہاٹ اسپاٹس استعمال نہیں ہو سکتے"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏USB مربوط کرنا"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"آلہ کے اسکرین قفل جیسا"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"ایپس کا نظم کریں"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"انسٹال کردہ ایپس کا نظم کریں اور انہیں ہٹائیں"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"ایپ کی معلومات"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"ایپس کا نظم کریں، فوری شروعات کے شارٹ کٹس کو ترتیب دیں"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"ایپ کی ترتیبات"</string>
     <string name="install_applications" msgid="4872012136210802181">"نامعلوم ذرائع"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"خالی جگہ کا نظم کریں"</string>
     <string name="filter" msgid="2018011724373033887">"فلٹر"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"فلٹر کے اختیارات منتخب کریں"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"سبھی"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"غیر فعال"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"سبھی ایپس"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"غیر فعال کردہ ایپس"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ڈاؤن لوڈ کردہ"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"چل رہے ہیں"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏USB اسٹوریج"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏SD کارڈ پر"</string>
     <string name="disabled" msgid="9206776641295849915">"غیر فعال"</string>
     <string name="not_installed" msgid="2797554494953450291">"اس صارف کیلئے انسٹال نہیں ہے"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"انسٹال ہو گئی"</string>
     <string name="no_applications" msgid="7336588977497084921">"کوئی ایپس ہیں۔"</string>
     <string name="internal_storage" msgid="1584700623164275282">"داخلی اسٹوریج"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"داخلی اسٹوریج"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"اندراج کے طریقے ترتیب دیں"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"ترتیبات"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"ترتیبات"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"فعال اندراج کے طریقے"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"سسٹم زبانیں استعمال کریں"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ترتیبات"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"فعال اندراج کے طریقے منتخب کریں"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"آن اسکرین کی بورڈ کی ترتیبات"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"سکرین میگنیفکیشن از خود اپ ڈیٹ کریں"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ایپ تبدیلیوں پر سکرین میگنیفکیشن کو اپ ڈیٹ کریں"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"پاور بٹن سے کال ختم ہو جاتی ہے"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"پاس ورڈز بولیں"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"بڑا ماؤس پوائنٹر"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"مونو آڈیو"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"آڈیو چلاتے وقت چینلز آپس میں ملائیں"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"پچھلے مکمل چارج کے بعد سے استعمال"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"اسکرین کا استعمال"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"اسکرین کی کھپت"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"موبائل نیٹ ورک اسکیننگ"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"پچھلی بار مکمل چارج کرنے کے بعد سے ایپ کا استعمال"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"پچھلی بار مکمل چارج کرنے کے بعد سے آلہ کا استعمال"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"پلگ ہٹانے کے بعد سے بیٹری کا استعمال"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"دوبارہ ترتیب دیے جانے کے بعد سے بیٹری کا استعمال"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"بیٹری پر <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"پاور کا ضرورت سے زیادہ استعمال"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"‏%1$s کیلئے استعمال کیا گيا"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"‏مجموعی طور پر بیٹری کے استعمال کا %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"پچھلے مکمل چارج کے بعد سے استعمال کا تجزیہ"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"باقی تخمینی وقت"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"مکمل چارج ہونے کیلئے وقت"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"ممکن ہے استعمال کی بنیاد پر تخمینہ تبدیل ہوجائے"</string>
     <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>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"غیر فعال ہمیشہ آن رکھیں"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"اس ایپ سے تعاون یافتہ نہیں"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"‏صرف VPN کے ذریعے کنکشنز کو اجازت دیں"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"‏VPN کنکشن درکار ہے؟"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"مقفل فعال ہے"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"مقفل غیر فعال ہے"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‏ہمیشہ مربوط رہنے کیلئے ایک VPN پروفائل منتخب کریں۔ صرف اس VPN سے مربوط ہونے پر ہی نیٹ ورک ٹریفک کی اجازت ہو گی۔"</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"محدود پروفائلز اکاؤنٹس شامل نہیں کر سکتے ہیں"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"اس آلہ سے <xliff:g id="USER_NAME">%1$s</xliff:g> حذف کریں"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"قفل اسکرین کی ترتیبات"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"مقفل اسکرین سے صارفین کو شامل کریں"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"نیا صارف"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"نیا پروفائل"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"اپنے آپ کو حذف کریں؟"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"‏فون کالز اور SMS آن کریں؟"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"‏کال اور SMS کی سرگزشت کا اس صارف کے ساتھ اشتراک کیا جائے گا۔"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ہنگامی معلومات"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> کے بارے میں معلومات"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> کے متعلق معلومات اور رابطے"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ایپس اور مواد کی اجازت دیں"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"پابندیوں والی ایپلیکیشنز"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ایپ کیلئے ترتیبات پھیلائیں"</string>
@@ -2554,8 +2550,8 @@
     <string name="dashboard_title" msgid="5453710313046681820">"ترتیبات"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for settings_suggestion_header_summary_hidden_items (5597356221942118048) -->
-    <string name="network_dashboard_title" msgid="3135144174846753758">"نیٹ ورک اور انٹرنیٹ"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"‏Wi-Fi، سیلولر، ڈیٹا کا استعمال، ہاٹ اسپاٹ"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"نیٹ ورک اور انٹرنیٹ"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"‏Wi-Fi، موبائل، ڈیٹا کا استعمال، ہاٹ اسپاٹ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"منسلک آلات"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"‏بلوٹوتھ، NFC، کاسٹ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ایپس اور اطلاعات"</string>
@@ -2563,8 +2559,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"صارف اور اکاؤنٹس"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"ڈیفالٹ ایپس"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"زبانیں، بیک اپ، اپ ڈیٹس، فون کے بارے میں"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"زبانیں، بیک اپ، اپ ڈیٹس، آلہ کے بارے میں"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ترتیبات"</string>
     <string name="search_menu" msgid="6283419262313758339">"تلاش کی ترتیبات"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"تلاش کی ترتیبات"</string>
@@ -2572,7 +2567,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"نتائج"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"‏WiFi، ‏Wi-Fi، نیٹ ورک کنکشن"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"متنی پیغام، پیغام بھیجنا، پیغامات، پیغام رسانی"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"‏سیلولر، سیل کیریئر، وائرلیس، ڈیٹا، 4g، ‏3g، ‏2g، ‏lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"‏سیلولر، موبائل، سیل کیریئر، وائرلیس، ڈیٹا، 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"‏WiFi، ‏Wi-Fi، کال، کال کرنا"</string>
     <string name="keywords_home" msgid="3626170808219458848">"لانچر"</string>
     <string name="keywords_display" msgid="8910345814565493016">"اسکرین، ٹچ اسکرین"</string>
@@ -2648,8 +2643,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"الرٹ"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"وائبریٹ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"آوازیں آن کریں"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"ڈسٹرب نہ کریں کی ترجیحات"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"صرف ترجیحی اجازتیں"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"خودکار اصول"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"ڈسٹرب نہ کریں شیڈول سیٹ کریں"</string>
@@ -2666,9 +2660,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"دفتری اطلاع کی ڈیفالٹ ٹون"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"دفتری الارم کی ڈیفالٹ رنگ ٹون"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ذاتی پروفائل کے جیسی"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"دفتری پروفائل کی آوازیں بدلیں؟"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"ذاتی پروفائل کی آوازیں استعمال کریں؟"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"بدلیں"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"آپ کی موجودہ دفتری پروفائل کی آوازیں آپ کی ذاتی پروفائل کی آوازوں سے تبدیل ہو جائیں گی۔"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"آپ کی موجودہ دفتری پروفائل کی آوازوں کی بجائے آپ کی ذاتی پروفائل کی آوازیں استعمال کی جائیں گی"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"رنگ ٹونز"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"دیگر آوازیں اور وائبریشنز"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"اطلاع کی ترجیحات"</string>
@@ -2904,11 +2898,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"کوئی اجازت عطا نہیں کی گئی"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"کسی اجازت کی درخواست نہیں کی گئی"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"سبھی ایپس"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"فعال"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"انسٹال کردہ ایپس"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"فوری ایپس"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ذاتی"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"دفتری"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"مسدود"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"‏ڈومین URLs کے ساتھ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"جدید ترین"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ایپس کنفیگر کریں"</string>
     <string name="unknown_app" msgid="5275921288718717656">"نامعلوم ایپ"</string>
@@ -2933,8 +2927,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"کام کیلئے ڈیفالٹ"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"معاون اور صوتی ان پٹ"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"معاون ایپ"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"کوئی نہیں"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"معاون ایپ منتخب کریں"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> کو اپنا معاون بنائیں؟"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"معاون آپ کے سسٹم پر زیر استعمال ایپس کے بارے میں معلومات پڑھ پائے گا، بشمول وہ معلومات جو آپ کی سکرین پر نظر آتی ہے یا ایپس کے اندر قابل رسائی ہے۔"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"متفق"</string>
@@ -2964,6 +2956,8 @@
     <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">"بیٹری بہترین بنانا"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"استعمال سے متعلق الرٹس"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"سبھی ایپس دکھائیں"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"اضافی ایپس چھپائیں"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"بہترین بنائی گئی نہیں ہیں"</string>
     <string name="high_power_on" msgid="6216293998227583810">"بہترین بنائی گئی نہیں ہیں"</string>
     <string name="high_power_off" msgid="3393904131961263278">"بیٹری استعمال کو بہترین بنا رہی ہے"</string>
@@ -3144,6 +3138,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"سرد رنگ کا درجہ حرارت"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ڈسپلے کیلئے سرد رنگ استعمال کریں"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"رنگ میں تبدیلی لاگو کرنے کیلئے اسکرین آف کریں"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"ٹیلیفونی مانیٹر کی تبدیلی لاگو کرنے کیلئے، آلہ ریبوٹ کریں"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"خودکار سسٹم اپ ڈیٹس"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"‏بائنڈرائز کردہ HALs (ریبوٹ درکار ہے)"</string>
     <string name="usage" msgid="2977875522080448986">"استعمال"</string>
@@ -3321,6 +3316,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"معاونت کا اشارہ"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3382,12 +3379,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏عالمی HTTP پراکسی سیٹ ہے"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"ایڈمن آلہ کو مقفل اور پاس ورڈ کو دوبارہ ترتیب دے سکتا ہے"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ایڈمن آلہ کے تمام ڈیٹا کو حذف کرسکتا ہے"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other"> منتظم نے آلہ کے تمام ڈیٹا کو حذف کرنے سے قبل پاس ورڈ درج کرنے کی زیادہ سے زیادہ کوششوں کی تعداد کو <xliff:g id="COUNT_1">%d</xliff:g> پر سیٹ کیا ہے</item>
+      <item quantity="one"> منتظم نے آلہ کے تمام ڈیٹا کو حذف کرنے سے قبل پاس ورڈ درج کرنے کی زیادہ سے زیادہ کوششوں کی تعداد کو <xliff:g id="COUNT_0">%d</xliff:g> پر سیٹ کیا ہے</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"یہ آلہ زیر انتظام ہے۔"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"یہ آلہ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> کے زیر انتظام ہے۔"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"مزید جانیں"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"تصاویر اور ویڈیوز"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"موسیقی اور آڈیو"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"گیمز"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"دیگر ایپس"</string>
     <string name="storage_files" msgid="8581083146777364063">"فائلز"</string>
@@ -3398,9 +3405,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"اسٹوریج مینیجر: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"آف"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"آن"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"گیمز"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"آڈیو فائلز"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"موسیقی"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(صارف کیلیے اَن انسٹال ہوگیا <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(صارف کے لیے غیر فعال ہوگیا <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"آٹو فل ایپ"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index b17a2e4..a681928 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Joylashuv"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hisoblar"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Xavfsizlik va ekran qulfi"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Shifrlash va hisob ma’lumotlari"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Joylashuv va xavfsizlik sozlamalari"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Mening joylashuvim, ekran qulfi, hisob ma‘lumotlari omborini qulflash sozlamalari"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Parollar"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Maxfiylik"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Administrator tomonidan o‘chirib qo‘yilgan"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Xavfsizlik holati"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Joylashuv, barmoq izi"</string>
@@ -1426,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Qurilmaning qulflash usulidan foydalanish"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Ilovalar boshqaruvi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"O‘rnatilgan ilovlarni boshqarish yoki o‘chirish"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Ilova haqida"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Ilovalarni boshqarish, tez ishga tushirish yorliqlarini sozlash"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ilova sozlamalari"</string>
     <string name="install_applications" msgid="4872012136210802181">"Noma’lum manbalar"</string>
@@ -1487,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Xotiradagi bo‘sh joy boshqaruvi"</string>
     <string name="filter" msgid="2018011724373033887">"Saralash"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filter moslamalarini tanlang"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Barcha ilovalar"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"O‘chiq"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Barcha ilovalar"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"O‘chirib qo‘yilgan ilovalar"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Yuklab olingan"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Ishlayotgan"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB xotira"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartada"</string>
     <string name="disabled" msgid="9206776641295849915">"O‘chiq"</string>
     <string name="not_installed" msgid="2797554494953450291">"Bu foyd-chi u-n o‘rnatilmagan"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"O‘rnatilgan"</string>
     <string name="no_applications" msgid="7336588977497084921">"Hech qanday ilova yo‘q."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Ichki xotira"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ichki xotira"</string>
@@ -1674,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Kiritish usullarini sozlash"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Sozlamalar"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Sozlamalar"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Faol matn kiritish usullari"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Tizimda mavjud tillar"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> sozlamalari"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Faol yozish usullarini tanlash"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekran klaviaturasi sozlamalari"</string>
@@ -1719,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekranda kattalashtirish xususiyatini avtomatik ravishda yangilash"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Bir ilovadan ikkinchisiga o‘tishda ekranda kattalashtirish xususiyatini yangilash"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Quvvat tugmasi qo‘n-ni tugatadi"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Parollarni talaffuz qilish"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Yirik sichqoncha kursori"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono audio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Ovoz ijro qilinayotganda kanallarni birlashtirish"</string>
@@ -1833,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"To‘liq quvvat olgandan beri sarflangan quvvat"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Ekrandan foydalanish"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Ekran sarfi"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobil tarmoqni tekshirish"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"To‘liq quvvat olgandan keyin ilovalardan foydalanish"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"To‘liq quvvat olgandan keyin qurilmadan foydalanish"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Quvvat manbaidan uzilganidan keyin sarflangan batareya quvvati"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Statistika tozalandan keyingi batareya sarfi"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Batareyada qolgan vaqt: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1923,9 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Orttirib hisoblangan quvvat sarfi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mA/s"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"%1$s ishlatildi"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s (jami quvvat)"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"To‘liq quvvat olgandan beri sarflangan quvvat"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Taxminiy qolgan vaqt"</string>
-    <string name="estimated_time_description" msgid="6722669204902760489">"Hisob-kitob ishlatilishiga qarab o‘zgarishi mumkin"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"To‘liq quvvat olish vaqti"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Hisob-kitob vaqti foydalanish intensivligiga qarab o‘zgarishi mumkin"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Quvvat manbaidan uzilganiga <xliff:g id="UNPLUGGED">%1$s</xliff:g> bo‘ldi"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quvvat manbaidan uzilganiga <xliff:g id="UNPLUGGED">%1$s</xliff:g> bo‘ldi"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Jami"</string>
@@ -2316,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Doim o‘chiq"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Bu ilova tomonidan qo‘llab-quvvatlanmaydi"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Faqat VPN orqali ulanishga ruxsat berish"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN aloqasi talab qilinsinmi?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Bloklash funksiyasi yoniq"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Bloklash funksiyasi o‘chiq"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Doimiy VPN tarmog‘ini tanlang: faqat ushbu tarmoqqa ulanganda trafik sarflanishiga ruxsat beriladi."</string>
@@ -2401,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Cheklangan profillar hisoblar qo‘sha olmaydilar"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Olib tashlash (<xliff:g id="USER_NAME">%1$s</xliff:g>)"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Qulflangan ekran sozlamalari"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Foydalanuvchilarni ekran qulfidan qo‘shish"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Yangi foydalanuvchi"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Yangi profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Profilingiz o‘chirilsinmi?"</string>
@@ -2430,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefon qo‘ng‘iroqlari va SMS yoqilsinmi?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Qo‘ng‘iroq va SMS xabarlar tarixi ushbu foydalanuvchiga ham ko‘rinadi."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Favqulodda vaziyatlar uchun axborot"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g> haqida ma’lumot"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> uchun ma’lumot va kontaktlar"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Ilovalar va kontentga ruxsat berish"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Cheklovlar o‘rnatilgan ilovalar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ilovalar uchun sozlamalarni kengaytirish"</string>
@@ -2550,8 +2552,8 @@
       <item quantity="other">%d ta yashirin elementni ko‘rsatish</item>
       <item quantity="one">%d ta yashirin elementni ko‘rsatish</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Tarmoq va Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, mobil internet, internet sarfi, hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Tarmoq va Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, trafik sarfi, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Ulangan qurilmalar"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, translatsiya"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Ilova va bildirishnomalar"</string>
@@ -2567,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Qidiruv natijalari"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, tarmoq, aloqa"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, matnli xabar, xabarlar, xabarlashuv"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"uyali, uyali aloqa operatori, simsiz internet, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobil, mobil aloqa operatori, simsiz, internet, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, qi-fi, qo‘ng‘iroq, qo‘ng‘iroq qilish"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ishga tushirish paneli"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, sensorli ekran"</string>
@@ -2643,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Signal"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Tebranish"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Ovozni yoqish"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Bezovta qilinmasin sozlamalari"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Faqat muhimlari"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Avtomatik qoidalar"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"“Bezovta qilinmasin” rejimi"</string>
@@ -2661,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Ishchi bildirishnomalar signali"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Standart ishchi signal ringtoni"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Shaxsiy profilniki bilan bir xil"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Ishchi ovozlar almashtirilsinmi?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Shaxsiy profil ovozlaridan foydalanilsinmi?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Almashtirish"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Joriy ishchi profil ovozlari shaxsiy profil ovozlari bilan almashtiriladi"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Joriy ishchi profil ovozlari o‘rniga shaxsiy profil ovozlaridan foydalaniladi"</string>
     <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="7447797716856573587">"Bildirishnoma sozlamalari"</string>
@@ -2899,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Hech qanday ruxsat berilmagan"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Hech qanday ruxsat so‘ralmagan"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Barcha ilovalar"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Faol"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"O‘rnatilgan ilovalar"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Darhol ochiladigan ilovalar"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Shaxsiy"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Ishga oid"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloklangan"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domen havolalari bilan"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Qo‘shimcha sozlamalar"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Ilovalarni sozlash"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Noma’lum ilova"</string>
@@ -2928,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Ish uchun birlamchi"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Interaktiv yordamchilar"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Yordamchi ilova"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Yo‘q"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Yordamchi ilovani tanlang"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> yordamchi ilova etib tayinlansinmi?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Yordamchi ilova tizimda ishlatilayotgan ilovalar haqidagi ma’lumotlarni, masalan, ekranda ko‘rinib turgan yoki ilovalar orqali kiriladigan ma’lumotlarni o‘qiy oladi."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Roziman"</string>
@@ -2959,6 +2958,8 @@
     <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">"Batareya cheklovlari"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Quvvat sarfiga oid bildirgilar"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Barcha ilovalarni ko‘rsatish"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Qo‘shimcha ilovalarni berkitish"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Cheklov o‘rnatilmagan"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Cheklov o‘rnatilmagan"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Batareya cheklovi o‘rnatilgan"</string>
@@ -3139,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Salqin rang harorati"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Salqin displey ranglaridan foydalanish"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rangni o‘zgartirish uchun ekranni o‘chiring"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefoniya nazoratiga o‘zgartirish kiritish uchun qurilmani o‘chirib yoqing"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Avtomatik tizim yangilanishlari"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (o‘chirib yoqish shart)"</string>
     <string name="usage" msgid="2977875522080448986">"Trafik sarfi"</string>
@@ -3316,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Bildirishnomalarni ko‘rish uchun telefon orqasida joylashgan barmoq izi skanerida barmog‘ingizni pastga suring."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Bildirishnomalarni ko‘rish uchun planshet orqasida joylashgan barmoq izi skanerida barmog‘ingizni pastga suring."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Bildirishnomalarni ko‘rish uchun qurilma orqasida joylashgan barmoq izi skanerida barmog‘ingizni pastga suring."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Qo‘shimcha ishora"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3377,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proksi-serveri sozlandi"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Administrator qurilmani qulflashi va parolni o‘zgartirishi mumkin"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator barcha qurilma ma’lumotlarini o‘chirib tashlashi mumkin"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Administrator <xliff:g id="COUNT_1">%d</xliff:g> marta parol xato terilganda qurilmadagi barcha ma’lumotlar o‘chib ketadigan qilib sozlagan</item>
+      <item quantity="one">Administrator <xliff:g id="COUNT_0">%d</xliff:g> marta parol xato terilganda qurilmadagi barcha ma’lumotlar o‘chib ketadigan qilib sozlagan</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Administrator <xliff:g id="COUNT_1">%d</xliff:g> marta parol xato terilganda ishchi profil ma’lumotlari o‘chib ketadigan qilib sozlagan</item>
+      <item quantity="one">Administrator <xliff:g id="COUNT_0">%d</xliff:g> marta parol xato terilganda ishchi profil ma’lumotlari o‘chib ketadigan qilib sozlagan</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Bu – boshqariladigan qurilma."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Bu – <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tomonidan boshqariladigan qurilma."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Batafsil"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Surat va videolar"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Musiqa va audio"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"O‘yinlar"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Boshqa ilovalar"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fayllar"</string>
@@ -3393,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Xotira menejeri: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"O‘chiq"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Yoniq"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"O‘yinlar"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio fayllar"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Musiqa"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> uchun o‘chirilgan)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> uchun o‘chirib qo‘yilgan)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Avtomatik to‘ldirish uchun ilova"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d6475bc..3daed96 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Vị trí"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Tài khoản"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Bảo mật và khóa màn hình"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Mã hóa và thông tin đăng nhập"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Đặt Vị trí của tôi, mở khóa màn hình, khóa bộ nhớ thông tin xác thực"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Mật khẩu"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Bảo mật"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Bị tắt bởi quản trị viên"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Trạng thái bảo mật"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Vị trí, tệp tham chiếu"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Chọn Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Đang bật Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Đang tắt Wi‑Fi…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Xem tất cả các mạng"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Lỗi"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Băng tần 5 GHz không khả dụng ở quốc gia này"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Ở chế độ trên máy bay"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Truy cập Internet qua Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Đang dùng làm điểm truy cập Internet"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"Điểm phát sóng &amp; c.sẻ k.nối"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Điểm phát sóng bật, chia sẻ kết nối"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Điểm phát sóng bật"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Chia sẻ kết nối"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Không thể chia sẻ kết nối hoặc sử dụng điểm phát sóng di động khi Trình tiết kiệm dữ liệu đang bật"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Truy cập Internet qua USB"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Giống như khóa màn hình thiết bị"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Quản lý ứng dụng"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Quản lý và xóa ứng dụng đã cài đặt"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Thông tin ứng dụng"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Quản lý ứng dụng, thiết lập lối tắt chạy nhanh"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Cài đặt ứng dụng"</string>
     <string name="install_applications" msgid="4872012136210802181">"Không rõ nguồn gốc"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Quản lý dung lượng"</string>
     <string name="filter" msgid="2018011724373033887">"Bộ lọc"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Chọn tùy chọn bộ lọc"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Tất cả"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Đã tắt"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Tất cả ứng dụng"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Ứng dụng bị tắt"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Đã tải xuống"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Đang hoạt động"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Bộ nhớ USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Trên thẻ SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Đã tắt"</string>
     <string name="not_installed" msgid="2797554494953450291">"Chưa c.đặt cho người dùng này"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Đã cài đặt"</string>
     <string name="no_applications" msgid="7336588977497084921">"Không có ứng dụng nào."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Bộ nhớ trong"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"bộ nhớ trong"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Thiết lập phương thức nhập"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Cài đặt"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Cài đặt"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Phương pháp nhập liệu hoạt động"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Sử dụng ngôn ngữ hệ thống"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Cài đặt <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Chọn ph.thức nhập đang hoạt động"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Cài đặt bàn phím ảo"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Tự động cập nhật phóng đại màn hình"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Cập nhật phóng đại màn hình khi chuyển ứng dụng"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Nút nguồn kết thúc cuộc gọi"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Nói mật khẩu"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Trỏ chuột lớn"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Âm thanh đơn âm"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kết hợp kênh khi phát âm thanh"</string>
@@ -1837,7 +1829,11 @@
     <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> còn lại"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> để tính phí"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Sử dụng kể từ lần sạc đầy cuối cùng"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Mức sử dụng của màn hình"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Mức tiêu thụ của màn hình"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Quét mạng di động"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Mức sử dụng ứng dụng kể từ lần sạc đầy pin sau cùng"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Mức sử dụng thiết bị kể từ lần sạc đầy pin sau cùng"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Sử dụng pin từ khi tháo đầu cắm"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sử dụng pin từ khi đặt lại"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> trong thời lượng pin"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sử dụng nguồn vượt mức"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Đã sử dụng trong %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s trong tổng số pin"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Chi tiết sử dụng từ lần sạc đầy cuối cùng"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"Thời gian còn lại ước tính"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Thời gian để sạc đầy"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"Thời gian ước tính có thể thay đổi tùy theo mức sử dụng"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> từ khi tháo đầu cắm"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Trong khi tháo đầu cắm lần cuối cho <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Tổng số sử dụng"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Luôn bật không hoạt động"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Không được ứng dụng này hỗ trợ"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Chỉ cho phép các kết nối qua VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Yêu cầu kết nối VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Khóa đang hoạt động"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Khóa không hoạt động"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Chọn một cấu hình VPN để luôn giữ kết nối. Lưu lượng truy cập mạng sẽ chỉ được cho phép khi kết nối với VPN này."</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Các tiểu sử bị hạn chế không thể thêm tài khoản"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Xóa <xliff:g id="USER_NAME">%1$s</xliff:g> khỏi thiết bị"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Cài đặt màn hình khóa"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Thêm người dùng từ màn hình khóa"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Người dùng mới"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Tiểu sử mới"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Xóa chính bạn?"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Bạn muốn bật cuộc gọi điện thoại và SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Nhật ký cuộc gọi và tin nhắn SMS sẽ được chia sẻ với người dùng này."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Thông tin khẩn cấp"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Thông tin về <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Thông tin &amp; liên hệ cho <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Cho phép ứng dụng và nội dung"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Ứng dụng có hạn chế"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Mở rộng cài đặt cho ứng dụng"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">Hiển thị %d mục ẩn</item>
       <item quantity="one">Hiển thị %d mục ẩn</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Mạng và Internet"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi, di động, sử dụng dữ liệu, điểm phát sóng"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Mạng và Internet"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, thiết bị di động, mức sử dụng dữ liệu, điểm phát sóng"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Thiết bị đã kết nối"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"Bluetooth, NFC, truyền"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Ứng dụng và thông báo"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"Người dùng và tài khoản"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Ứng dụng mặc định"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Ngôn ngữ, sao lưu, cập nhật, giới thiệu về điện thoại"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Ngôn ngữ, sao lưu, cập nhật, giới thiệu về thiết bị"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Cài đặt"</string>
     <string name="search_menu" msgid="6283419262313758339">"Cài đặt tìm kiếm"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Cài đặt tìm kiếm"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Kết quả"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, kết nối mạng"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tin nhắn văn bản, nhắn tin, tin nhắn, nhắn"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"di động, nhà cung cấp dịch vụ di động, không dây, dữ liệu, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"di động, thiết bị di động, nhà cung cấp dịch vụ di động, không dây, dữ liệu, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, gọi, gọi điện"</string>
     <string name="keywords_home" msgid="3626170808219458848">"trình chạy"</string>
     <string name="keywords_display" msgid="8910345814565493016">"màn hình, màn hình cảm ứng"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Thông báo"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Rung"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Âm thanh bật nguồn"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Tùy chọn không làm phiền"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Chỉ cho phép ưu tiên"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Quy tắc tự động"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Đặt lịch biểu Không làm phiền"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Chuông báo công việc mặc định"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Chuông báo công việc mặc định"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Giống như hồ sơ cá nhân"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Thay thế âm thanh hồ sơ công việc?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Sử dụng âm thanh hồ sơ cá nhân?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Thay thế"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Âm thanh hồ sơ công việc hiện tại của bạn sẽ được thay thế bằng âm thanh hồ sơ cá nhân của bạn"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Âm thanh hồ sơ cá nhân của bạn sẽ được sử dụng thay vì âm thanh hồ sơ công việc hiện tại của bạn"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Nhạc chuông"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Âm thanh khác và rung"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Tùy chọn thông báo"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Chưa được cấp quyền nào"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Không yêu cầu quyền"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Tất cả ứng dụng"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Đã bật"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Ứng dụng đã cài đặt"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Ứng dụng tức thì"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Cá nhân"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Cơ quan"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Đã chặn"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Có URL miền"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Nâng cao"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Định cấu hình ứng dụng"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ứng dụng không xác định"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Mặc định cho công việc"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Trợ lý và nhập liệu"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Ứng dụng trợ lý"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Không có"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Chọn ứng dụng Trợ lý"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Đặt <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> làm trợ lý của bạn?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Trợ lý sẽ có thể đọc thông tin về ứng dụng đang được sử dụng trên hệ thống của bạn, bao gồm thông tin hiển thị trên màn hình của bạn hoặc thông tin có thể truy cập trong ứng dụng."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Đồng ý"</string>
@@ -2966,6 +2958,8 @@
     <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">"Tối ưu hóa pin"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Thông báo về mức sử dụng"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Hiển thị tất cả các ứng dụng"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Ẩn ứng dụng bổ sung"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Không được tối ưu hóa"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Không được tối ưu hóa"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Tối ưu hóa mức sử dụng pin"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Nhiệt độ màu lạnh"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sử dụng màu hiển thị lạnh hơn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Để áp dụng thay đổi màu, hãy tắt màn hình"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Để áp dụng thay đổi với giám sát điện thoại, hãy khởi động lại thiết bị"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Cập nhật hệ thống tự động"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"HAL được liên kết (yêu cầu khởi động lại)"</string>
     <string name="usage" msgid="2977875522080448986">"Sử dụng"</string>
@@ -3323,6 +3318,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Để kiểm tra thông báo của bạn, hãy vuốt xuống từ cảm biến vân tay trên mặt sau của điện thoại."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Để kiểm tra thông báo của bạn, hãy vuốt xuống từ cảm biến vân tay trên mặt sau của máy tính bảng."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Để kiểm tra thông báo của bạn, hãy vuốt xuống từ cảm biến vân tay trên mặt sau của thiết bị."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Cử chỉ hỗ trợ"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Bật"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Tắt"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Đã mở khóa trình khởi động"</string>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Đặt proxy HTTP chung"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Quản trị viên có thể khóa thiết bị và đặt lại mật khẩu"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Quản trị viên có thể xóa tất cả dữ liệu thiết bị"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">Quản trị viên đã đặt số lần nhập mật khẩu tối đa thành <xliff:g id="COUNT_1">%d</xliff:g> trước khi xóa tất cả dữ liệu trên thiết bị</item>
+      <item quantity="one">Quản trị viên đã đặt số lần nhập mật khẩu tối đa thành <xliff:g id="COUNT_0">%d</xliff:g> trước khi xóa tất cả dữ liệu trên thiết bị</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">Quản trị viên đã đặt số lần nhập mật khẩu tối đa thành <xliff:g id="COUNT_1">%d</xliff:g> trước khi xóa dữ liệu hồ sơ công việc</item>
+      <item quantity="one">Quản trị viên đã đặt số lần nhập mật khẩu tối đa thành <xliff:g id="COUNT_0">%d</xliff:g> trước khi xóa dữ liệu hồ sơ công việc</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Thiết bị này được quản lý."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Thiết bị này được <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> quản lý."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Tìm hiểu thêm"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Ảnh và video"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Nhạc và âm thanh"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Trò chơi"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ứng dụng khác"</string>
     <string name="storage_files" msgid="8581083146777364063">"Tệp"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Trình quản lý bộ nhớ: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Tắt"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Bật"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Trò chơi"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Tệp âm thanh"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Nhạc"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(gỡ cài đặt cho người dùng <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(đã tắt cho người dùng <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Ứng dụng tự động điền"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3c7a219..d57906e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"位置信息"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帐号"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"安全性与屏幕锁定"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密与凭据"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"密码"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"隐私设置"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"已被管理员停用"</string>
     <string name="security_status_title" msgid="5848766673665944640">"安全状态"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"位置信息、指纹"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"选择WLAN网络"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"正在打开WLAN…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"正在关闭WLAN…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"查看所有网络"</string>
     <string name="wifi_error" msgid="3207971103917128179">"出错"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"在此国家/地区无法使用 5 GHz 频段"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"正处于飞行模式下"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"蓝牙网络共享"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"网络共享"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"热点与网络共享"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"已开启热点、网络共享"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"已开启热点"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"网络共享"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"当流量节省程序开启时，无法使用网络共享功能或便携式热点"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB网络共享"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"与设备的屏幕锁定方式相同"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理应用"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和删除已安装的应用"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"应用信息"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"管理应用、设置快速启动快捷方式"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"应用设置"</string>
     <string name="install_applications" msgid="4872012136210802181">"未知来源"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"管理空间"</string>
     <string name="filter" msgid="2018011724373033887">"过滤"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"选择过滤选项"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"全部"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"已停用"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"所有应用"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"已停用的应用"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下载"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"正在运行"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB存储设备"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD卡中"</string>
     <string name="disabled" msgid="9206776641295849915">"已停用"</string>
     <string name="not_installed" msgid="2797554494953450291">"未针对此用户安装"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"已安装"</string>
     <string name="no_applications" msgid="7336588977497084921">"无应用。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"内部存储空间"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"内部存储设备"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"设置输入法"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"设置"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"设置"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"有效的输入法"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"使用系统语言"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 设置"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"选择有效的输入法"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"屏幕键盘设置"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"自动更新屏幕放大状态"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"在应用转换时更新屏幕放大状态"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"按电源按钮结束通话"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"说出密码"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"大号鼠标指针"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"单声道音频"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"播放音频时合并声道"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"上次充满后的电量使用情况"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"屏幕开启时间"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"屏幕耗电量"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"移动网络扫描"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"自上次充满电后的应用用电量"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"自上次充满电后的设备用电量"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔下电源后的电量消耗情况"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重置后的电量消耗情况"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"电池已用时间：<xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"多算了的用电量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>毫安时"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"已使用 %1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"耗用整体电量的 %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"自上次充满电后的详细用量信息"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"预计剩余时间"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"距离充满电的时间"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"预计时间可能会因使用情况而有所改变"</string>
     <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>
@@ -1942,7 +1938,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"省电模式"</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>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"电量剩余 <xliff:g id="PERCENT">%1$s</xliff:g> 时"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"进程统计信息"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"运行中进程的相关技术统计信息"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"内存用量"</string>
@@ -2019,7 +2015,7 @@
     <string name="gadget_brightness_state_half" msgid="3696671957608774204">"一半"</string>
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"关闭"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
-    <string name="credentials_title" msgid="4446234003860769883">"凭据存储"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"凭据存储空间"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"从存储设备安装"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"从SD卡安装"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"从存储设备安装证书"</string>
@@ -2322,6 +2318,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"“始终开启”功能已停用"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"此应用不支持这项功能"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"只允许通过 VPN 进行连接"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"需要连接 VPN？"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"已启用锁定设置"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"已停用锁定设置"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"选择要始终保持连接的VPN配置文件。只有在连接到此VPN之后才可以使用网络。"</string>
@@ -2407,8 +2404,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"受限个人资料无法添加帐号"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"将<xliff:g id="USER_NAME">%1$s</xliff:g>从此设备中删除"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"锁定屏幕设置"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"从锁定屏幕添加用户"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新用户"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"新的个人资料"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"是否删除自己？"</string>
@@ -2436,7 +2432,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"要开启通话和短信功能吗？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"将与此用户共享通话记录和短信记录。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"急救信息"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"关于<xliff:g id="USER_NAME">%1$s</xliff:g>的信息"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>的相关信息和联系方式"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"允许应用和内容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限应用"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展开应用设置"</string>
@@ -2556,8 +2552,8 @@
       <item quantity="other">显示 %d 项隐藏内容</item>
       <item quantity="one">显示 %d 项隐藏内容</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"网络和互联网"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"WLAN、移动网络、流量消耗、热点"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"网络和互联网"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"WLAN、移动、流量消耗、热点"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已关联的设备"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"蓝牙、NFC、投射"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"应用和通知"</string>
@@ -2565,8 +2561,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"用户和帐号"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"默认应用"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"语言、备份、更新、关于手机"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"语言、备份、更新、关于设备"</string>
     <string name="search_results_title" msgid="1796252422574886932">"设置"</string>
     <string name="search_menu" msgid="6283419262313758339">"搜索设置"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"搜索设置"</string>
@@ -2574,7 +2569,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"搜索结果"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"Wi-Fi, WLAN, 网络连接"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"短信, 信息, 发短信, 消息, 发送消息"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"移动网络, 手机运营商, 无线, 数据网络, 4G, 3G, 2G, LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"移动网络, 移动, 手机运营商, 无线, 数据, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"Wi-Fi, WLAN, 呼叫, 通话"</string>
     <string name="keywords_home" msgid="3626170808219458848">"启动器 桌面"</string>
     <string name="keywords_display" msgid="8910345814565493016">"屏幕, 触摸屏"</string>
@@ -2650,8 +2645,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"警示音"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"振动"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"开机音效"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"“勿扰”偏好设置"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"仅允许优先打扰内容"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自动规则"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"设置“勿扰”时间安排"</string>
@@ -2668,9 +2662,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"默认工作通知铃声"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"默认工作闹钟铃声"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"与个人资料相同"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"要替换工作资料提示音吗？"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"要使用个人资料提示音吗？"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"替换"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"系统将使用您的个人资料提示音替换您当前的工作资料提示音"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"系统将使用您的个人资料提示音，而不是您当前的工作资料提示音"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"铃声"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"其他提示音和振动"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"通知偏好设置"</string>
@@ -2906,11 +2900,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"未授予任何权限"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"未请求任何权限"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"所有应用"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"已启用"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"已安装的应用"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"免安装应用"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"个人应用"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"工作应用"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已屏蔽"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"包含网域网址"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"高级"</string>
     <string name="configure_apps" msgid="6685680790825882528">"配置应用"</string>
     <string name="unknown_app" msgid="5275921288718717656">"未知应用"</string>
@@ -2935,8 +2929,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"默认工作应用"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"辅助应用和语音输入"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"辅助应用"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"无"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"选择辅助应用"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"要将<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>设为您的辅助应用吗？"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"辅助应用将可读取您系统中使用的应用的相关信息，其中包括您屏幕上显示的信息或应用中可使用的信息。"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"同意"</string>
@@ -2966,6 +2958,8 @@
     <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">"电池优化"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"电池用量提醒"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"显示所有应用"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"隐藏其他应用"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"未优化"</string>
     <string name="high_power_on" msgid="6216293998227583810">"未优化"</string>
     <string name="high_power_off" msgid="3393904131961263278">"优化电池使用"</string>
@@ -3146,6 +3140,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"冷色温"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用较冷的显示颜色"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"要应用颜色更改，请关闭屏幕"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"要应用电话监控器的变更内容，请重新启动设备"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自动系统更新"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"绑定式 HAL（需要重新启动）"</string>
     <string name="usage" msgid="2977875522080448986">"流量消耗"</string>
@@ -3323,6 +3318,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"辅助手势"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3384,12 +3381,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已设置全局 HTTP 代理"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"管理员可以锁定设备和重置密码"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"管理员可以删除所有设备数据"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">管理员已将密码尝试次数上限设为 <xliff:g id="COUNT_1">%d</xliff:g> 次（超过此上限将删除所有设备数据）</item>
+      <item quantity="one">管理员已将密码尝试次数上限设为 <xliff:g id="COUNT_0">%d</xliff:g> 次（超过此上限将删除所有设备数据）</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"此设备为受管理设备。"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"此设备由“<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>”管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"了解详情"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"照片和视频"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"音乐和音频"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"游戏"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"其他应用"</string>
     <string name="storage_files" msgid="8581083146777364063">"文件"</string>
@@ -3400,9 +3407,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"存储空间管理器：<xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"关闭"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"开启"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"游戏"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音频文件"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"音乐"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"（已为用户<xliff:g id="USER">%s</xliff:g>卸载）"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"（已为用户<xliff:g id="USER">%s</xliff:g>停用）"</string>
     <string name="autofill_app" msgid="3889348218462883960">"自动填充应用"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index d7a04f4..6f79f99 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"位置"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"安全性和螢幕鎖定"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密和憑證"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、螢幕解鎖及認證儲存空間鎖定"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"私隱權"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"已由管理員停用"</string>
     <string name="security_status_title" msgid="5848766673665944640">"安全性狀態"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"位置、指紋"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"選取 Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"正在開啟 Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"正在關閉 Wi-Fi…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"查看所有網絡"</string>
     <string name="wifi_error" msgid="3207971103917128179">"錯誤"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"此國家/地區無法使用 5 GHz 頻譜"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"處於飛行模式"</string>
@@ -1262,12 +1262,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"藍牙網絡共享"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"網絡共享"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"熱點和網絡共享"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"已開啟熱點和網絡共享功能"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"已開啟熱點"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"已開啟網絡共享功能"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"啟用數據節省程式時，無法使用網絡共享功能或便攜熱點。"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 網絡共享"</string>
@@ -1431,8 +1428,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"與裝置的螢幕鎖定相同"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理應用程式"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理及移除已安裝的應用程式"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"應用程式資訊"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"管理應用程式，設定快速啟動鍵"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"應用程式設定"</string>
     <string name="install_applications" msgid="4872012136210802181">"不明來源"</string>
@@ -1492,16 +1488,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"管理空間"</string>
     <string name="filter" msgid="2018011724373033887">"篩選"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"選擇篩選選項"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"所有影片"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"已停用"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"所有應用程式"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"已停用的應用程式"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下載"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"執行中"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 儲存裝置"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"於 SD 卡"</string>
     <string name="disabled" msgid="9206776641295849915">"已停用"</string>
     <string name="not_installed" msgid="2797554494953450291">"沒有為此使用者安裝"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"已安裝"</string>
     <string name="no_applications" msgid="7336588977497084921">"沒有應用程式。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"內部儲存空間"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"內部儲存空間"</string>
@@ -1679,8 +1674,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"設定輸入法"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"設定"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"設定"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"可用的輸入法"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"使用系統語言"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 設定"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"選擇啟用的輸入法"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"螢幕鍵盤設定"</string>
@@ -1724,7 +1717,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"自動更新螢幕放大設定"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"在應用程式轉場時更新螢幕放大設定"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"電源鍵可結束通話"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"朗讀密碼"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"大型滑鼠游標"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"單聲道音訊"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"播放音訊時合併聲道"</string>
@@ -1838,7 +1830,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"上次完成充電後的使用情況"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"螢幕使用情況"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"流動網絡掃瞄"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"上次完全充電後的應用程式使用情況"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"上次完全充電後的裝置使用情況"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重設後的電池使用狀況"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"電池電力剩餘時間：<xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1928,11 +1924,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"計算過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"已使用時間：%1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"整體電量的 %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"上次完全充電後的使用情況分析"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"估計剩餘時間"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"完全充電的剩餘所需時間"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"視乎使用情況而定，估計時間可能有所變動"</string>
     <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>
@@ -2325,6 +2321,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"「永遠開啟」已停用"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"此應用程式不支援這項功能"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"只允許透過 VPN 連線"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"需要 VPN 連線嗎？"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"強制使用 VPN"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"不強制使用 VPN"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"選取要永久保持連線的 VPN 設定檔。只在連線至這個 VPN 時才允許網絡流量。"</string>
@@ -2410,8 +2407,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"限制存取的個人檔案無法新增帳戶"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"將 <xliff:g id="USER_NAME">%1$s</xliff:g> 從這部裝置中刪除"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"上鎖畫面設定"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"在螢幕鎖定中加入使用者"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新使用者"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"新個人檔案"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"您要刪除自己嗎？"</string>
@@ -2439,7 +2435,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"開啟手機通話和短訊？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話和短訊記錄都會與這位使用者分享。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"緊急資料"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g>的相關資訊"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>的相關資訊和聯絡資料"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受到限制的應用程式"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
@@ -2559,8 +2555,8 @@
       <item quantity="other">顯示 %d 個隱藏項目</item>
       <item quantity="one">顯示 %d 個隱藏項目</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"網絡和互聯網"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi、流動數據、數據用量、熱點"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"網絡和互聯網"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi、流動裝置、數據用量、熱點"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已連結的裝置"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"藍牙、NFC、投放"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"應用程式和通知"</string>
@@ -2568,8 +2564,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"使用者和帳戶"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"預設應用程式"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"語言、備份、更新、關於手機"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"語言、備份、更新、關於裝置"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
     <string name="search_menu" msgid="6283419262313758339">"搜尋設定"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"搜尋設定"</string>
@@ -2577,7 +2572,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"搜尋結果"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"WiFi, Wi-Fi, 網絡連線"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"短訊, 發短訊, 訊息, 傳送短訊"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"流動網絡, 流動網絡供應商, 無線, 網絡數據, 4G, 3G, 2G, LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"流動網絡, 流動裝置, 流動網絡供應商, 無線, 數據, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"WiFi, Wi-Fi, 通話, 撥號中"</string>
     <string name="keywords_home" msgid="3626170808219458848">"應用程式啟動器"</string>
     <string name="keywords_display" msgid="8910345814565493016">"螢幕, 觸控螢幕"</string>
@@ -2653,8 +2648,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"警示"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"震動"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"開機聲音"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"請勿騷擾偏好設定"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"優先設定只允許："</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動規則"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"設定「請勿騷擾」日程表"</string>
@@ -2671,9 +2665,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"預設工作通知音"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"預設工作鬧鐘鈴聲"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"與個人設定檔相同"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"要取代工作設定檔聲音嗎？"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"要使用個人設定檔音效嗎？"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"取代"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"目前的工作設定檔聲音會以個人設定檔聲音取代"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"系統將不再使用目前的工作設定檔音效，並改為使用個人設定檔音效"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"鈴聲"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"其他音效和震動"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"通知偏好設定"</string>
@@ -2909,11 +2903,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"沒有授予權限"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"沒有要求權限"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"所有應用程式"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"已啟用"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"已安裝的應用程式"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"即時應用程式"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"工作"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已封鎖"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"使用網域網址"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="configure_apps" msgid="6685680790825882528">"設定應用程式"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明應用程式"</string>
@@ -2938,8 +2932,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"預設工作設定"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"輔助及語音輸入"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"輔助應用程式"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"無"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"選擇輔助應用程式"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"讓 <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> 成為您的小幫手？"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"這個小幫手將能讀取系統目前使用的應用程式資料，包括螢幕顯示的資料或可在應用程式中存取的資料。"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"同意"</string>
@@ -2969,6 +2961,8 @@
     <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">"電池優化"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"電量警示"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"顯示所有應用程式"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"隱藏其他應用程式"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"尚未優化"</string>
     <string name="high_power_on" msgid="6216293998227583810">"尚未優化"</string>
     <string name="high_power_off" msgid="3393904131961263278">"正在優化電池使用"</string>
@@ -3149,6 +3143,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"冷色色溫"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器顏色"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"如要套用色溫變更，請先關閉螢幕"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"如要套用「電話監控工具」的變更內容，請重新啟動裝置"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動系統更新"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (需要重新啟動)"</string>
     <string name="usage" msgid="2977875522080448986">"用量"</string>
@@ -3326,6 +3321,8 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"輔助手勢"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
@@ -3387,12 +3384,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已設定全域 HTTP Proxy"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"管理員可以鎖定裝置和重設密碼"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"管理員可以刪除所有裝置資料"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">管理員已將輸入密碼的次數上限設為 <xliff:g id="COUNT_1">%d</xliff:g> 次。如果超出此上限，系統將刪除所有裝置資料</item>
+      <item quantity="one">管理員已將輸入密碼的次數上限設為 <xliff:g id="COUNT_0">%d</xliff:g> 次。如果超出此上限，系統將刪除所有裝置資料</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <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="do_disclosure_generic" msgid="5666469247267523806">"此裝置已受管理。"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"此裝置由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"瞭解詳情"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"相片和影片"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"音樂和音訊"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"遊戲"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"其他應用程式"</string>
     <string name="storage_files" msgid="8581083146777364063">"檔案"</string>
@@ -3403,9 +3410,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"儲存空間管理員：<xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"關閉"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"開啟"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"遊戲"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音訊檔案"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"音樂"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(已為使用者 (<xliff:g id="USER">%s</xliff:g>) 解除安裝)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(已為使用者 (<xliff:g id="USER">%s</xliff:g>) 停用)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"自動填入應用程式"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9d5c096..63dbfdc 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"定位"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"安全性與螢幕鎖定"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密和憑證"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"隱私權"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"已由管理員停用"</string>
     <string name="security_status_title" msgid="5848766673665944640">"安全性狀態"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"定位、指紋"</string>
@@ -669,8 +670,7 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"選取 Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"正在開啟 Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"正在關閉 Wi-Fi…"</string>
-    <!-- no translation found for wifi_see_all_networks_button_title (2463270265855243076) -->
-    <skip />
+    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"查看所有網路"</string>
     <string name="wifi_error" msgid="3207971103917128179">"錯誤"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz 頻帶在這個國家/地區不受支援"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"處於飛行模式時"</string>
@@ -867,7 +867,7 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"開啟 Wi-Fi 通話功能之後，您的手機可依據您的偏好設定，透過 Wi-Fi 網路或您的行動通訊網路通話 (選擇訊號較強者)。開啟這項功能前，請先與您的行動通訊業者詢問費用與其他細節。"</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"開啟 Wi-Fi 通話功能之後，您的手機可依據您的偏好設定，透過 Wi-Fi 網路或您的行動通訊網路通話 (選擇訊號較強者)。開啟這項功能前，請先與您的電信業者詢問費用與其他細節。"</string>
     <string name="emergency_address_title" msgid="3571902448699714454">"更新緊急地址"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"如果您使用 Wi-Fi 撥打 119，緊急服務會判定您位在這個地址"</string>
     <string name="home_settings" msgid="212375129455718176">"主螢幕"</string>
@@ -1005,10 +1005,10 @@
     <string name="sim_change_data_message" msgid="1313940695939674633">"要將行動數據連線 SIM 卡從「<xliff:g id="OLD_SIM">%2$s</xliff:g>」改為「<xliff:g id="NEW_SIM">%1$s</xliff:g>」嗎？"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"更新慣用的 SIM 卡？"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"「<xliff:g id="NEW_SIM">%1$s</xliff:g>」是裝置中唯一的 SIM 卡。您要使用這張 SIM 卡連線到行動網路、通話及傳送簡訊嗎？"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM 卡的 PIN 碼輸入錯誤，您現在必須請行動通訊業者為裝置解鎖。"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM 卡的 PIN 碼輸入錯誤，您現在必須請電信業者為裝置解鎖。"</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
       <item quantity="other">SIM 卡的 PIN 碼輸入錯誤，您還可以再試 <xliff:g id="NUMBER_1">%d</xliff:g> 次。</item>
-      <item quantity="one">SIM 卡的 PIN 碼輸入錯誤，您還可以再試 <xliff:g id="NUMBER_0">%d</xliff:g> 次。如果仍然失敗，就必須請行動通訊業者為裝置解鎖。</item>
+      <item quantity="one">SIM 卡的 PIN 碼輸入錯誤，您還可以再試 <xliff:g id="NUMBER_0">%d</xliff:g> 次。如果仍然失敗，就必須請電信業者為裝置解鎖。</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM 卡 PIN 碼解鎖失敗！"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板電腦狀態"</string>
@@ -1041,7 +1041,7 @@
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="952552009117455166">"行動網路類型"</string>
-    <string name="status_latest_area_info" msgid="7222470836568238054">"行動通訊業者資訊"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"電信業者資訊"</string>
     <string name="status_data_state" msgid="4578972321533789767">"行動網路狀態"</string>
     <string name="status_service_state" msgid="2323931627519429503">"服務狀態"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"訊號強度"</string>
@@ -1261,12 +1261,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"藍牙網路共用"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"網路共用"</string>
     <string name="tether_settings_title_all" msgid="3216237959149430007">"無線基地台與網路共用"</string>
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_on (930464462687425777) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_on_tether_off (3473671453891735907) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_hotspot_off_tether_on (1618256180720077354) -->
-    <skip />
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"已開啟無線基地台和網路共用"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"已開啟無線基地台"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"已開啟網路共用"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"在數據節省模式開啟的狀態下，無法進行數據連線或使用可攜式無線基地台"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 網路共用"</string>
@@ -1299,7 +1296,7 @@
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"變更 Wi‑Fi Assistant？"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"改以「<xliff:g id="NEW_APP">%1$s</xliff:g>」取代「<xliff:g id="CURRENT_APP">%2$s</xliff:g>」管理您的網路連線？"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"使用「<xliff:g id="NEW_APP">%s</xliff:g>」管理您的網路連線？"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"未知的 SIM 卡行動通訊業者"</string>
+    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"未知的 SIM 卡電信業者"</string>
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"「<xliff:g id="OPERATOR">%1$s</xliff:g>」沒有任何已知的佈建網站"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡，並重新啟動裝置"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"請連線至網際網路"</string>
@@ -1430,8 +1427,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"與裝置的螢幕鎖定一致"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理應用程式"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和移除已安裝的應用程式"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"應用程式資訊"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"管理應用程式，設定快速啟動鍵"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"應用程式設定"</string>
     <string name="install_applications" msgid="4872012136210802181">"不明的來源"</string>
@@ -1491,16 +1487,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"管理空間"</string>
     <string name="filter" msgid="2018011724373033887">"篩選"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"選擇篩選器選項"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"全部"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"已停用"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"所有應用程式"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"已停用的應用程式"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下載"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"執行中"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 儲存裝置"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"於 SD 卡"</string>
     <string name="disabled" msgid="9206776641295849915">"已停用"</string>
     <string name="not_installed" msgid="2797554494953450291">"這位使用者並未安裝"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"已安裝"</string>
     <string name="no_applications" msgid="7336588977497084921">"沒有應用程式。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"內部儲存空間"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"內部儲存空間"</string>
@@ -1678,8 +1673,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"設定輸入法"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"設定"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"設定"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"啟用的輸入法"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"使用系統語言"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 設定"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"選擇啟用的輸入法"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"螢幕鍵盤設定"</string>
@@ -1723,7 +1716,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"自動更新螢幕放大設定"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"更新應用程式轉場後的螢幕放大設定"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"按電源鍵結束通話"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"說出密碼"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"大型滑鼠游標"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"單聲道音訊"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"播放音訊時合併聲道"</string>
@@ -1837,7 +1829,11 @@
     <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="power_usage_list_summary" msgid="2409288197839512482">"上次充飽後的使用情形"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"螢幕用量"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"行動網路掃描作業"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"上次充飽後的應用程式用量"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"上次充飽後的裝置用量"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重設後的電池使用狀況"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"電池已使用時間：<xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1927,11 +1923,11 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"估計過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"使用時間：%1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"佔整體電量的 %1$s"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"上次充飽後的詳細用量資訊"</string>
-    <!-- no translation found for estimated_time_left (7514194472683370877) -->
-    <skip />
-    <!-- no translation found for estimated_time_description (6722669204902760489) -->
-    <skip />
+    <string name="estimated_time_left" msgid="7514194472683370877">"預估剩餘時間"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"電池充飽的剩餘所需時間"</string>
+    <string name="estimated_time_description" msgid="6722669204902760489">"預估時間會因使用情形而有所變動"</string>
     <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>
@@ -2189,7 +2185,7 @@
     <string name="select_all" msgid="1562774643280376715">"全選"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"數據用量"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"應用程式數據用量"</string>
-    <string name="data_usage_accounting" msgid="7170028915873577387">"行動通訊業者與裝置的數據計算方式可能有所不同。"</string>
+    <string name="data_usage_accounting" msgid="7170028915873577387">"電信業者與裝置的數據計算方式可能有所不同。"</string>
     <string name="data_usage_app" msgid="4970478397515423303">"應用程式使用情況"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"應用程式資訊"</string>
     <string name="data_usage_cellular_data" msgid="4859424346276043677">"行動數據"</string>
@@ -2253,8 +2249,8 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"設定數據用量警告"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"設定數據用量上限"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"限制數據用量"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5788774061143636263">"一旦平板電腦達到指定的行動數據上限，將關閉行動數據功能。\n\n由於數據用量是由平板電腦自行計算，而行動通訊業者對用量的計算方式可能有所不同，建議您在設定上限時保留一些空間。"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3511301596446820549">"一旦手機達到指定的行動數據上限，將關閉行動數據功能。\n\n由於數據用量是由手機自行計算，而行動通訊業者對用量的計算方式可能有所不同，建議您在設定上限時保留一些空間。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5788774061143636263">"一旦平板電腦達到指定的行動數據上限，將關閉行動數據功能。\n\n由於數據用量是由平板電腦自行計算，而電信業者對用量的計算方式可能有所不同，建議您在設定上限時保留一些空間。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3511301596446820549">"一旦手機達到指定的行動數據上限，將關閉行動數據功能。\n\n由於數據用量是由手機自行計算，而電信業者對用量的計算方式可能有所不同，建議您在設定上限時保留一些空間。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制背景資料？"</string>
     <string name="data_usage_restrict_background" msgid="6264965779074729381">"如果您禁止背景行動數據傳輸，部分應用程式和服務只有在裝置連上 Wi-Fi 網路時才能運作。"</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7954930300449415764">"如果您禁止背景行動數據傳輸，部分應用程式和服務只有在平板電腦連上 Wi-Fi 網路時才能運作。\n\n這項設定適用於這台平板電腦的所有使用者。"</string>
@@ -2265,14 +2261,14 @@
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"已移除的應用程式和使用者"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"已接收 <xliff:g id="RECEIVED">%1$s</xliff:g>，已傳送 <xliff:g id="SENT">%2$s</xliff:g>"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。"</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>：根據平板電腦計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者對於數據用量的計算方式可能會有所不同。"</string>
-    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>：根據手機計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者對於數據用量的計算方式可能會有所不同。"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>：根據平板電腦計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的電信業者對於數據用量的計算方式可能會有所不同。"</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>：根據手機計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的電信業者對於數據用量的計算方式可能會有所不同。"</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"網路限制"</string>
     <string name="data_usage_metered_body" msgid="3262343834446126044">"計量付費網路在背景資料受限時等同行動網路。使用這類網路下載大量資料前，應用程式可能會顯示警告訊息。"</string>
     <string name="data_usage_metered_mobile" msgid="2326986339431119372">"行動網路"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"計量付費 Wi‑Fi 網路"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"如要選取計量付費網路，請開啟 Wi‑Fi。"</string>
-    <string name="data_usage_disclaimer" msgid="6887858149980673444">"行動通訊業者與裝置的數據計算方式可能有所不同。"</string>
+    <string name="data_usage_disclaimer" msgid="6887858149980673444">"電信業者與裝置的數據計算方式可能有所不同。"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急電話"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通話"</string>
     <string name="vpn_name" msgid="4689699885361002297">"名稱"</string>
@@ -2326,6 +2322,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"一律開啟功能已停用"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"不受這個應用程式支援"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"只允許透過 VPN 進行連線"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"需要 VPN 連線嗎？"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"已啟用鎖定"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"未啟用鎖定"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"選取要永久連線的 VPN 設定檔。只有在連線到這個 VPN 後才能使用網路。"</string>
@@ -2411,8 +2408,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"設有限制的個人資料無法新增帳戶"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"將 <xliff:g id="USER_NAME">%1$s</xliff:g> 從這個裝置中刪除"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"螢幕鎖定設定"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"在螢幕鎖定畫面中新增使用者"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新使用者"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"新的個人資料"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"您要刪除自己嗎？"</string>
@@ -2440,7 +2436,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"開啟通話和簡訊功能？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話和簡訊紀錄將與這位使用者共用。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"緊急資訊"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"<xliff:g id="USER_NAME">%1$s</xliff:g>的相關資訊"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>的相關資訊和聯絡資料"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限的應用程式"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
@@ -2534,7 +2530,7 @@
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM 卡名稱"</string>
     <string name="sim_name_hint" msgid="7038643345238968930">"輸入 SIM 卡名稱"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM 卡插槽 %1$d"</string>
-    <string name="sim_editor_carrier" msgid="5684523444677746573">"行動通訊業者"</string>
+    <string name="sim_editor_carrier" msgid="5684523444677746573">"電信業者"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"號碼"</string>
     <string name="sim_editor_color" msgid="2542605938562414355">"SIM 卡顏色"</string>
     <string name="sim_card_select_title" msgid="6668492557519243456">"選取 SIM 卡"</string>
@@ -2560,8 +2556,8 @@
       <item quantity="other">顯示 %d 個隱藏項目</item>
       <item quantity="one">顯示 %d 個隱藏項目</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"網路和網際網路"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"Wi-Fi、行動網路、數據用量、無線基地台"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"網路和網際網路"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi、行動網路、數據用量、無線基地台"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已連結的裝置"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"藍牙、NFC、投放"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"應用程式和通知"</string>
@@ -2569,8 +2565,7 @@
     <string name="account_dashboard_title" msgid="38701889336378742">"使用者和帳戶"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"預設應用程式"</string>
     <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"語言、備份、更新、關於手機"</string>
-    <!-- no translation found for system_dashboard_summary (4126847688457251215) -->
-    <skip />
+    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"語言、備份、更新、關於裝置"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
     <string name="search_menu" msgid="6283419262313758339">"搜尋設定"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"搜尋設定"</string>
@@ -2578,7 +2573,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"搜尋結果"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, 網路連線"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"文字訊息, 傳送文字訊息, 簡訊, 傳送簡訊"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"行動網路, 行動通訊業者, 無線, 數據, 4G, 3G, 2G, LTE"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"行動網路, 行動裝置, 電信業者, 無線, 數據, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, 通話, 撥號"</string>
     <string name="keywords_home" msgid="3626170808219458848">"啟動器"</string>
     <string name="keywords_display" msgid="8910345814565493016">"螢幕, 觸控螢幕"</string>
@@ -2654,8 +2649,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"警示"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"震動"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"啟動音效"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"「零打擾」偏好設定"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"僅允許優先通知"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動規則"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"設定「零打擾」時間表"</string>
@@ -2672,9 +2666,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"預設 Work 通知音效"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"預設 Work 鬧鐘鈴聲"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"與個人設定檔相同"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"要取代 Work 設定檔音效嗎？"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"要使用個人設定檔音效嗎？"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"取代"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"你的個人設定檔音效將取代目前的 Work 設定檔音效"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"系統將使用你的個人設定檔音效，而非目前的 Work 設定檔音效"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"鈴聲"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"其他音效與震動"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"通知偏好設定"</string>
@@ -2910,11 +2904,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"未取得任何授權"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"未要求任何權限"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"所有應用程式"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"已啟用"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"已安裝的應用程式"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"免安裝應用程式"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"公司"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已封鎖"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"包含網域網址"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="configure_apps" msgid="6685680790825882528">"設定應用程式"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明的應用程式"</string>
@@ -2939,8 +2933,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Work 預設值"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"小幫手與語音輸入"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"小幫手應用程式"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"無"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"選擇小幫手應用程式"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"要將「<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>」設為您的小幫手嗎？"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"小幫手將可讀取系統目前使用中的應用程式相關資訊，包括裝置畫面上顯示的資訊及應用程式內提供存取的資訊。"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"同意"</string>
@@ -2956,7 +2948,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>
@@ -2970,6 +2962,8 @@
     <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">"電池效能最佳化"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"用量警示"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"顯示所有應用程式"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"隱藏其他應用程式"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"未套用最佳化設定"</string>
     <string name="high_power_on" msgid="6216293998227583810">"未套用最佳化設定"</string>
     <string name="high_power_off" msgid="3393904131961263278">"採用電池效能最佳化設定"</string>
@@ -3150,6 +3144,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"冷色溫"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器色溫"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"如要套用色溫變更設定，請關閉螢幕"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"如要套用 Telephony Monitor 的變更內容，請重新啟動裝置"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動系統更新"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (需要重新啟動)"</string>
     <string name="usage" msgid="2977875522080448986">"使用情況"</string>
@@ -3167,7 +3162,7 @@
     <string name="billing_cycle_summary" msgid="9009106526129293752">"每月週期從當月 <xliff:g id="ID_1">%1$s</xliff:g>日起算"</string>
     <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"每月 <xliff:g id="ID_1">%1$s</xliff:g>日起算"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"網路限制"</string>
-    <string name="operator_warning" msgid="1862988028996859195">"行動通訊業者與裝置的數據計算方式可能有所不同"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"電信業者與裝置的數據計算方式可能有所不同"</string>
     <string name="data_used_template" msgid="3245919669966296505">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"設定數據用量警告"</string>
     <string name="data_warning" msgid="209133958008062117">"數據用量警告"</string>
@@ -3327,12 +3322,14 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"輔助手勢"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></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>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"請先連上網際網路"</string>
-    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"請連上網際網路或與您的行動通訊業者聯絡"</string>
-    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"綁定特定行動通訊業者服務的裝置無法使用"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"請連上網際網路或與您的電信業者聯絡"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"綁定特定電信業者服務的裝置無法使用"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"總共釋出 <xliff:g id="SIZE">%1$s</xliff:g>\n\n上次執行日期：<xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="8502552575492048305">"在應用程式中開啟連結"</string>
     <string name="web_action_enable_summary" msgid="4679844581193646863">"在支援的應用程式中開啟連結，即使你的裝置未安裝該應用程式也沒問題"</string>
@@ -3388,12 +3385,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已設定全域 HTTP Proxy"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"管理員可以鎖定裝置及重設密碼"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"管理員可以刪除所有裝置資料"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="other">根據管理員的設定，輸入錯誤密碼的次數不能超過 <xliff:g id="COUNT_1">%d</xliff:g> 次，否則就會自動刪除所有裝置資料</item>
+      <item quantity="one">根據管理員的設定，輸入錯誤密碼的次數不能超過 <xliff:g id="COUNT_0">%d</xliff:g> 次，否則就會自動刪除所有裝置資料</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="other">根據管理員的設定，輸入錯誤密碼的次數不能超過 <xliff:g id="COUNT_1">%d</xliff:g> 次，否則就會自動刪除 Work 設定檔資料</item>
+      <item quantity="one">根據管理員的設定，輸入錯誤密碼的次數不能超過 <xliff:g id="COUNT_0">%d</xliff:g> 次，否則就會自動刪除 Work 設定檔資料</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"這是受機構管理的裝置。"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"這個裝置是由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 所管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"瞭解詳情"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"相片和影片"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"音樂和音訊"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"遊戲"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"其他應用程式"</string>
     <string name="storage_files" msgid="8581083146777364063">"檔案"</string>
@@ -3404,9 +3411,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"儲存空間管理員：<xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"關閉"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"開啟"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"遊戲"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音訊檔案"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"音樂"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(已為使用者<xliff:g id="USER">%s</xliff:g>解除安裝)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(已為使用者<xliff:g id="USER">%s</xliff:g>停用)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"自動填入應用程式"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 251a4f1..d48d764 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -330,9 +330,10 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Indawo"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Ama-akhawunti"</string>
     <string name="security_settings_title" msgid="9087149148665560415">"Ukuphepha nokukhiya kwesikrini"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Ukubethela nokuqinisekisa"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setha Indawo Yami, ukuvula isikrini, ukuvala isitoreji seziqinisekiso"</string>
-    <string name="security_passwords_title" msgid="2930627259125138363">"Amaphasiwedi"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Ubumfihlo"</string>
     <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Ikhutshazwe umlawuli"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Isimo sokuphepha"</string>
     <string name="security_dashboard_summary" msgid="7778812098315813315">"Indawo, isigxivizo somunwe"</string>
@@ -1427,8 +1428,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Ukhiya wesikrini wedivayisi"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Phatha izinhlelo zokusebenza"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Phatha futhi ukhiphe izinhlelo zokusebenza ezifakiwe"</string>
-    <!-- no translation found for applications_settings (5281808652705396152) -->
-    <skip />
+    <string name="applications_settings" msgid="5281808652705396152">"Ulwazi lohlelo lokusebenza"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Phatha izinhlelo zokusebenza, hlela izinqamuleli zokuqalisa okusheshayo"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Izilungiselelo zohlelo lokusebenza"</string>
     <string name="install_applications" msgid="4872012136210802181">"Imithombo engaziwa"</string>
@@ -1488,16 +1488,15 @@
     <string name="manage_space_text" msgid="8852711522447794676">"Lawula isikhala"</string>
     <string name="filter" msgid="2018011724373033887">"Hlunga"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Khetha okukhethwa kukho kokuhlunga"</string>
-    <string name="filter_apps_all" msgid="5142129378749391876">"Konke"</string>
-    <string name="filter_apps_disabled" msgid="5364447573326472890">"Kukhutshaziwe"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"Zonke izinhlelo zokusebenza"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Izinhlelo zokusebenza ezikhutshaziwe"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Landiwe"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Sebenzayo"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Isitoreji se-USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Ekhadini le-SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Akusebenzi"</string>
     <string name="not_installed" msgid="2797554494953450291">"Akufakiwe kulo msebenzisi"</string>
-    <!-- no translation found for installed (3070865169422600098) -->
-    <skip />
+    <string name="installed" msgid="3070865169422600098">"Kufakiwe"</string>
     <string name="no_applications" msgid="7336588977497084921">"Azikho izinhlelo zokusebenza"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Isitoreji sangaphakathi"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"isitoreji sangaphakathi"</string>
@@ -1675,8 +1674,6 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Izilungiselelo zezindlela zokufakwayo"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Izilungiselelo"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Izilungiselelo"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Izindlela zokufakwayo okusebenzayo"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Sebenzisa izilimi zesistimu"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> izilungiselelo"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Khetha izindlela zokufakwayo ezisebenzayo"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Izilungiselelo zekhibhodi ekwiskrini"</string>
@@ -1720,7 +1717,6 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Buyekeza ngokuzenzakalela isisondezi-skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Buyekeza isisondezi-skrini ekushintshweni kohlelo lokusebenza"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Inkinobho yamandla ivala ikholi"</string>
-    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Memeza iphasiwedi"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Isikhombi esikhulu segundane"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Umsindo we-Mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Hlanganisa iziteshi uma udlala umsindo"</string>
@@ -1834,7 +1830,11 @@
     <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> osele"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ukuze lishajiwe"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Ukusebenza kusuka ekugcineni kokushaja okugcwele"</string>
+    <string name="device_screen_usage" msgid="224482533839040430">"Ukusetshenziswa kwesikrini"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Ukusetshenziswa kwesikrini"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Ukuskena kwenethiwekhi yeselula"</string>
+    <string name="power_usage_list_summary" msgid="792703666229965848">"Ukusetshenziswa kohlelo lokusebenza kusukela ekushajweni kokugcina kokugcwalisa"</string>
+    <string name="device_usage_list_summary" msgid="1545514224536252111">"Ukusetshenziswa kwedivayisi kusukela ekushajweni kokugcina okugcwele"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ukusebenzisa ibhetri kusukela inqamuliwe"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Ukusebenzisa ibhetri kusukela ekuhleleni futhi"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> kwibhetri"</string>
@@ -1924,8 +1924,10 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ukusetshenziswa kwamandla okubalwe ngaphezulu"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="4383512863007718804">"Kusetshenziselwe okungu-%1$s"</string>
+    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s yalo lonke ibhethri"</string>
     <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Ukwaphulwa kokusebenzisa kusuka ekushajeni okugcwele"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Isikhathi esilinganiselwe esisele"</string>
+    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Isikhathi sokushaja ngokugcwele"</string>
     <string name="estimated_time_description" msgid="6722669204902760489">"Ukulinganiselwa kungashintsha kusukela ekusetshenzisweni"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kusukelwa kungaxhunyiwe"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ngenkathi igcinwe ukunqamulwa kwe <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2317,6 +2319,7 @@
     <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Kuhlala kusebenza"</string>
     <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Akusekelwa yilolu hlelo lokusebenza"</string>
     <string name="vpn_require_connection" msgid="4564777707170757146">"Vumela kuphela uxhumo nge-VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Kudingeka uxhumo lwe-VPN?"</string>
     <string name="vpn_lockdown_active" msgid="4687243926584886862">"Ukukhiya kuyasebenza"</string>
     <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Ukukhya akusebenzi"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Khetha iphrofayela ye-VPN ukuhlala uxhumekile. I-traffic yenethiwekhi izovunyelwa kuphela uma ixhunyiwe kule-VPN."</string>
@@ -2402,8 +2405,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Amaphrofayela akhawulelwe awakwazi ukungeza ama-akhawunti"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Susa i-<xliff:g id="USER_NAME">%1$s</xliff:g> kule divayisi"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Khiya izilungiselelo zesikrini"</string>
-    <!-- no translation found for user_add_on_lockscreen_menu (9072312646546364619) -->
-    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Engeza abasebenzisi kusuka esikrinini sokukhiya"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Umsebenzisi omusha"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Iphrofayela entsha"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Zisuse wena?"</string>
@@ -2431,7 +2433,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vula amakholi wefoni ne-SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Umlando wekholi ne-SMS uzokwabiwa nalo msebenzisi."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Ulwazi lwesimo esiphuthumayo"</string>
-    <string name="emergency_info_summary" msgid="8791523394921560711">"Ulwazi mayelana ne-<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Ulwazi noxhumana nabo baka-<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Vumela izinhlelo zokusebenza nokuqukethwe"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Izinhlelo zokusebenza ezinomkhawulo"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Nweba izilungiselelo zohlelo lokusebenza"</string>
@@ -2551,8 +2553,8 @@
       <item quantity="one">Bonisa izinto ezingu-%d ezifihliwe</item>
       <item quantity="other">Bonisa izinto ezingu-%d ezifihliwe</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="3135144174846753758">"Inethiwekhi ne-inthanethi"</string>
-    <string name="network_dashboard_summary" msgid="1832517180319685189">"I-Wi-Fi, iselula, ukusetshenziswa kwedatha, i-hotspot"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Inethiwekhi ye-inthanethi"</string>
+    <string name="network_dashboard_summary" msgid="3274556191585905652">"I-Wi-Fi, iselula, ukusetshenziswa kwedatha, i-hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Amadivayisi axhunyiwe"</string>
     <string name="connected_devices_dashboard_summary" msgid="6595300910405977083">"I-Bluetooth, NFC, cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Izinhlelo zokusebenza nezaziso"</string>
@@ -2568,7 +2570,7 @@
     <string name="search_results_label" msgid="4163304782363526148">"Imiphumela"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"i-wifi, i-wi-fi, ukuxhumeka kwenethiwekhi"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"umlayezo wombhalo, ukuthumela umlayezo, imilayezo, ukulayeza"</string>
-    <string name="keywords_more_mobile_networks" msgid="1538131503712402851">"iselula, inkampani yenethiwekhi yeselula, okungenantambo, idatha, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"iselula, iselula, inkampani yenethiwekhi yeselula, okungenantambo, idatha, i-4g, i-3g, i-2g, i-lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"i-wifi, i-wi-fi, ikholi, ukushaya"</string>
     <string name="keywords_home" msgid="3626170808219458848">"isiqalisi"</string>
     <string name="keywords_display" msgid="8910345814565493016">"isikrini, isikrini esithintwayo"</string>
@@ -2644,8 +2646,7 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Isaziso"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dlidliza"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Amandla kumisindo"</string>
-    <!-- no translation found for zen_mode_settings_title (9019451272935850774) -->
-    <skip />
+    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Izintandokazi zokungaphazamisi"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Okubalulekile kuvumela kuphela"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Izimiso ezizenzakalelayo"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Setha ishejuli yokungaphazamisi"</string>
@@ -2662,9 +2663,9 @@
     <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Ithoni ezenzakalelayo yesasizo somsebenzi"</string>
     <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Ithoni yokukhala ye-alamu yomsebenzi ezenzakalelayo"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Ifana nephrofayela yomuntu siqu"</string>
-    <string name="work_sync_dialog_title" msgid="4235493986362911084">"Faka esikhundleni imisindo yephrofayela yomsebenzi?"</string>
+    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Sebenzisa imisindo yephrofayela yomuntu siqu?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Buyisela"</string>
-    <string name="work_sync_dialog_message" msgid="1655410601622810837">"Imisindo yakho yamanje yephrofayela yomsebenzi izoshintshaniswa nemisindo yakho siqu yephrofayela"</string>
+    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Iphrofayela yakho siqu izwakala sengathi izosetshenziswa esikhundleni semisindo yakho yamanje yephrofayela yomsebenzi"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Amaringithoni"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Eminye imisindo nokudlidliza"</string>
     <string name="configure_notification_settings" msgid="7447797716856573587">"Okuncamelayo kwesaziso"</string>
@@ -2900,11 +2901,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Azikho izimvume ezinikiwe"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Azikho izimvume eziceliwe"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Zonke izinhlelo zokusebenza"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Kunikwe amandla"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Izinhlelo zokusebenza ezifakiwe"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Izinhlelo zokusebenza ezisheshayo"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Okomuntu siqu"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Umsebenzi"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Uvinjelwe"</string>
-    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Nama-URL wesizinda"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Okuthuthukisiwe"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Lungisa izinhlelo zokusebenza"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Uhlelo lokusebenza olungaziwa"</string>
@@ -2929,8 +2930,6 @@
     <string name="default_for_work" msgid="9152194239366247932">"Okuzenzakalelayo kokusebenza"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Okokufaka kwensiza nezwi"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Uhlelo lokusebenza lomsizi"</string>
-    <string name="default_assist_none" msgid="3709083569608735487">"Lutho"</string>
-    <string name="choose_assist_title" msgid="2373353478479305516">"Khetha uhlelo lokusebenza lomsizi"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Yenza i-<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> isilekeleli sakho?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Isilekeleli sizokwazi ukufunda ulwazi mayelana nezinhlelo zokusebenza ezisetshenziswayo kusistimu yakho, ezifaka ulwazi olubonakala kusikrini sakho noma ezifinyeleleka ngaphakathi kwezinhlelo zokusebenza."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Vuma"</string>
@@ -2960,6 +2959,8 @@
     <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">"Ukulungiselelwa kwebhethri"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Izexwayiso zokusetshenziswa"</string>
+    <string name="show_all_apps" msgid="1742726460081356745">"Bonisa zonke izinhlelo zokusebenza"</string>
+    <string name="hide_extra_apps" msgid="5568177134273528751">"Fihla izinhlelo zokusebenza ezingeziwe"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Akulungiselelwe"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Akulungiselelwe"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Ilungiselela ukusetshenziswa kwebhethri"</string>
@@ -3140,6 +3141,7 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ithempelesha yombala opholile"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sebenzisa imibala yesibonisi esipholile"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ukuze usebenzise ukushintshwa kombala, vala isikrini"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ukuze usebenzise ushintsho lokuqapha ifoni, qalisa kabusha idivayisi"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Izibuyekezo zesistimu ezenzakalelayo"</string>
     <string name="enable_hal_binderization" msgid="8933984983735990337">"I-Binderized HALs (requires reboot)"</string>
     <string name="usage" msgid="2977875522080448986">"Ukusetshenziswa"</string>
@@ -3317,6 +3319,8 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ukuze uhlole izaziso zakho, swayiphela phansi kunzwa yezigxivizo zeminwe ngemuva kwefoni yakho."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Ukuze uhlole izaziso zakho, swayiphela phansi kunzwa yezigxivizo zeminwe ngemuva kwethebulethi yakho."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Ukuze uhlole izaziso zakho, swayiphela phansi kunzwa yezigxivizo zeminwe ngemuva kwedivayisi yakho."</string>
+    <string name="assist_gesture_title" msgid="7746563137898655539">"Ukuthinta komsizi"</string>
+    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Kuvuliwe"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Kuvaliwe"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"I-Bootloader isivele ivuliwe"</string>
@@ -3378,12 +3382,22 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ummeleli we-Global HTTP usethiwe"</string>
     <string name="enterprise_privacy_lock_device" msgid="3823039578233930196">"Umlawuli angakhiya idivayisi aphinde asethe kabusha iphasiwedi"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Umlawuli angasusa yonke idatha yedivayisi"</string>
+    <plurals name="enterprise_privacy_failed_password_wipe_device" formatted="false" msgid="7687271729962516228">
+      <item quantity="one">Umlawuli usethe imizamo eminingi yephasiwedi yaba ngu-<xliff:g id="COUNT_1">%d</xliff:g> ngaphambi kokususa yonke idatha yedivayisi</item>
+      <item quantity="other">Umlawuli usethe imizamo eminingi yephasiwedi yaba ngu-<xliff:g id="COUNT_1">%d</xliff:g> ngaphambi kokususa yonke idatha yedivayisi</item>
+    </plurals>
+    <plurals name="enterprise_privacy_failed_password_wipe_work" formatted="false" msgid="4192488502181650982">
+      <item quantity="one">Umqondisi usethe imizamo eminingi yephasiwedi yaya ku-<xliff:g id="COUNT_1">%d</xliff:g> ngaphambi kokususa idatha yephrofayela yomsebenzi</item>
+      <item quantity="other">Umqondisi usethe imizamo eminingi yephasiwedi yaya ku-<xliff:g id="COUNT_1">%d</xliff:g> ngaphambi kokususa idatha yephrofayela yomsebenzi</item>
+    </plurals>
     <string name="do_disclosure_generic" msgid="5666469247267523806">"Le divayisi iphethwe."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Le divayisi iphethwe yi-<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Funda kabanzi"</string>
-    <string name="storage_photos_videos" msgid="1872663116054954685">"Izithombe namavidiyo"</string>
-    <string name="storage_music_audio" msgid="7890103397813503615">"Umculo nomsindo"</string>
+    <!-- no translation found for storage_photos_videos (319854636702241898) -->
+    <skip />
+    <!-- no translation found for storage_music_audio (789779084825206838) -->
+    <skip />
     <string name="storage_games" msgid="7703159201697117621">"Amageyimu"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ezinye izinhlelo zokusebenza"</string>
     <string name="storage_files" msgid="8581083146777364063">"Amafayela"</string>
@@ -3394,9 +3408,10 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Umphathi wesitolo: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Kuvaliwe"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Vuliwe"</string>
+    <!-- no translation found for install_type_instant (3174425974536078647) -->
+    <skip />
     <string name="game_storage_settings" msgid="3410689937046696557">"Amageyimu"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Amafayela omsindo"</string>
-    <string name="audio_storage_title" msgid="5494923634269236874">"Umculo"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(kukhishelwe umsebenzisi ongu-<xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(kukhutshazelwe umsebenzisi ongu-<xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="3889348218462883960">"Ukugcwalisa okuzenzakalelayo kohlelo lokusebenza"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 601fb40..8b172fa 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -701,7 +701,7 @@
 
     <!-- Values for the list of long press timeout options. -->
     <string-array name="long_press_timeout_selector_values" translatable="false">
-        <item>500</item>
+        <item>400</item>
         <item>1000</item>
         <item>1500</item>
     </string-array>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index fdb1265..6705494 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -37,18 +37,15 @@
     <color name="setup_lock_pattern_view_success_color_dark">#ff84ffff</color>
     <color name="setup_lock_pattern_view_success_color_light">@color/suw_color_accent_light</color>
     <color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>
-    <color name="setup_lock_pattern_view_error_color_light">@color/lock_pattern_view_error_color</color>
     <color name="setup_wizard_wifi_color_dark">#89ffffff</color>
     <color name="setup_wizard_wifi_color_light">#89000000</color>
 
     <color name="lock_pattern_background">#00000000</color>
     <color name="lock_pattern_view_regular_color">#ff37474f</color>
-    <color name="lock_pattern_view_error_color">@*android:color/system_error</color>
 
     <color name="lock_pattern_view_regular_color_dark">#ffffff</color>
 
     <color name="unlock_pattern_view_regular_color">@android:color/white</color>
-    <color name="unlock_pattern_view_error_color">@*android:color/system_error</color>
 
     <color name="fingerprint_title_area_bg">?android:attr/colorAccent</color>
     <color name="fingerprint_title_color">#ffffffff</color>
@@ -75,8 +72,6 @@
 
     <color name="memory_avg_use">#ff384248</color>
 
-    <color name="zen_rule_name_warning">@*android:color/system_error</color>
-
     <!-- Accent color that matches the settings launcher icon -->
     <color name="icon_accent">#ffabffec</color>
 
diff --git a/res/values/config.xml b/res/values/config.xml
index fae38fc..0fa2b71 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -38,6 +38,9 @@
     <!-- When true enable color temperature setting. -->
     <bool name="config_enableColorTemperature">false</bool>
 
+    <!-- Whether to show TelphonyMonitor switch in Developer Options -->
+    <bool name="config_show_telephony_monitor">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>
 
@@ -61,4 +64,7 @@
     <!-- If the Storage Manager settings are enabled. -->
     <bool name="config_storage_manager_settings_enabled">false</bool>
 
+    <!-- If the support features are enabled. -->
+    <bool name="config_support_enabled">false</bool>
+
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0ddc634..fe5845a 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -88,10 +88,6 @@
     <dimen name="dashboard_padding_top">0dp</dimen>
     <dimen name="dashboard_padding_bottom">0dp</dimen>
 
-    <!-- Dashboard Header margin in its container -->
-    <dimen name="dashboard_header_margin_start">0dp</dimen>
-    <dimen name="dashboard_header_margin_end">0dp</dimen>
-
     <!-- Dashboard category padding start / end -->
     <dimen name="dashboard_category_padding_start">0dp</dimen>
     <dimen name="dashboard_category_padding_end">0dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 46981b6..1e1304e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -744,13 +744,15 @@
     <string name="account_settings_title">Accounts</string>
     <!-- Main Settings screen setting option title for the item to take you to the security screen -->
     <string name="security_settings_title">Security &amp; screen lock</string>
+    <!-- Security Settings screen setting option title for the item to take you to the encryption and credential screen -->
+    <string name="encryption_and_credential_settings_title">Encryption &amp; credentials</string>
 
     <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
     <string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>
     <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
     <string name="cdma_security_settings_summary">Set My Location, screen unlock, credential storage lock</string>
     <!-- In the security screen, the header title for settings related to  Passwords-->
-    <string name="security_passwords_title">Passwords</string>
+    <string name="security_passwords_title">Privacy</string>
     <!-- Summary for settings preference disabled by administrator [CHAR LIMIT=50] -->
     <string name="disabled_by_administrator_summary">Disabled by administrator</string>
     <!-- In the security screen, the header title for security statuses -->
@@ -3454,9 +3456,9 @@
     <string name="filter_dlg_title">Choose filter options</string>
     <!-- Text for filter option in ManageApps screen to display all installed
     applications -->
-    <string name="filter_apps_all">All</string>
+    <string name="filter_apps_all">All apps</string>
     <!-- [CHAR LIMIT=NONE] Text for filter option in ManageApps screen to display disabled apps -->
-    <string name="filter_apps_disabled">Disabled</string>
+    <string name="filter_apps_disabled">Disabled apps</string>
     <!-- Text for filter option in ManageApps screen to display third party
     applications only -->
     <string name="filter_apps_third_party">Downloaded</string>
@@ -4004,8 +4006,6 @@
         screen magnification on app transitions</string>
     <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
     <string name="accessibility_power_button_ends_call_prerefence_title">Power button ends call</string>
-    <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
-    <string name="accessibility_toggle_speak_password_preference_title">Speak passwords</string>
     <!-- Title for the accessibility preference for enabling/disabling large icons for mouse/trackpad pointers. [CHAR LIMIT=35] -->
     <string name="accessibility_toggle_large_pointer_icon_title">Large mouse pointer</string>
     <!-- Title for the accessibility preference for master mono. [CHAR LIMIT=35] -->
@@ -4285,8 +4285,17 @@
     <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
     <string name="power_charge_remaining"><xliff:g id="until_charged">%1$s</xliff:g> to charge</string>
 
-    <!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
-    <string name="power_usage_list_summary">Use since last full charge</string>
+    <!-- Title for the screen usage in power use UI [CHAR_LIMIT=40] -->
+    <string name="device_screen_usage">Screen usage</string>
+    <!-- Title for the screen consumption in power use UI(i.e. Screen consumption: 30% of battery usage) [CHAR_LIMIT=40] -->
+    <string name="device_screen_consumption">Screen consumption</string>
+    <!-- Title for the cellular network in power use UI(i.e. Mobile network scanning: 30% of battery usage) [CHAR_LIMIT=40] -->
+    <string name="device_cellular_network">Mobile network scanning</string>
+
+    <!-- Label for list of apps using battery in power use UI [CHAR_LIMIT=60] -->
+    <string name="power_usage_list_summary">App usage since last full charge</string>
+    <!-- Label for list of different types using battery in power use UI [CHAR_LIMIT=60] -->
+    <string name="device_usage_list_summary">Device usage since last full charge</string>
     <!-- Battery usage since unplugged -->
     <string name="battery_since_unplugged">Battery use since unplugged</string>
     <!-- Battery usage since user reset the stats -->
@@ -4483,12 +4492,17 @@
 
     <!-- Description for battery usage time for an app, i.e. Used for 30min. [CHAR LIMIT=60] -->
     <string name="battery_used_for">Used for %1$s</string>
+    <!-- Description for percentage of battery usage for an app, i.e. Screen: 30% of overall battery. [CHAR LIMIT=60] -->
+    <string name="battery_overall_usage">%1$s of overall battery</string>
     <!-- Description for battery usage detail information since last full charge. [CHAR LIMIT=120] -->
     <string name="battery_detail_since_full_charge">Usage breakdown since last full charge</string>
 
     <!-- Description for battery time left, i.e. 50min Estimated time left. [CHAR LIMIT=80]-->
     <string name="estimated_time_left">Estimated time left</string>
 
+    <!-- Description for charging time left, i.e. 50min Time to full charge. [CHAR LIMIT=80]-->
+    <string name="estimated_charging_time_left">Time to full charge</string>
+
     <!-- Description for estimated time. [CHAR LIMIT=80]-->
     <string name="estimated_time_description">Estimation may change based on usage</string>
 
@@ -5642,7 +5656,7 @@
     <!-- Title for the emergency info preference [CHAR LIMIT=40] -->
     <string name="emergency_info_title">Emergency information</string>
     <!-- Summary for the emergency info preference [CHAR LIMIT=40] -->
-    <string name="emergency_info_summary">Information about <xliff:g id="user_name" example="Jason">%1$s</xliff:g></string>
+    <string name="emergency_info_summary">Info &amp; contacts for <xliff:g id="user_name" example="Jason">%1$s</xliff:g></string>
 
     <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
     <string name="application_restrictions">Allow apps and content</string>
@@ -6054,6 +6068,7 @@
     <string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>
     <string name="keywords_gesture">gesture</string>
     <string name="keywords_payment_settings">pay, tap, payments</string>
+    <string name="keywords_backup">backup, back up</string>
 
     <!-- NFC Wi-Fi pairing/setup strings-->
 
@@ -6163,7 +6178,7 @@
     <!-- Sound: Other sounds: Title for the option enabling boot sounds. [CHAR LIMIT=30] -->
     <string name="boot_sounds_title">Power on sounds</string>
 
-    <!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=30] -->
+    <!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=50]-->
     <string name="zen_mode_settings_title">Do not disturb preferences</string>
 
     <!-- Do not disturb: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
@@ -6215,13 +6230,13 @@
     <string name="work_sound_same_as_personal">Same as personal profile</string>
 
     <!-- Work Sound: Title for dialog shown when enabling sync with personal sounds. [CHAR LIMIT=60] -->
-    <string name="work_sync_dialog_title">Replace work profile sounds?</string>
+    <string name="work_sync_dialog_title">Use personal profile sounds?</string>
 
-    <!-- Work Sound: Confirm action text for dialog shown when enabling sync with personal sounds. [CHAR LIMIT=30] -->
+    <!-- Work Sound: Confirm action text for dialog shown when overriding work notification sounds with personal sounds. [CHAR LIMIT=30] -->
     <string name="work_sync_dialog_yes">Replace</string>
 
-    <!-- Work Sound: Message for dialog shown when enabling sync with personal sounds. [CHAR LIMIT=none] -->
-    <string name="work_sync_dialog_message">Your current work profile sounds will be replaced with your personal profile sounds</string>
+    <!-- Work Sound: Message for dialog shown when using the same sounds for work events as for personal events (notifications / ringtones / alarms). [CHAR LIMIT=none] -->
+    <string name="work_sync_dialog_message">Your personal profile sounds will be used instead of your current work profile sounds</string>
 
     <!-- Ringtones preference category: Title for the Ringotnes preference categories. [CHAR LIMIT=none] -->
     <string name="ringtones_category_preference_title">Ringtones</string>
@@ -6880,15 +6895,15 @@
     <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
     <string name="filter_all_apps">All apps</string>
     <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
-    <string name="filter_enabled_apps">Enabled</string>
+    <string name="filter_enabled_apps">Installed apps</string>
+    <!-- Label for showing instant apps in list [CHAR LIMIT=40] -->
+    <string name="filter_instant_apps">Instant apps</string>
     <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
     <string name="filter_personal_apps">Personal</string>
     <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
     <string name="filter_work_apps">Work</string>
     <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
     <string name="filter_notif_blocked_apps">Blocked</string>
-    <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
-    <string name="filter_with_domain_urls_apps">With domain URLs</string>
 
     <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
     <string name="advanced_apps">Advanced</string>
@@ -6956,12 +6971,6 @@
     <!-- Title for Default Assist settings [CHAR LIMIT=30] -->
     <string name="default_assist_title">Assist app</string>
 
-    <!-- Summary for No Default Assist settings [CHAR LIMIT=45] -->
-    <string name="default_assist_none">None</string>
-
-    <!-- Title for Choose Assist dialog [CHAR LIMIT=35] -->
-    <string name="choose_assist_title">Choose Assist app</string>
-
     <!-- [CHAR_LIMIT=45] Title of the security warning dialog for setting an assitant -->
     <string name="assistant_security_warning_title">
         Make <xliff:g id="assistant_app_name">%s</xliff:g> your assistant?
@@ -7054,6 +7063,12 @@
     <!-- Label for menu to launch a screen showing usage alerts for battery [CHAR LIMIT=30] -->
     <string name="additional_battery_info">Usage alerts</string>
 
+    <!-- Label for menu to show all apps in battery settings [CHAR LIMIT=30] -->
+    <string name="show_all_apps">Show all apps</string>
+
+    <!-- Label for menu to hide extra apps in battery settings [CHAR LIMIT=30] -->
+    <string name="hide_extra_apps">Hide extra apps</string>
+
     <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
     <string name="high_power_filter_on">Not optimized</string>
 
@@ -7544,6 +7559,9 @@
     <!-- Toast message letting the user know the color temperature setting is not immediate -->
     <string name="color_temperature_toast">To apply color change, turn off screen</string>
 
+    <!-- Toast message letting the user know the how to trigger telephony monitor -->
+    <string name="telephony_monitor_toast">To apply telephony monitor change, reboot device</string>
+
     <!-- Name of the setting to disable the automatic update -->
     <string name="ota_disable_automatic_update">Automatic system updates</string>
 
@@ -8150,6 +8168,16 @@
     <string name="enterprise_privacy_lock_device">Admin can lock device and reset password</string>
     <!-- Label explaining that the admin can wipe the device remotely. [CHAR LIMIT=NONE] -->
     <string name="enterprise_privacy_wipe_device">Admin can delete all device data</string>
+    <!-- Label explaining that the admin configured the device to wipe itself when the password is mistyped this many times. [CHAR LIMIT=NONE] -->
+    <plurals name="enterprise_privacy_failed_password_wipe_device">
+        <item quantity="one">Admin set maximum password attempts to <xliff:g id="count">%d</xliff:g> before deleting all device data</item>
+        <item quantity="other">Admin set maximum password attempts to <xliff:g id="count">%d</xliff:g> before deleting all device data</item>
+    </plurals>
+    <!-- Label explaining that the admin configured the work profile to wipe itself when the password is mistyped this many times. [CHAR LIMIT=NONE] -->
+    <plurals name="enterprise_privacy_failed_password_wipe_work">
+        <item quantity="one">Admin set maximum password attempts to <xliff:g id="count">%d</xliff:g> before deleting work profile data</item>
+        <item quantity="other">Admin set maximum password attempts to <xliff:g id="count">%d</xliff:g> before deleting work profile data</item>
+    </plurals>
     <!-- Message indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=NONE] -->
     <string name="do_disclosure_generic">This device is managed.</string>
     <!-- Message indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=NONE] -->
@@ -8160,10 +8188,10 @@
     <string name="do_disclosure_learn_more">Learn more</string>
 
     <!-- Preference label for the Photos & Videos storage section. [CHAR LIMIT=50] -->
-    <string name="storage_photos_videos">Photos &amp; Videos</string>
+    <string name="storage_photos_videos">Photos &amp; videos</string>
 
     <!-- Preference label for the Music & Audio storage section. [CHAR LIMIT=50] -->
-    <string name="storage_music_audio">Music &amp; Audio</string>
+    <string name="storage_music_audio">Music &amp; audio</string>
 
     <!-- Preference label for the Games storage section. [CHAR LIMIT=50] -->
     <string name="storage_games">Games</string>
@@ -8193,13 +8221,14 @@
     <!-- On status for the automatic storage manager. [CHAR_LIMIT=10] -->
     <string name="storage_manager_indicator_on">On</string>
 
+    <!-- Added as the value of a header field indicating this is an instant app (as opposed to installed normally) -->
+    <string name="install_type_instant">Instant app</string>
+
     <!-- Title of games app storage screen [CHAR LIMIT=30] -->
     <string name="game_storage_settings">Games</string>
 
     <!-- Title for audio files preference. [CHAR LIMIT=50] -->
     <string name="audio_files_title">Audio files</string>
-    <!-- Title for the Audio storage view. [CHAR LIMIT=50] -->
-    <string name="audio_storage_title">Music</string>
 
     <!-- UI webview setting: WebView uninstalled-for-user explanatory text [CHAR LIMIT=30] -->
     <string name="webview_uninstalled_for_user">(uninstalled for user <xliff:g id="user" example="John Doe">%s</xliff:g>)</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3f36255..2692508 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -192,7 +192,7 @@
         <item name="android:textSize">12sp</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">@*android:color/system_error</item>
+        <item name="android:textColor">?android:attr/colorError</item>
     </style>
 
     <style name="wifi_item_content">
@@ -259,13 +259,13 @@
         <item name="android:singleLine">true</item>
     </style>
 
-    <style name="SetupWizardButton.Negative" parent="@android:style/Widget.Material.Button.Borderless.Colored">
-        <item name="android:minWidth">0dp</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:theme">@style/AccentColorHighlightBorderlessButton</item>
+    <style name="SetupWizardButton.Negative" parent="@style/SuwGlifButton.Secondary">
+        <!-- Negative margin to offset for padding of the button itself. We want the label to be
+             aligned with the text above it -->
+        <item name="android:layout_marginStart">-16dp</item>
     </style>
 
-    <style name="SetupWizardButton.Positive" parent="@android:style/Widget.Material.Button.Colored" />
+    <style name="SetupWizardButton.Positive" parent="@style/SuwGlifButton.Primary" />
 
     <style name="AccentColorHighlightBorderlessButton">
         <item name="android:colorControlHighlight">?android:attr/colorAccent</item>
@@ -330,7 +330,7 @@
 
     <style name="TextAppearance.FingerprintErrorText"
         parent="android:TextAppearance.Material.Body1">
-        <item name="android:textColor">@*android:color/system_error</item>
+        <item name="android:textColor">?android:attr/colorError</item>
     </style>
 
     <style name="TextAppearance.SupportTitle"
@@ -354,7 +354,7 @@
 
     <style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
         parent="android:TextAppearance.Material.Body1">
-        <item name="android:textColor">@*android:color/system_error</item>
+        <item name="android:textColor">?android:attr/colorError</item>
     </style>
 
     <style name="TextAppearance.Small.SwitchBar">
@@ -429,4 +429,30 @@
     </style>
 
     <style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
+
+    <style name="LockPatternStyle">
+        <item name="*android:regularColor">@color/lock_pattern_view_regular_color</item>
+        <item name="*android:successColor">@color/lock_pattern_view_success_color</item>
+        <item name="*android:errorColor">?android:attr/colorError</item>
+    </style>
+
+    <style name="LockPatternStyle.Dark">
+        <item name="*android:regularColor">@color/lock_pattern_view_regular_color_dark</item>
+        <item name="*android:successColor">@color/lock_pattern_view_regular_color_dark</item>
+    </style>
+
+    <style name="LockPatternStyle.Dark.Work">
+        <item name="*android:regularColor">@*android:color/white</item>
+    </style>
+
+    <style name="LockPatternStyle.Unlock">
+        <item name="*android:regularColor">@color/unlock_pattern_view_regular_color</item>
+        <item name="*android:successColor">@color/unlock_pattern_view_success_color</item>
+    </style>
+
+    <style name="LockPatternStyle.Setup">
+        <item name="*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>
+        <item name="*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>
+    </style>
+
 </resources>
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index a78d87b..e7c2852 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -21,35 +21,44 @@
 
     <dimen name="preference_no_icon_padding_start">72dp</dimen>
 
-    <style name="ApnPreference">
+    <!-- Fragment style -->
+    <style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment.Material">
+        <item name="android:layout">@layout/preference_list_fragment</item>
+        <item name="allowDividerAfterLastItem">false</item>
+    </style>
+
+    <!-- Preferences -->
+    <style name="SettingsPreference">
+        <item name="allowDividerAbove">false</item>
+        <item name="allowDividerBelow">true</item>
+        <item name="android:layout">@layout/preference_material_settings</item>
+    </style>
+
+    <style name="ApnPreference" parent="SettingsPreference">
         <item name="android:layout">@layout/apn_preference_layout</item>
     </style>
 
     <style name="EditTextPreference"
            parent="@style/Preference.DialogPreference.EditTextPreference.Material">
+        <item name="allowDividerAbove">false</item>
+        <item name="allowDividerBelow">true</item>
         <item name="android:layout">@layout/preference_material_settings</item>
         <item name="android:dialogLayout">@layout/preference_dialog_edittext</item>
     </style>
 
-    <style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment.Material">
-        <item name="android:layout">@layout/preference_list_fragment</item>
-    </style>
-
-    <style name="SettingsPreference">
-        <item name="android:layout">@layout/preference_material_settings</item>
-    </style>
-
-    <style name="SettingsDropdownPreference">
+    <style name="SettingsDropdownPreference" parent="SettingsPreference">
         <item name="android:layout">@layout/preference_dropdown_material_settings</item>
     </style>
 
-    <style name="SettingsDialogPreference" parent="SettingsPreference"/>
+    <style name="SettingsDialogPreference" parent="SettingsPreference" />
 
     <style name="SettingsPreferenceCategory" parent="@style/Preference.Category.Material">
+        <item name="allowDividerAbove">true</item>
+        <item name="allowDividerBelow">true</item>
         <item name="android:layout">@layout/preference_category_material_settings</item>
     </style>
 
-    <style name="SettingsSeekBarPreference">
+    <style name="SettingsSeekBarPreference" parent="SettingsPreference">
         <item name="android:layout">@layout/preference_widget_seekbar_settings</item>
     </style>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index fe5b3ca..c961cce 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -40,9 +40,7 @@
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <!-- LockPatternView colors -->
-        <item name="*android:regularColor">@color/setup_lock_pattern_view_regular_color_dark</item>
-        <item name="*android:successColor">@color/setup_lock_pattern_view_success_color_dark</item>
-        <item name="*android:errorColor">@color/setup_lock_pattern_view_error_color_dark</item>
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
     </style>
 
     <style name="SetupWizardTheme.Light" parent="SuwThemeGlif.Light">
@@ -62,10 +60,7 @@
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
-        <!-- LockPatternView colors -->
-        <item name="*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>
-        <item name="*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>
-        <item name="*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
     </style>
 
     <style name="SetupWizardTheme.Transparent" parent="SetupWizardTheme">
@@ -152,10 +147,7 @@
         <!-- For all Alert Dialogs -->
         <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
 
-        <!-- LockPatternView colors -->
-        <item name="*android:regularColor">@color/lock_pattern_view_regular_color</item>
-        <item name="*android:successColor">@color/lock_pattern_view_success_color</item>
-        <item name="*android:errorColor">@color/lock_pattern_view_error_color</item>
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
     </style>
 
     <style name="Theme.SubSettings" parent="Theme.Settings">
@@ -201,10 +193,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:background">@android:color/black</item>
 
-        <!-- LockPatternView colors -->
-        <item name="*android:regularColor">@color/unlock_pattern_view_regular_color</item>
-        <item name="*android:successColor">@color/unlock_pattern_view_success_color</item>
-        <item name="*android:errorColor">@color/unlock_pattern_view_error_color</item>
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Unlock</item>
     </style>
 
     <style name="ThemeOverlay.AlertDialog" parent="@android:style/ThemeOverlay.Material.Dialog.Alert">
@@ -240,15 +229,13 @@
         <item name="confirmDeviceCredentialsSideMargin">32dp</item>
         <item name="confirmDeviceCredentialsTopMargin">32dp</item>
 
-        <!-- LockPatternView colors -->
-        <item name="*android:regularColor">@color/lock_pattern_view_regular_color_dark</item>
-        <item name="*android:successColor">@color/lock_pattern_view_regular_color_dark</item>
-        <item name="*android:errorColor">@color/lock_pattern_view_error_color</item>
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Dark</item>
 
         <item name="android:windowAnimationStyle">@style/ConfirmDeviceCredentialsAnimationStyle</item>
     </style>
+
     <style name="Theme.ConfirmDeviceCredentialsWork" parent="Theme.ConfirmDeviceCredentialsDark">
-        <item name="*android:regularColor">@*android:color/white</item>
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Dark.Work</item>
         <item name="android:colorAccent">@*android:color/white</item>
     </style>
 
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index fb9e171..ee21017 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -67,11 +67,6 @@
                 android:persistent="false"/>
 
         <SwitchPreference
-                android:key="toggle_speak_password_preference"
-                android:title="@string/accessibility_toggle_speak_password_preference_title"
-                android:persistent="false"/>
-
-        <SwitchPreference
                 android:key="toggle_large_pointer_icon"
                 android:title="@string/accessibility_toggle_large_pointer_icon_title" />
 
diff --git a/res/xml/account_settings.xml b/res/xml/account_settings.xml
deleted file mode 100644
index 33f61a2..0000000
--- a/res/xml/account_settings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:key="account"
-        android:title="@string/account_settings_title"
-        settings:keywords="@string/keywords_accounts">
-</PreferenceScreen>
diff --git a/res/xml/app_default_settings.xml b/res/xml/app_default_settings.xml
index 359d4f7..a382bc9 100644
--- a/res/xml/app_default_settings.xml
+++ b/res/xml/app_default_settings.xml
@@ -23,7 +23,7 @@
     <Preference
         android:key="assist_and_voice_input"
         android:title="@string/assist_and_voice_input_title"
-        android:fragment="com.android.settings.applications.ManageAssist"
+        android:fragment="com.android.settings.applications.assist.ManageAssist"
         android:order="-20"/>
 
     <Preference
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 57395b4..955802d 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -166,6 +166,11 @@
             android:entries="@array/select_logpersist_titles"
             android:entryValues="@array/select_logpersist_values" />
 
+        <SwitchPreference
+            android:key="telephony_monitor_switch"
+            android:title="@string/telephony_monitor_switch"
+            android:summary="@string/telephony_monitor_switch_summary"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_networking_category"
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index cee2e70..7482031 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -15,19 +15,11 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/about_settings">
 
         <!-- System update settings - launches activity -->
-        <Preference android:key="system_update_settings"
-                android:title="@string/system_update_settings_list_item_title"
-                android:summary="@string/system_update_settings_list_item_summary">
-            <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
-        </Preference>
-
-
         <Preference android:key="additional_system_update_settings"
-                          android:title="@string/additional_system_update_settings_list_item_title">
+                    android:title="@string/additional_system_update_settings_list_item_title">
             <intent android:action="android.intent.action.MAIN"
                     android:targetPackage="@string/additional_system_update"
                     android:targetClass="@string/additional_system_update_menu" />
@@ -48,7 +40,7 @@
 
         <!-- Legal Information -->
         <Preference
-                android:key="container"
+                android:key="legal_container"
                 android:title="@string/legal_information"
                 android:fragment="com.android.settings.LegalSettings" />
 
@@ -69,20 +61,13 @@
                 android:title="@string/device_feedback" />
 
         <!-- Device hardware model -->
-        <com.android.settings.DividerPreference
+        <Preference
                 android:key="device_model"
-                android:enabled="false"
-                android:shouldDisableView="false"
-                android:selectable="false"
                 android:title="@string/model_info"
-                android:summary="@string/device_info_default"
-                settings:allowDividerAbove="true"
-                settings:allowDividerBelow="true"/>
+                android:summary="@string/device_info_default"/>
 
         <!-- Device firmware version -->
         <Preference android:key="firmware_version"
-                android:enabled="false"
-                android:shouldDisableView="false"
                 android:title="@string/firmware_version"
                 android:summary="@string/device_info_default"/>
 
@@ -95,54 +80,33 @@
         </Preference>
 
         <!-- Device FCC equipment id -->
-        <com.android.settings.DividerPreference
+        <Preference
                 android:key="fcc_equipment_id"
-                android:enabled="false"
-                android:shouldDisableView="false"
-                android:selectable="false"
                 android:title="@string/fcc_equipment_id"
-                android:summary="@string/device_info_default"
-                settings:allowDividerAbove="true"
-                settings:allowDividerBelow="true"/>
+                android:summary="@string/device_info_default"/>
 
         <!-- Device Baseband version -->
-        <com.android.settings.DividerPreference
+        <Preference
                 android:key="baseband_version"
-                android:enabled="false"
-                android:shouldDisableView="false"
-                android:selectable="false"
                 android:title="@string/baseband_version"
-                android:summary="@string/device_info_default"
-                settings:allowDividerAbove="true"
-                settings:allowDividerBelow="true"/>
+                android:summary="@string/device_info_default"/>
 
         <!-- Device Kernel version -->
-        <com.android.settings.DividerPreference
+        <Preference
                 android:key="kernel_version"
-                android:enabled="false"
-                android:shouldDisableView="false"
-                android:selectable="false"
                 android:title="@string/kernel_version"
-                android:summary="@string/device_info_default"
-                settings:allowDividerAbove="true"
-                settings:allowDividerBelow="true"/>
+                android:summary="@string/device_info_default"/>
 
         <!-- Detailed build version -->
-        <Preference android:key="build_number"
-                android:enabled="false"
-                android:shouldDisableView="false"
+        <Preference
+                android:key="build_number"
                 android:title="@string/build_number"
                 android:summary="@string/device_info_default"/>
 
         <!-- SELinux status information -->
-        <com.android.settings.DividerPreference
+        <Preference
                 android:key="selinux_status"
-                android:enabled="false"
-                android:shouldDisableView="false"
-                android:selectable="false"
                 android:title="@string/selinux_status"
-                android:summary="@string/selinux_status_enforcing"
-                settings:allowDividerAbove="true"
-                settings:allowDividerBelow="true"/>
+                android:summary="@string/selinux_status_enforcing"/>
 
 </PreferenceScreen>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
deleted file mode 100644
index 2632c78..0000000
--- a/res/xml/display_settings.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/display_settings"
-        settings:keywords="@string/keywords_display">
-
-        <Preference
-                android:key="brightness"
-                android:title="@string/brightness"
-                settings:keywords="@string/keywords_display_brightness_level">
-            <intent android:action="android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
-        </Preference>
-
-        <SwitchPreference
-                android:key="auto_brightness"
-                android:title="@string/auto_brightness_title"
-                settings:keywords="@string/keywords_display_auto_brightness"
-                android:summary="@string/auto_brightness_summary" />
-
-        <com.android.settings.display.NightDisplayPreference
-                android:key="night_display"
-                android:title="@string/night_display_title"
-                android:fragment="com.android.settings.display.NightDisplaySettings"
-                settings:widgetLayout="@null"
-                settings:keywords="@string/keywords_display_night_display" />
-
-        <!-- Hide night mode for now
-        <ListPreference
-            android:key="night_mode"
-            android:title="@string/night_mode_title"
-            settings:keywords="@string/keywords_display_night_mode"
-            android:summary="@string/night_mode_summary"
-            android:entries="@array/night_mode_entries"
-            android:entryValues="@array/night_mode_values" /> -->
-
-        <com.android.settingslib.RestrictedPreference
-                android:key="wallpaper"
-                android:title="@string/wallpaper_settings_title"
-                settings:keywords="@string/keywords_display_wallpaper"
-                settings:useAdminDisabledSummary="true" >
-                <intent
-                        android:targetPackage="@string/config_wallpaper_picker_package"
-                        android:targetClass="@string/config_wallpaper_picker_class" />
-        </com.android.settingslib.RestrictedPreference>
-
-        <com.android.settings.TimeoutListPreference
-                android:key="screen_timeout"
-                android:title="@string/screen_timeout"
-                android:summary="@string/screen_timeout_summary"
-                android:entries="@array/screen_timeout_entries"
-                android:entryValues="@array/screen_timeout_values" />
-
-        <SwitchPreference
-                android:key="camera_gesture"
-                android:title="@string/camera_gesture_title"
-                android:summary="@string/camera_gesture_desc" />
-
-        <Preference
-                android:key="screensaver"
-                android:title="@string/screensaver_settings_title"
-                android:fragment="com.android.settings.DreamSettings" />
-
-        <SwitchPreference
-                android:key="lift_to_wake"
-                android:title="@string/lift_to_wake_title" />
-
-        <SwitchPreference
-                android:key="doze"
-                android:title="@string/doze_title"
-                android:summary="@string/doze_summary" />
-
-        <SwitchPreference
-                android:key="tap_to_wake"
-                android:title="@string/tap_to_wake"
-                android:summary="@string/tap_to_wake_summary" />
-
-        <Preference
-                android:key="font_size"
-                android:title="@string/title_font_size"
-                android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
-                settings:keywords="@string/keywords_display_font_size" />
-
-        <com.android.settings.display.ScreenZoomPreference
-                android:key="screen_zoom"
-                android:title="@string/screen_zoom_title"
-                settings:keywords="@string/screen_zoom_keywords" />
-
-        <DropDownPreference
-                android:key="auto_rotate"
-                android:summary="%s"
-                android:title="@string/display_auto_rotate_title" />
-
-        <Preference
-                android:key="wifi_display"
-                android:title="@string/wifi_display_settings_title"
-                settings:keywords="@string/keywords_display_cast_screen"
-                android:fragment="com.android.settings.wfd.WifiDisplaySettings" />
-
-        <DropDownPreference
-                android:key="vr_display_pref"
-                android:summary="%s"
-                android:title="@string/display_vr_pref_title" />
-
-</PreferenceScreen>
diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
new file mode 100644
index 0000000..a84c2a1
--- /dev/null
+++ b/res/xml/encryption_and_credential.xml
@@ -0,0 +1,65 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/encryption_and_credential_settings_title">
+
+    <PreferenceCategory android:key="credentials_management"
+            android:title="@string/credentials_title"
+            android:persistent="false"
+            android:order="100">
+
+        <com.android.settingslib.RestrictedPreference android:key="credential_storage_type"
+                android:title="@string/credential_storage_type"
+                android:persistent="false" />
+
+        <Preference android:key="trusted_credentials"
+                android:title="@string/trusted_credentials"
+                android:summary="@string/trusted_credentials_summary"
+                android:persistent="false"
+                android:fragment="com.android.settings.TrustedCredentialsSettings"/>
+
+        <com.android.settingslib.RestrictedPreference android:key="user_credentials"
+                android:title="@string/user_credentials"
+                android:summary="@string/user_credentials_summary"
+                android:persistent="false"
+                android:fragment="com.android.settings.UserCredentialsSettings"/>
+
+        <com.android.settingslib.RestrictedPreference android:key="credentials_install"
+                android:title="@string/credentials_install"
+                android:summary="@string/credentials_install_summary"
+                android:persistent="false">
+
+            <intent android:action="android.credentials.INSTALL"
+                    android:targetPackage="com.android.certinstaller"
+                    android:targetClass="com.android.certinstaller.CertInstallerMain"/>
+
+        </com.android.settingslib.RestrictedPreference>
+
+        <com.android.settingslib.RestrictedPreference android:key="credentials_reset"
+                android:title="@string/credentials_reset"
+                android:summary="@string/credentials_reset_summary"
+                android:persistent="false">
+
+            <intent android:action="com.android.credentials.RESET"
+                    android:targetPackage="com.android.settings"
+                    android:targetClass="com.android.settings.CredentialStorage"/>
+
+        </com.android.settingslib.RestrictedPreference>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml
index cc63d5f..bfb1247 100644
--- a/res/xml/enterprise_privacy_settings.xml
+++ b/res/xml/enterprise_privacy_settings.xml
@@ -106,5 +106,13 @@
                 android:title="@string/enterprise_privacy_wipe_device"
                 settings:allowDividerBelow="true"
                 settings:multiLine="true"/>
+        <com.android.settings.DividerPreference
+                android:key="failed_password_wipe_primary_user"
+                settings:allowDividerBelow="true"
+                settings:multiLine="true"/>
+        <com.android.settings.DividerPreference
+                android:key="failed_password_wipe_managed_profile"
+                settings:allowDividerBelow="true"
+                settings:multiLine="true"/>
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/gesture_settings.xml b/res/xml/gesture_settings.xml
deleted file mode 100644
index 808c9b2..0000000
--- a/res/xml/gesture_settings.xml
+++ /dev/null
@@ -1,64 +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:title="@string/gesture_preference_title"
-    settings:keywords="@string/keywords_gesture">
-
-    <com.android.settings.gestures.GesturePreference
-        android:key="gesture_assist"
-        android:title="@string/assist_gesture_title"
-        android:summary="@string/assist_gesture_summary"
-        settings:animation="@raw/gesture_assist"
-        settings:preview="@drawable/gesture_assist"/>
-
-    <com.android.settings.gestures.GesturePreference
-        android:key="gesture_swipe_down_fingerprint"
-        android:title="@string/fingerprint_swipe_for_notifications_title"
-        android:summary="@string/fingerprint_swipe_for_notifications_summary"
-        settings:animation="@raw/gesture_fingerprint_swipe"
-        settings:preview="@drawable/gesture_fingerprint_swipe"/>
-
-    <com.android.settings.gestures.GesturePreference
-        android:key="gesture_double_tap_power"
-        android:title="@string/double_tap_power_for_camera_title"
-        android:summary="@string/double_tap_power_for_camera_summary"
-        settings:animation="@raw/gesture_double_tap"
-        settings:preview="@drawable/gesture_double_tap"/>
-
-    <com.android.settings.gestures.GesturePreference
-        android:key="gesture_double_twist"
-        android:title="@string/double_twist_for_camera_mode_title"
-        android:summary="@string/double_twist_for_camera_mode_summary"
-        settings:animation="@raw/gesture_twist"
-        settings:preview="@drawable/gesture_twist"/>
-
-    <com.android.settings.gestures.GesturePreference
-        android:key="gesture_double_tap_screen"
-        android:title="@string/ambient_display_title"
-        android:summary="@string/ambient_display_summary"
-        settings:animation="@raw/gesture_ambient_tap"
-        settings:preview="@drawable/gesture_ambient_tap"/>
-
-    <com.android.settings.gestures.GesturePreference
-        android:key="gesture_pick_up"
-        android:title="@string/ambient_display_pickup_title"
-        android:summary="@string/ambient_display_pickup_summary"
-        settings:animation="@raw/gesture_ambient_lift"
-        settings:preview="@drawable/gesture_ambient_lift"/>
-
-</PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
deleted file mode 100644
index 8aa105b..0000000
--- a/res/xml/language_settings.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:key="language_keyboard_settings"
-                  android:title="@string/language_keyboard_settings_title">
-
-    <Preference
-            android:key="phone_language"
-            android:title="@string/phone_language"
-            android:fragment="com.android.settings.localepicker.LocaleListEditor"
-            />
-
-    <!-- Spell checker preference title, summary and fragment will be set programmatically. -->
-    <!-- Note: Mark this as persistent="false" to remove unnecessarily saved shared preference.
-         See: InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference. -->
-    <Preference
-        android:key="spellcheckers_settings"
-        android:title="@string/spellcheckers_settings_title"
-        android:fragment="com.android.settings.inputmethod.SpellCheckersSettings"
-        android:persistent="false"/>
-
-    <!-- User dictionary preference title and fragment will be set programmatically. -->
-    <Preference
-            android:key="key_user_dictionary_settings"
-            android:title="@string/user_dict_settings_title"
-            />
-
-    <PreferenceCategory
-        android:title="@string/keyboard_and_input_methods_category">
-        <Preference
-            android:title="@string/virtual_keyboard_category"
-            android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment" />
-        <Preference
-            android:title="@string/physical_keyboard_title"
-            android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:key="voice_category"
-            android:title="@string/voice_category" >
-
-        <Preference
-                android:key="tts_settings"
-                android:title="@string/tts_settings_title"
-                android:fragment="com.android.settings.tts.TextToSpeechSettings"
-                />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:key="pointer_settings_category"
-            android:title="@string/pointer_settings_category">
-
-        <com.android.settings.PointerSpeedPreference
-                android:key="pointer_speed"
-                android:title="@string/pointer_speed"
-                android:dialogTitle="@string/pointer_speed"
-                />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:key="game_controller_settings_category"
-            android:title="@string/game_controller_settings_category">
-
-        <SwitchPreference
-                android:key="vibrate_input_devices"
-                android:title="@string/vibrate_input_devices"
-                android:summaryOn="@string/vibrate_input_devices_summary"
-                android:summaryOff="@string/vibrate_input_devices_summary"
-                />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/manage_accounts_settings.xml b/res/xml/manage_accounts_settings.xml
deleted file mode 100644
index 810fa7a..0000000
--- a/res/xml/manage_accounts_settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/account_settings" />
-</PreferenceScreen>
diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index 0ba87b5..eadf45f 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -19,10 +19,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/assist_and_voice_input_title">
 
-    <com.android.settings.applications.DefaultAssistPreference
+    <com.android.settings.widget.GearPreference
         android:key="default_assist"
         android:title="@string/default_assist_title"
-        android:summary="@string/default_assist_none"/>
+        android:summary="@string/app_list_preference_none"
+        android:fragment="com.android.settings.applications.assist.DefaultAssistPicker"/>
 
     <Preference
         android:key="gesture_assist"
@@ -36,7 +37,6 @@
 
     <SwitchPreference
         android:key="screenshot"
-        android:dependency="context"
         android:title="@string/assist_access_screenshot_title"
         android:summary="@string/assist_access_screenshot_summary"/>
 
@@ -45,8 +45,9 @@
         android:title="@string/assist_flash_title"
         android:summary="@string/assist_flash_summary"/>
 
-    <com.android.settings.voice.VoiceInputListPreference
+    <com.android.settings.widget.GearPreference
         android:key="voice_input_settings"
-        android:title="@string/voice_input_settings_title"/>
+        android:title="@string/voice_input_settings_title"
+        android:fragment="com.android.settings.applications.assist.DefaultVoiceInputPicker"/>
 
 </PreferenceScreen>
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index b6808c0..58cab77 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -55,4 +55,22 @@
         android:key="app_list"
         android:title="@string/power_usage_list_summary"/>
 
+    <PreferenceCategory
+        android:key="device_usage_list"
+        android:title="@string/device_usage_list_summary">
+
+        <Preference
+            android:key="screen_usage"
+            android:title="@string/device_screen_usage"/>
+
+        <Preference
+            android:key="screen_consumption"
+            android:title="@string/device_screen_consumption"/>
+
+        <Preference
+            android:key="cellular_network"
+            android:title="@string/device_cellular_network"/>
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index aefbbd8..544769d 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -15,28 +15,17 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
         android:title="@string/security_settings_title">
 
-    <PreferenceCategory android:key="sim_lock"
-            android:title="@string/sim_lock_settings_title"
-            android:persistent="false">
-
-        <Preference android:key="sim_lock_settings"
-                android:title="@string/sim_lock_settings_category"
-                android:persistent="false">
-
-            <intent android:action="android.intent.action.MAIN"
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.Settings$IccLockSettingsActivity"/>
-
-        </Preference>
-
-    </PreferenceCategory>
-
     <PreferenceCategory android:title="@string/security_passwords_title"
             android:persistent="false">
 
+        <Preference
+            android:key="location"
+            android:title="@string/location_settings_title">
+            <intent android:action="android.settings.LOCATION_SOURCE_SETTINGS"/>
+        </Preference>
+
         <SwitchPreference android:key="show_password"
                 android:title="@string/show_password"/>
 
@@ -54,74 +43,39 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:key="credentials_management"
-            android:title="@string/credentials_title"
-            android:persistent="false">
+    <Preference android:key="sim_lock_settings"
+        android:title="@string/sim_lock_settings_category"
+        android:persistent="false">
 
-        <com.android.settingslib.RestrictedPreference android:key="credential_storage_type"
-                android:title="@string/credential_storage_type"
-                android:persistent="false" />
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.Settings$IccLockSettingsActivity"/>
 
-        <Preference android:key="trusted_credentials"
-                android:title="@string/trusted_credentials"
-                android:summary="@string/trusted_credentials_summary"
-                android:persistent="false"
-                android:fragment="com.android.settings.TrustedCredentialsSettings"/>
+    </Preference>
 
-        <com.android.settingslib.RestrictedPreference android:key="user_credentials"
-                android:title="@string/user_credentials"
-                android:summary="@string/user_credentials_summary"
-                android:persistent="false"
-                android:fragment="com.android.settings.UserCredentialsSettings"/>
+    <Preference
+        android:key="encryption_and_credential"
+        android:title="@string/encryption_and_credential_settings_title"
+        android:fragment="com.android.settings.EncryptionAndCredential"/>
 
-        <com.android.settingslib.RestrictedPreference android:key="credentials_install"
-                android:title="@string/credentials_install"
-                android:summary="@string/credentials_install_summary"
-                android:persistent="false">
+    <Preference android:key="manage_trust_agents"
+        android:title="@string/manage_trust_agents"
+        android:summary="@string/manage_trust_agents_summary"
+        android:persistent="false"
+        android:fragment="com.android.settings.TrustAgentSettings"/>
 
-            <intent android:action="android.credentials.INSTALL"
-                    android:targetPackage="com.android.certinstaller"
-                    android:targetClass="com.android.certinstaller.CertInstallerMain"/>
+    <Preference
+        android:key="screen_pinning_settings"
+        android:title="@string/screen_pinning_title"
+        android:summary="@string/switch_off_text"
+        android:fragment="com.android.settings.ScreenPinningSettings"/>
 
-        </com.android.settingslib.RestrictedPreference>
-
-        <com.android.settingslib.RestrictedPreference android:key="credentials_reset"
-                android:title="@string/credentials_reset"
-                android:summary="@string/credentials_reset_summary"
-                android:persistent="false">
-
-            <intent android:action="com.android.credentials.RESET"
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.CredentialStorage"/>
-
-        </com.android.settingslib.RestrictedPreference>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:key="advanced_security"
-            android:title="@string/advanced_security_title"
-            android:persistent="false">
-
-        <Preference android:key="manage_trust_agents"
-                android:title="@string/manage_trust_agents"
-                android:summary="@string/manage_trust_agents_summary"
-                android:persistent="false"
-                android:fragment="com.android.settings.TrustAgentSettings"/>
-
-        <Preference
-                android:key="screen_pinning_settings"
-                android:title="@string/screen_pinning_title"
-                android:summary="@string/switch_off_text"
-                android:fragment="com.android.settings.ScreenPinningSettings"/>
-
-        <Preference android:key="usage_access"
-                    android:title="@string/usage_access_title"
-                    android:fragment="com.android.settings.applications.ManageApplications">
-            <extra
-                android:name="classname"
-                android:value="com.android.settings.Settings$UsageAccessSettingsActivity" />
-        </Preference>
-
-    </PreferenceCategory>
+    <Preference android:key="usage_access"
+        android:title="@string/usage_access_title"
+        android:fragment="com.android.settings.applications.ManageApplications">
+        <extra
+            android:name="classname"
+            android:value="com.android.settings.Settings$UsageAccessSettingsActivity" />
+    </Preference>
 
 </PreferenceScreen>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
deleted file mode 100644
index c74d1f1..0000000
--- a/res/xml/sound_settings.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-          android:title="@string/sound_settings"
-          android:key="sound_settings"
-          settings:keywords="@string/keywords_sounds">
-
-        <!-- Media volume -->
-        <com.android.settings.notification.VolumeSeekBarPreference
-                android:key="media_volume"
-                android:icon="@*android:drawable/ic_audio_media"
-                android:title="@string/media_volume_option_title" />
-
-        <!-- Alarm volume -->
-        <com.android.settings.notification.VolumeSeekBarPreference
-                android:key="alarm_volume"
-                android:icon="@*android:drawable/ic_audio_alarm"
-                android:title="@string/alarm_volume_option_title" />
-
-        <!-- Ring volume -->
-        <com.android.settings.notification.VolumeSeekBarPreference
-                android:key="ring_volume"
-                android:icon="@*android:drawable/ic_audio_ring_notif"
-                android:title="@string/ring_volume_option_title" />
-
-        <!-- Notification volume -->
-        <com.android.settings.notification.VolumeSeekBarPreference
-                android:key="notification_volume"
-                android:icon="@*android:drawable/ic_audio_ring_notif"
-                android:title="@string/notification_volume_option_title" />
-
-        <!-- Also vibrate for calls -->
-        <SwitchPreference
-                android:key="vibrate_when_ringing"
-                android:title="@string/vibrate_when_ringing_title" />
-
-
-        <!-- Interruptions -->
-        <com.android.settingslib.RestrictedPreference
-                android:key="zen_mode"
-                android:title="@string/zen_mode_settings_title"
-                settings:useAdminDisabledSummary="true"
-                settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
-                android:fragment="com.android.settings.notification.ZenModeSettings" />
-
-        <!-- Phone ringtone -->
-        <com.android.settings.DefaultRingtonePreference
-                android:key="ringtone"
-                android:title="@string/ringtone_title"
-                android:dialogTitle="@string/ringtone_title"
-                android:summary="@string/ringtone_summary"
-                android:ringtoneType="ringtone" />
-
-        <!-- Default notification ringtone -->
-        <com.android.settings.DefaultRingtonePreference
-                android:key="notification_ringtone"
-                android:title="@string/notification_ringtone_title"
-                android:dialogTitle="@string/notification_ringtone_title"
-                android:summary="@string/ringtone_summary"
-                android:ringtoneType="notification" />
-
-        <!-- Default alarm ringtone -->
-        <com.android.settings.DefaultRingtonePreference
-                android:key="alarm_ringtone"
-                android:title="@string/alarm_ringtone_title"
-                android:dialogTitle="@string/alarm_ringtone_title"
-                android:summary="@string/ringtone_summary"
-                android:persistent="false"
-                android:ringtoneType="alarm" />
-
-        <com.android.settingslib.RestrictedPreference
-                android:key="cell_broadcast_settings"
-                android:title="@string/cell_broadcast_settings"
-                settings:useAdminDisabledSummary="true">
-                    <intent
-                        android:action="android.intent.action.MAIN"
-                        android:targetPackage="com.android.cellbroadcastreceiver"
-                        android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
-        </com.android.settingslib.RestrictedPreference>
-
-        <!-- Other sounds -->
-        <Preference
-                android:key="other_sounds"
-                android:title="@string/other_sound_settings"
-                android:persistent="false"
-                android:fragment="com.android.settings.notification.OtherSoundSettings" />
-
-        <!-- Cast -->
-        <Preference
-                android:key="wifi_display"
-                android:title="@string/wifi_display_settings_title"
-                android:fragment="com.android.settings.wfd.WifiDisplaySettings" />
-
-</PreferenceScreen>
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index e08ca96..fedc77f 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -16,37 +16,50 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/storage_settings">
+    android:title="@string/storage_settings"
+    android:orderingFromXml="false">
     <com.android.settings.deviceinfo.storage.StorageSummaryDonutPreference
-        android:key="pref_summary" />
+        android:key="pref_summary"
+        android:order="0" />
     <com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
         android:key="pref_photos_videos"
-        android:title="@string/storage_photos_videos">
+        android:title="@string/storage_photos_videos"
+        android:order="1" >
     </com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
     <com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
         android:key="pref_music_audio"
-        android:title="@string/storage_music_audio">
+        android:title="@string/storage_music_audio"
+        android:order="2" >
     </com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
     <com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
         android:key="pref_games"
-        android:title="@string/storage_games">
+        android:title="@string/storage_games"
+        android:order="3" >
     </com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
     <com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
         android:key="pref_other_apps"
-        android:title="@string/storage_other_apps">
+        android:title="@string/storage_other_apps"
+        android:order="4" >
     </com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
     <com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
         android:key="pref_files"
-        android:title="@string/storage_files">
+        android:title="@string/storage_files"
+        android:order="5" >
     </com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
     <com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
         android:key="pref_system"
-        android:title="@string/storage_detail_system">
+        android:title="@string/storage_detail_system"
+        android:order="100" >
     </com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
+    <PreferenceCategory
+        android:key="pref_secondary_users"
+        android:title="@string/storage_other_users"
+        android:order="200" />
     <Preference
         android:key="manage_storage"
         android:title="@string/storage_menu_manage"
         android:icon="@drawable/ic_settings_storage"
-        android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings">
+        android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings"
+        android:order="300" >
     </Preference>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/storage_profile_fragment.xml b/res/xml/storage_profile_fragment.xml
new file mode 100644
index 0000000..d0c5c3a
--- /dev/null
+++ b/res/xml/storage_profile_fragment.xml
@@ -0,0 +1,41 @@
+<?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.
+-->
+
+<!-- Layout for the storage breakdown for a profile of the primary user. -->
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/storage_settings">
+    <com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
+        android:key="pref_photos_videos"
+        android:title="@string/storage_photos_videos">
+    </com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
+    <com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
+        android:key="pref_music_audio"
+        android:title="@string/storage_music_audio">
+    </com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
+    <com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
+        android:key="pref_games"
+        android:title="@string/storage_games">
+    </com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
+    <com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
+        android:key="pref_other_apps"
+        android:title="@string/storage_other_apps">
+    </com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
+    <com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
+        android:key="pref_files"
+        android:title="@string/storage_files">
+    </com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
+</PreferenceScreen>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 45d0b90..06b73a0 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -28,14 +28,4 @@
             android:title="@string/user_add_user_or_profile_menu"
             android:icon="@drawable/ic_menu_add" />
 
-    <PreferenceCategory
-            android:key="lock_screen_settings"
-            android:title="@string/user_lockscreen_settings">
-        <com.android.settingslib.RestrictedSwitchPreference
-                android:key="add_users_when_locked"
-                android:title="@string/user_add_on_lockscreen_menu" />
-    </PreferenceCategory>
-    <Preference
-        android:key="emergency_info"
-        android:title="@string/emergency_info_title" />
 </PreferenceScreen>
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index a874020..bf1dc75 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -15,24 +15,26 @@
 -->
 
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/wifi_configure_titlebar">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/wifi_configure_titlebar">
 
     <SwitchPreference
             android:key="enable_wifi_wakeup"
             android:title="@string/wifi_wakeup"
+            android:icon="@drawable/ic_settings_home"
             android:summary="@string/wifi_wakeup_summary" />
 
     <SwitchPreference
-        android:key="notify_open_networks"
-        android:title="@string/wifi_notify_open_networks"
-        android:summary="@string/wifi_notify_open_networks_summary" />
+            android:key="notify_open_networks"
+            android:title="@string/wifi_notify_open_networks"
+            android:icon="@drawable/ic_settings_notifications"
+            android:summary="@string/wifi_notify_open_networks_summary" />
 
     <SwitchPreference
-        android:key="wifi_cellular_data_fallback"
-        android:title="@string/wifi_cellular_data_fallback_title"
-        android:summary="@string/wifi_cellular_data_fallback_summary"/>
+            android:key="wifi_cellular_data_fallback"
+            android:title="@string/wifi_cellular_data_fallback_title"
+            android:summary="@string/wifi_cellular_data_fallback_summary"/>
 
     <ListPreference
             android:key="sleep_policy"
@@ -51,10 +53,10 @@
     </Preference>
 
     <Preference
-        android:key="wifi_calling_settings"
-        android:title="@string/wifi_calling_settings_title"
-        android:fragment="com.android.settings.WifiCallingSettings"
-        settings:keywords="@string/keywords_wifi_calling"/>
+            android:key="wifi_calling_settings"
+            android:title="@string/wifi_calling_settings_title"
+            android:fragment="com.android.settings.WifiCallingSettings"
+            settings:keywords="@string/keywords_wifi_calling"/>
 
     <Preference
             android:key="wifi_direct"
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
deleted file mode 100644
index e94db56..0000000
--- a/res/xml/wireless_settings.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/radio_controls_title">
-
-    <SwitchPreference
-        android:key="toggle_airplane"
-        android:title="@string/airplane_mode"
-        android:disableDependentsState="true" />
-
-    <SwitchPreference
-        android:key="toggle_nfc"
-        android:title="@string/nfc_quick_toggle_title"
-        android:summary="@string/nfc_quick_toggle_summary" />
-
-    <PreferenceScreen
-        android:key="wifi_calling_settings"
-        android:title="@string/wifi_calling_settings_title"
-        settings:keywords="@string/keywords_wifi_calling"
-        android:fragment="com.android.settings.WifiCallingSettings" />
-
-    <com.android.settingslib.RestrictedPreference
-        android:fragment="com.android.settings.nfc.AndroidBeam"
-        android:key="android_beam_settings"
-        android:title="@string/android_beam_settings_title" />
-
-    <com.android.settingslib.RestrictedPreference
-        android:fragment="com.android.settings.TetherSettings"
-        android:key="tether_settings"
-        android:title="@string/tether_settings_title_all"
-        settings:userRestriction="no_config_tethering"
-        settings:useAdminDisabledSummary="true" />
-
-    <com.android.settingslib.RestrictedPreference
-        android:fragment="com.android.settings.vpn2.VpnSettings"
-        android:key="vpn_settings"
-        android:title="@string/vpn_settings_title"
-        settings:userRestriction="no_config_vpn"
-        settings:useAdminDisabledSummary="true" />
-
-    <com.android.settingslib.RestrictedPreference
-        android:key="mobile_network_settings"
-        android:title="@string/network_settings_title"
-        settings:keywords="@string/keywords_more_mobile_networks"
-        settings:userRestriction="no_config_mobile_networks"
-        settings:useAdminDisabledSummary="true"
-        android:dependency="toggle_airplane">
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.phone"
-            android:targetClass="com.android.phone.MobileNetworkSettings" />
-    </com.android.settingslib.RestrictedPreference>
-
-    <com.android.settingslib.RestrictedPreference
-        android:key="manage_mobile_plan"
-        android:title="@string/manage_mobile_plan_title"
-        android:persistent="false"
-        settings:userRestriction="no_config_mobile_networks"
-        settings:useAdminDisabledSummary="true" />
-
-    <com.android.settingslib.RestrictedPreference
-        android:key="wimax_settings"
-        android:title="@string/wimax_settings"
-        settings:userRestriction="no_config_mobile_networks"
-        settings:useAdminDisabledSummary="true">
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings.wimax"
-            android:targetClass="com.android.settings.wimax.WimaxSettings" />
-    </com.android.settingslib.RestrictedPreference>
-
-    <PreferenceScreen
-        android:fragment="com.android.settings.ProxySelector"
-        android:key="proxy_settings"
-        android:title="@string/proxy_settings_title" />
-
-    <!-- Network reset -->
-    <com.android.settingslib.RestrictedPreference
-        android:key="network_reset"
-        android:title="@string/reset_network_title"
-        settings:keywords="@string/keywords_network_reset"
-        settings:userRestriction="no_network_reset"
-        settings:useAdminDisabledSummary="true"
-        android:fragment="com.android.settings.ResetNetwork" />
-
-</PreferenceScreen>
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
old mode 100644
new mode 100755
index c00bca4..c0b9485
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -337,7 +337,7 @@
             if (mAllowAddingApns) {
                 menu.add(0, MENU_NEW, 0,
                         getResources().getString(R.string.menu_new))
-                        .setIcon(android.R.drawable.ic_menu_add)
+                        .setIcon(R.drawable.ic_menu_add_white)
                         .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             }
             menu.add(0, MENU_RESTORE, 0,
diff --git a/src/com/android/settings/AppListPreference.java b/src/com/android/settings/AppListPreference.java
deleted file mode 100644
index 8585454..0000000
--- a/src/com/android/settings/AppListPreference.java
+++ /dev/null
@@ -1,356 +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;
-
-import android.app.AlertDialog;
-import android.app.AppGlobals;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.os.RemoteException;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Extends ListPreference to allow us to show the icons for a given list of applications. We do this
- * because the names of applications are very similar and the user may not be able to determine what
- * app they are selecting without an icon.
- *
- * @deprecated Selecting app from a list should be done in full UI. Use DefaultAppPickerFragment
- * instead.
- */
-@Deprecated
-public class AppListPreference extends CustomListPreference {
-
-    public static final String ITEM_NONE_VALUE = "";
-
-    protected final boolean mForWork;
-    protected final int mUserId;
-
-
-    private boolean mSavesState = true;
-    private Drawable[] mEntryDrawables;
-    private boolean mShowItemNone = false;
-    private CharSequence[] mSummaries;
-    private int mSystemAppIndex = -1;
-
-    public class AppArrayAdapter extends ArrayAdapter<CharSequence> {
-        private Drawable[] mImageDrawables = null;
-        private int mSelectedIndex = 0;
-
-        public AppArrayAdapter(Context context, int textViewResourceId,
-                CharSequence[] objects, Drawable[] imageDrawables, int selectedIndex) {
-            super(context, textViewResourceId, objects);
-            mSelectedIndex = selectedIndex;
-            mImageDrawables = imageDrawables;
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return mSummaries == null || mSummaries[position] == null;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            LayoutInflater inflater = LayoutInflater.from(getContext());
-            View view = inflater.inflate(R.layout.app_preference_item, parent, false);
-            TextView textView = (TextView) view.findViewById(android.R.id.title);
-            textView.setText(getItem(position));
-            if (position == mSelectedIndex && position == mSystemAppIndex) {
-                view.findViewById(R.id.system_default_label).setVisibility(View.VISIBLE);
-            } else if (position == mSelectedIndex) {
-                view.findViewById(R.id.default_label).setVisibility(View.VISIBLE);
-            } else if (position == mSystemAppIndex) {
-                view.findViewById(R.id.system_label).setVisibility(View.VISIBLE);
-            }
-            ImageView imageView = (ImageView) view.findViewById(android.R.id.icon);
-            imageView.setImageDrawable(mImageDrawables[position]);
-            // Summaries are describing why a item is disabled, so anything with a summary
-            // is not enabled.
-            boolean enabled = mSummaries == null || mSummaries[position] == null;
-            view.setEnabled(enabled);
-            if (!enabled) {
-                TextView summary = (TextView) view.findViewById(android.R.id.summary);
-                summary.setText(mSummaries[position]);
-                summary.setVisibility(View.VISIBLE);
-            }
-            return view;
-        }
-    }
-
-    public AppListPreference(Context context, AttributeSet attrs, int defStyle, int defAttrs) {
-        super(context, attrs, defStyle, defAttrs);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.WorkPreference, 0, 0);
-        mForWork = a.getBoolean(R.styleable.WorkPreference_forWork, false);
-        final UserHandle managedProfile = Utils.getManagedProfile(UserManager.get(context));
-        mUserId = mForWork && managedProfile != null ? managedProfile.getIdentifier()
-                : UserHandle.myUserId();
-    }
-
-    public AppListPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.WorkPreference, 0, 0);
-        mForWork = a.getBoolean(R.styleable.WorkPreference_forWork, false);
-        final UserHandle managedProfile = Utils.getManagedProfile(UserManager.get(context));
-        mUserId = mForWork && managedProfile != null ? managedProfile.getIdentifier()
-                : UserHandle.myUserId();
-    }
-
-    public void setSavesState(boolean savesState) {
-        mSavesState = savesState;
-    }
-
-    public void setShowItemNone(boolean showItemNone) {
-        mShowItemNone = showItemNone;
-    }
-
-    public void setPackageNames(CharSequence[] packageNames, CharSequence defaultPackageName) {
-        setPackageNames(packageNames, defaultPackageName, null);
-    }
-
-    public void setPackageNames(CharSequence[] packageNames, CharSequence defaultPackageName,
-            CharSequence systemPackageName) {
-        // Look up all package names in PackageManager. Skip ones we can't find.
-        PackageManager pm = getContext().getPackageManager();
-        final int entryCount = packageNames.length + (mShowItemNone ? 1 : 0);
-        List<CharSequence> applicationNames = new ArrayList<>(entryCount);
-        List<CharSequence> validatedPackageNames = new ArrayList<>(entryCount);
-        List<Drawable> entryDrawables = new ArrayList<>(entryCount);
-        int selectedIndex = -1;
-        mSystemAppIndex = -1;
-        for (int i = 0; i < packageNames.length; i++) {
-            try {
-                ApplicationInfo appInfo = pm.getApplicationInfoAsUser(packageNames[i].toString(), 0,
-                        mUserId);
-                applicationNames.add(appInfo.loadLabel(pm));
-                validatedPackageNames.add(appInfo.packageName);
-                entryDrawables.add(appInfo.loadIcon(pm));
-                if (defaultPackageName != null &&
-                        appInfo.packageName.contentEquals(defaultPackageName)) {
-                    selectedIndex = i;
-                }
-                if (appInfo.packageName != null && systemPackageName != null &&
-                        appInfo.packageName.contentEquals(systemPackageName)) {
-                    mSystemAppIndex = i;
-                }
-            } catch (NameNotFoundException e) {
-                // Skip unknown packages.
-            }
-        }
-
-        if (mShowItemNone) {
-            applicationNames.add(
-                    getContext().getResources().getText(R.string.app_list_preference_none));
-            validatedPackageNames.add(ITEM_NONE_VALUE);
-            entryDrawables.add(getContext().getDrawable(R.drawable.ic_remove_circle));
-        }
-
-        setEntries(applicationNames.toArray(new CharSequence[applicationNames.size()]));
-        setEntryValues(
-                validatedPackageNames.toArray(new CharSequence[validatedPackageNames.size()]));
-        mEntryDrawables = entryDrawables.toArray(new Drawable[entryDrawables.size()]);
-
-        if (selectedIndex != -1) {
-            setValueIndex(selectedIndex);
-        } else {
-            setValue(null);
-        }
-    }
-
-    public void setComponentNames(ComponentName[] componentNames, ComponentName defaultCN) {
-        setComponentNames(componentNames, defaultCN, null);
-    }
-
-    public void setComponentNames(ComponentName[] componentNames, ComponentName defaultCN,
-            CharSequence[] summaries) {
-        mSummaries = summaries;
-        // Look up all package names in PackageManager. Skip ones we can't find.
-        PackageManager pm = getContext().getPackageManager();
-        final int entryCount = componentNames.length + (mShowItemNone ? 1 : 0);
-        List<CharSequence> applicationNames = new ArrayList<>(entryCount);
-        List<CharSequence> validatedComponentNames = new ArrayList<>(entryCount);
-        List<Drawable> entryDrawables = new ArrayList<>(entryCount);
-        int selectedIndex = -1;
-        for (int i = 0; i < componentNames.length; i++) {
-            try {
-                ActivityInfo activityInfo = AppGlobals.getPackageManager().getActivityInfo(
-                        componentNames[i], 0, mUserId);
-                if (activityInfo != null) {
-                    applicationNames.add(activityInfo.loadLabel(pm));
-                    validatedComponentNames.add(componentNames[i].flattenToString());
-                    entryDrawables.add(activityInfo.loadIcon(pm));
-                } else {
-                    ApplicationInfo appInfo = pm.getApplicationInfoAsUser(
-                            componentNames[i].getPackageName().toString(), 0, mUserId);
-                    applicationNames.add(appInfo.loadLabel(pm));
-                    validatedComponentNames.add(componentNames[i].flattenToString());
-                    entryDrawables.add(appInfo.loadIcon(pm));
-                }
-                if (defaultCN != null && componentNames[i].equals(defaultCN)) {
-                    selectedIndex = i;
-                }
-            } catch (RemoteException|NameNotFoundException e) {
-                // Skip unknown packages.
-            }
-        }
-
-        if (mShowItemNone) {
-            applicationNames.add(
-                    getContext().getResources().getText(R.string.app_list_preference_none));
-            validatedComponentNames.add(ITEM_NONE_VALUE);
-            entryDrawables.add(getContext().getDrawable(R.drawable.ic_remove_circle));
-        }
-
-        setEntries(applicationNames.toArray(new CharSequence[applicationNames.size()]));
-        setEntryValues(
-                validatedComponentNames.toArray(new CharSequence[validatedComponentNames.size()]));
-        mEntryDrawables = entryDrawables.toArray(new Drawable[entryDrawables.size()]);
-
-        if (selectedIndex != -1) {
-            setValueIndex(selectedIndex);
-        } else {
-            setValue(null);
-        }
-    }
-
-    protected ListAdapter createListAdapter() {
-        final String selectedValue = getValue();
-        final boolean selectedNone = selectedValue == null ||
-                (mShowItemNone && selectedValue.contentEquals(ITEM_NONE_VALUE));
-        int selectedIndex = selectedNone ? -1 : findIndexOfValue(selectedValue);
-        return new AppArrayAdapter(getContext(),
-            R.layout.app_preference_item, getEntries(), mEntryDrawables, selectedIndex);
-    }
-
-    @Override
-    protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
-            DialogInterface.OnClickListener listener) {
-        builder.setAdapter(createListAdapter(), listener);
-    }
-
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        Parcelable superState = super.onSaveInstanceState();
-        if (mSavesState) {
-            return new SavedState(getEntryValues(), getValue(), mSummaries, mShowItemNone, superState);
-        } else {
-            return superState;
-        }
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        if (mSavesState || state instanceof SavedState) {
-            SavedState savedState = (SavedState) state;
-            mShowItemNone = savedState.showItemNone;
-            setPackageNames(savedState.entryValues, savedState.value);
-            mSummaries = savedState.summaries;
-            super.onRestoreInstanceState(savedState.superState);
-        } else {
-            super.onRestoreInstanceState(state);
-        }
-    }
-
-    /**
-     * Sets app label as summary if there is only 1 app applicable to this preference.
-     */
-    protected void setSoleAppLabelAsSummary() {
-        final CharSequence soleLauncherLabel = getSoleAppLabel();
-        if (!TextUtils.isEmpty(soleLauncherLabel)) {
-            setSummary(soleLauncherLabel);
-        }
-    }
-
-    /**
-     * Returns app label if there is only 1 app applicable to this preference.
-     */
-    protected CharSequence getSoleAppLabel() {
-        // Intentionally left empty so subclasses can override with necessary logic.
-        return null;
-    }
-
-    private static class SavedState implements Parcelable {
-
-        public final CharSequence[] entryValues;
-        public final CharSequence value;
-        public final boolean showItemNone;
-        public final Parcelable superState;
-        public final CharSequence[] summaries;
-
-        public SavedState(CharSequence[] entryValues, CharSequence value, CharSequence[] summaries,
-                boolean showItemNone, Parcelable superState) {
-            this.entryValues = entryValues;
-            this.value = value;
-            this.showItemNone = showItemNone;
-            this.superState = superState;
-            this.summaries = summaries;
-        }
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            dest.writeCharSequenceArray(entryValues);
-            dest.writeCharSequence(value);
-            dest.writeInt(showItemNone ? 1 : 0);
-            dest.writeParcelable(superState, flags);
-            dest.writeCharSequenceArray(summaries);
-        }
-
-        public static Creator<SavedState> CREATOR = new Creator<SavedState>() {
-            @Override
-            public SavedState createFromParcel(Parcel source) {
-                CharSequence[] entryValues = source.readCharSequenceArray();
-                CharSequence value = source.readCharSequence();
-                boolean showItemNone = source.readInt() != 0;
-                Parcelable superState = source.readParcelable(getClass().getClassLoader());
-                CharSequence[] summaries = source.readCharSequenceArray();
-                return new SavedState(entryValues, value, summaries, showItemNone, superState);
-            }
-
-            @Override
-            public SavedState[] newArray(int size) {
-                return new SavedState[size];
-            }
-        };
-    }
-}
diff --git a/src/com/android/settings/AppListPreferenceWithSettings.java b/src/com/android/settings/AppListPreferenceWithSettings.java
deleted file mode 100644
index a499a7b..0000000
--- a/src/com/android/settings/AppListPreferenceWithSettings.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.android.settings;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * An AppListPreference with optional settings button.
- */
-@Deprecated
-public class AppListPreferenceWithSettings extends AppListPreference {
-
-    private View mSettingsIcon;
-    private ComponentName mSettingsComponent;
-
-    public AppListPreferenceWithSettings(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setWidgetLayoutResource(R.layout.preference_widget_settings);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-
-        mSettingsIcon = view.findViewById(R.id.settings_button);
-        mSettingsIcon.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(Intent.ACTION_MAIN);
-                intent.setComponent(mSettingsComponent);
-                getContext().startActivity(new Intent(intent));
-            }
-        });
-
-        ViewGroup container = (ViewGroup) mSettingsIcon.getParent();
-        container.setPaddingRelative(0, 0, 0, 0);
-
-        updateSettingsVisibility();
-    }
-
-    private void updateSettingsVisibility() {
-        if (mSettingsIcon == null) {
-            return;
-        }
-
-        if (mSettingsComponent == null) {
-            mSettingsIcon.setVisibility(View.GONE);
-        } else {
-            mSettingsIcon.setVisibility(View.VISIBLE);
-        }
-    }
-
-    protected void setSettingsComponent(ComponentName settings) {
-        mSettingsComponent = settings;
-        updateSettingsVisibility();
-    }
-}
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index 7d5a6d2..8bc801b 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -71,7 +71,7 @@
         ShortcutManager sm = getSystemService(ShortcutManager.class);
         ActivityInfo activityInfo = resolveInfo.activityInfo;
 
-        Icon maskableIcon = activityInfo.icon != 0 ? Icon.createWithMaskableBitmap(
+        Icon maskableIcon = activityInfo.icon != 0 ? Icon.createWithAdaptiveBitmap(
                 createIcon(activityInfo.icon,
                         R.layout.shortcut_badge_maskable,
                         getResources().getDimensionPixelSize(R.dimen.shortcut_size_maskable))) :
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 90a7a05..dc70725 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -89,6 +89,7 @@
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.development.BugReportPreferenceController;
 import com.android.settings.development.BugReportInPowerPreferenceController;
+import com.android.settings.development.TelephonyMonitorPreferenceController;
 import com.android.settings.fuelgauge.InactiveApps;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -353,6 +354,7 @@
     private DashboardFeatureProvider mDashboardFeatureProvider;
     private BugReportPreferenceController mBugReportController;
     private BugReportInPowerPreferenceController mBugReportInPowerController;
+    private TelephonyMonitorPreferenceController mTelephonyMonitorController;
 
     public DevelopmentSettings() {
         super(UserManager.DISALLOW_DEBUGGING_FEATURES);
@@ -389,6 +391,7 @@
 
         mBugReportController = new BugReportPreferenceController(getActivity());
         mBugReportInPowerController = new BugReportInPowerPreferenceController(getActivity());
+        mTelephonyMonitorController = new TelephonyMonitorPreferenceController(getActivity());
         mWebViewAppPrefController = new WebViewAppPreferenceController(getActivity());
 
         setIfOnlyAvailableForAdmins(true);
@@ -420,6 +423,7 @@
 
         mBugReportController.displayPreference(getPreferenceScreen());
         mBugReportInPowerController.displayPreference(getPreferenceScreen());
+        mTelephonyMonitorController.displayPreference(getPreferenceScreen());
         mWebViewAppPrefController.displayPreference(getPreferenceScreen());
 
         mKeepScreenOn = (RestrictedSwitchPreference) findAndInitSwitchPref(KEEP_SCREEN_ON);
@@ -638,6 +642,7 @@
             pref.setEnabled(enabled && !mDisabledPrefs.contains(pref));
         }
         mBugReportInPowerController.enablePreference(enabled);
+        mTelephonyMonitorController.enablePreference(enabled);
         mWebViewAppPrefController.enablePreference(enabled);
         updateAllOptions();
     }
@@ -760,6 +765,7 @@
                             == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
         }
         mHaveDebugSettings |= mBugReportInPowerController.updatePreference();
+        mHaveDebugSettings |= mTelephonyMonitorController.updatePreference();
         updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr,
                 Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
         updateSwitchPreference(mBtHciSnoopLog, Settings.Secure.getInt(cr,
@@ -1519,7 +1525,7 @@
     private void updateMobileDataAlwaysOnOptions() {
         updateSwitchPreference(mMobileDataAlwaysOn, Settings.Global.getInt(
                 getActivity().getContentResolver(),
-                Settings.Global.MOBILE_DATA_ALWAYS_ON, 0) != 0);
+                Settings.Global.MOBILE_DATA_ALWAYS_ON, 1) != 0);
     }
 
     private void writeMobileDataAlwaysOnOptions() {
@@ -2382,6 +2388,11 @@
         if (mBugReportInPowerController.handlePreferenceTreeClick(preference)) {
             return true;
         }
+
+        if (mTelephonyMonitorController.handlePreferenceTreeClick(preference)) {
+            return true;
+        }
+
         if (mWebViewAppPrefController.handlePreferenceTreeClick(preference)) {
             return true;
         }
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index faf08e6..4ae900a 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -416,7 +416,8 @@
                     ai = iPackageManager.getReceiverInfo(activeAdmin,
                             PackageManager.GET_META_DATA |
                             PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
-                            PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE, profileId);
+                            PackageManager.MATCH_DIRECT_BOOT_UNAWARE |
+                            PackageManager.MATCH_DIRECT_BOOT_AWARE, profileId);
                 } catch (RemoteException e) {
                     Log.w(TAG, "Unable to load component: " + activeAdmin);
                     continue;
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 0da44cd..89ba999 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -17,71 +17,41 @@
 package com.android.settings;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.os.Bundle;
-import android.os.SELinux;
-import android.os.SystemClock;
-import android.os.SystemProperties;
-import android.os.UserHandle;
-import android.os.UserManager;
 import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.text.TextUtils;
-import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
+import com.android.settings.deviceinfo.BasebandVersionPreferenceController;
 import com.android.settings.deviceinfo.BuildNumberPreferenceController;
-import com.android.settings.deviceinfo.SystemUpdatePreferenceController;
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.deviceinfo.DeviceModelPreferenceController;
+import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;
+import com.android.settings.deviceinfo.FeedbackPreferenceController;
+import com.android.settings.deviceinfo.FirmwareVersionPreferenceController;
+import com.android.settings.deviceinfo.KernelVersionPreferenceController;
+import com.android.settings.deviceinfo.ManualPreferenceController;
+import com.android.settings.deviceinfo.RegulatoryInfoPreferenceController;
+import com.android.settings.deviceinfo.SELinuxStatusPreferenceController;
+import com.android.settings.deviceinfo.SafetyInfoPreferenceController;
+import com.android.settings.deviceinfo.SecurityPatchPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settingslib.DeviceInfoUtils;
-import com.android.settingslib.RestrictedLockUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-public class DeviceInfoSettings extends SettingsPreferenceFragment implements Indexable {
+public class DeviceInfoSettings extends DashboardFragment implements Indexable {
 
     private static final String LOG_TAG = "DeviceInfoSettings";
 
-    private static final String KEY_MANUAL = "manual";
-    private static final String KEY_REGULATORY_INFO = "regulatory_info";
-    private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
-    private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";
-    private static final String PROPERTY_SELINUX_STATUS = "ro.build.selinux";
-    private static final String KEY_KERNEL_VERSION = "kernel_version";
-    private static final String KEY_DEVICE_MODEL = "device_model";
-    private static final String KEY_SELINUX_STATUS = "selinux_status";
-    private static final String KEY_BASEBAND_VERSION = "baseband_version";
-    private static final String KEY_FIRMWARE_VERSION = "firmware_version";
-    private static final String KEY_SECURITY_PATCH = "security_patch";
-    private static final String KEY_EQUIPMENT_ID = "fcc_equipment_id";
-    private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid";
-    private static final String KEY_DEVICE_FEEDBACK = "device_feedback";
-    private static final String KEY_SAFETY_LEGAL = "safetylegal";
-
-
-    long[] mHits = new long[3];
-    private SystemUpdatePreferenceController mSystemUpdatePreferenceController;
-    private AdditionalSystemUpdatePreferenceController mAdditionalSystemUpdatePreferenceController;
-    private BuildNumberPreferenceController mBuildNumberPreferenceController;
-
-    private UserManager mUm;
-
-    private EnforcedAdmin mFunDisallowedAdmin;
-    private boolean mFunDisallowedBySystem;
-
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.DEVICEINFO;
@@ -94,210 +64,28 @@
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (mBuildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) {
+        final BuildNumberPreferenceController buildNumberPreferenceController =
+                getPreferenceController(BuildNumberPreferenceController.class);
+        if (buildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) {
             return;
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
 
     @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        final Activity activity = getActivity();
-        mUm = UserManager.get(activity);
-        mAdditionalSystemUpdatePreferenceController =
-                new AdditionalSystemUpdatePreferenceController(activity);
-        mBuildNumberPreferenceController =
-                new BuildNumberPreferenceController(activity, activity, this /* fragment */);
-        getLifecycle().addObserver(mBuildNumberPreferenceController);
-        addPreferencesFromResource(R.xml.device_info_settings);
-
-        setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);
-        findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
-
-        final String patch = DeviceInfoUtils.getSecurityPatch();
-        if (!TextUtils.isEmpty(patch)) {
-            setStringSummary(KEY_SECURITY_PATCH, patch);
-        } else {
-            getPreferenceScreen().removePreference(findPreference(KEY_SECURITY_PATCH));
-        }
-
-        setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband");
-        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL + DeviceInfoUtils.getMsvSuffix());
-        setValueSummary(KEY_EQUIPMENT_ID, PROPERTY_EQUIPMENT_ID);
-        mBuildNumberPreferenceController.displayPreference(getPreferenceScreen());
-        findPreference(KEY_KERNEL_VERSION).setSummary(DeviceInfoUtils.getFormattedKernelVersion());
-
-        if (!SELinux.isSELinuxEnabled()) {
-            String status = getResources().getString(R.string.selinux_status_disabled);
-            setStringSummary(KEY_SELINUX_STATUS, status);
-        } else if (!SELinux.isSELinuxEnforced()) {
-            String status = getResources().getString(R.string.selinux_status_permissive);
-            setStringSummary(KEY_SELINUX_STATUS, status);
-        }
-
-        // Remove selinux information if property is not present
-        removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_SELINUX_STATUS,
-                PROPERTY_SELINUX_STATUS);
-
-        // Remove Safety information preference if PROPERTY_URL_SAFETYLEGAL is not set
-        removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_SAFETY_LEGAL,
-                PROPERTY_URL_SAFETYLEGAL);
-
-        // Remove Equipment id preference if FCC ID is not set by RIL
-        removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_EQUIPMENT_ID,
-                PROPERTY_EQUIPMENT_ID);
-
-        // Remove Baseband version if wifi-only device
-        if (Utils.isWifiOnly(getActivity())) {
-            getPreferenceScreen().removePreference(findPreference(KEY_BASEBAND_VERSION));
-        }
-
-        // Dont show feedback option if there is no reporter.
-        if (TextUtils.isEmpty(DeviceInfoUtils.getFeedbackReporterPackage(getActivity()))) {
-            getPreferenceScreen().removePreference(findPreference(KEY_DEVICE_FEEDBACK));
-        }
-
-        /*
-         * Settings is a generic app and should not contain any device-specific
-         * info.
-         */
-        displaySystemUpdates(activity);
-        mAdditionalSystemUpdatePreferenceController.displayPreference(getPreferenceScreen());
-
-        // Remove manual entry if none present.
-        removePreferenceIfBoolFalse(KEY_MANUAL, R.bool.config_show_manual);
-
-        // Remove regulatory labels if no activity present to handle intent.
-        removePreferenceIfActivityMissing(
-                KEY_REGULATORY_INFO, Settings.ACTION_SHOW_REGULATORY_INFO);
-
-        removePreferenceIfActivityMissing(
-                "safety_info", "android.settings.SHOW_SAFETY_AND_REGULATORY_INFO");
+    protected String getLogTag() {
+        return LOG_TAG;
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        mFunDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(
-                getActivity(), UserManager.DISALLOW_FUN, UserHandle.myUserId());
-        mFunDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
-                getActivity(), UserManager.DISALLOW_FUN, UserHandle.myUserId());
+    protected int getPreferenceScreenResId() {
+        return R.xml.device_info_settings;
     }
 
     @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (mBuildNumberPreferenceController.handlePreferenceTreeClick(preference)) {
-            return true;
-        }
-        if (preference.getKey().equals(KEY_FIRMWARE_VERSION)) {
-            System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1);
-            mHits[mHits.length - 1] = SystemClock.uptimeMillis();
-            if (mHits[0] >= (SystemClock.uptimeMillis() - 500)) {
-                if (mUm.hasUserRestriction(UserManager.DISALLOW_FUN)) {
-                    if (mFunDisallowedAdmin != null && !mFunDisallowedBySystem) {
-                        RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
-                                mFunDisallowedAdmin);
-                    }
-                    Log.d(LOG_TAG, "Sorry, no fun for you!");
-                    return false;
-                }
-
-                Intent intent = new Intent(Intent.ACTION_MAIN);
-                intent.setClassName("android",
-                        com.android.internal.app.PlatLogoActivity.class.getName());
-                try {
-                    startActivity(intent);
-                } catch (Exception e) {
-                    Log.e(LOG_TAG, "Unable to start activity " + intent.toString());
-                }
-            }
-        } else if (preference.getKey().equals(KEY_SECURITY_PATCH)) {
-            if (getPackageManager().queryIntentActivities(preference.getIntent(), 0).isEmpty()) {
-                // Don't send out the intent to stop crash
-                Log.w(LOG_TAG, "Stop click action on " + KEY_SECURITY_PATCH + ": "
-                        + "queryIntentActivities() returns empty" );
-                return true;
-            }
-        } else if (preference.getKey().equals(KEY_DEVICE_FEEDBACK)) {
-            sendFeedback();
-        }
-        if (mSystemUpdatePreferenceController != null) {
-            mSystemUpdatePreferenceController.handlePreferenceTreeClick(preference);
-        }
-        return super.onPreferenceTreeClick(preference);
-    }
-
-    @VisibleForTesting
-    void displaySystemUpdates(Context context) {
-        if (!FeatureFactory.getFactory(context).getDashboardFeatureProvider(context).isEnabled()) {
-            mSystemUpdatePreferenceController
-                    = new SystemUpdatePreferenceController(context, UserManager.get(context));
-            mSystemUpdatePreferenceController.displayPreference(getPreferenceScreen());
-        } else {
-            getPreferenceScreen().removePreference(findPreference(KEY_SYSTEM_UPDATE_SETTINGS));
-        }
-    }
-
-    private void removePreferenceIfPropertyMissing(PreferenceGroup preferenceGroup,
-            String preference, String property ) {
-        if (SystemProperties.get(property).equals("")) {
-            // Property is missing so remove preference from group
-            try {
-                preferenceGroup.removePreference(findPreference(preference));
-            } catch (RuntimeException e) {
-                Log.d(LOG_TAG, "Property '" + property + "' missing and no '"
-                        + preference + "' preference");
-            }
-        }
-    }
-
-    private void removePreferenceIfActivityMissing(String preferenceKey, String action) {
-        final Intent intent = new Intent(action);
-        if (getPackageManager().queryIntentActivities(intent, 0).isEmpty()) {
-            Preference pref = findPreference(preferenceKey);
-            if (pref != null) {
-                getPreferenceScreen().removePreference(pref);
-            }
-        }
-    }
-
-    private void removePreferenceIfBoolFalse(String preference, int resId) {
-        if (!getResources().getBoolean(resId)) {
-            Preference pref = findPreference(preference);
-            if (pref != null) {
-                getPreferenceScreen().removePreference(pref);
-            }
-        }
-    }
-
-    private void setStringSummary(String preference, String value) {
-        try {
-            findPreference(preference).setSummary(value);
-        } catch (RuntimeException e) {
-            findPreference(preference).setSummary(
-                getResources().getString(R.string.device_info_default));
-        }
-    }
-
-    private void setValueSummary(String preference, String property) {
-        try {
-            findPreference(preference).setSummary(
-                    SystemProperties.get(property,
-                            getResources().getString(R.string.device_info_default)));
-        } catch (RuntimeException e) {
-            // No recovery
-        }
-    }
-
-    private void sendFeedback() {
-        String reporterPackage = DeviceInfoUtils.getFeedbackReporterPackage(getActivity());
-        if (TextUtils.isEmpty(reporterPackage)) {
-            return;
-        }
-        Intent intent = new Intent(Intent.ACTION_BUG_REPORT);
-        intent.setPackage(reporterPackage);
-        startActivityForResult(intent, 0);
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getActivity(), this /* fragment */,
+                getLifecycle());
     }
 
     private static class SummaryProvider implements SummaryLoader.SummaryProvider {
@@ -323,55 +111,49 @@
             = new SummaryLoader.SummaryProviderFactory() {
         @Override
         public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                                                                   SummaryLoader summaryLoader) {
+                SummaryLoader summaryLoader) {
             return new SummaryProvider(activity, summaryLoader);
         }
     };
 
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Activity activity, Fragment fragment, Lifecycle lifecycle) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(
+                new BuildNumberPreferenceController(context, activity, fragment, lifecycle));
+        controllers.add(new AdditionalSystemUpdatePreferenceController(context));
+        controllers.add(new ManualPreferenceController(context));
+        controllers.add(new FeedbackPreferenceController(fragment, context));
+        controllers.add(new KernelVersionPreferenceController(context));
+        controllers.add(new BasebandVersionPreferenceController(context));
+        controllers.add(new FirmwareVersionPreferenceController(context, lifecycle));
+        controllers.add(new RegulatoryInfoPreferenceController(context));
+        controllers.add(new DeviceModelPreferenceController(context));
+        controllers.add(new SecurityPatchPreferenceController(context));
+        controllers.add(new FccEquipmentIdPreferenceController(context));
+        controllers.add(new SELinuxStatusPreferenceController(context));
+        controllers.add(new SafetyInfoPreferenceController(context));
+        return controllers;
+    }
+
     /**
      * For Search.
      */
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-        new BaseSearchIndexProvider() {
+            new BaseSearchIndexProvider() {
 
-            @Override
-            public List<SearchIndexableResource> getXmlResourcesToIndex(
-                    Context context, boolean enabled) {
-                final SearchIndexableResource sir = new SearchIndexableResource(context);
-                sir.xmlResId = R.xml.device_info_settings;
-                return Arrays.asList(sir);
-            }
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.device_info_settings;
+                    return Arrays.asList(sir);
+                }
 
-            @Override
-            public List<String> getNonIndexableKeys(Context context) {
-                final List<String> keys = new ArrayList<String>();
-                if (isPropertyMissing(PROPERTY_SELINUX_STATUS)) {
-                    keys.add(KEY_SELINUX_STATUS);
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /*activity */,
+                            null /* fragment */, null /* lifecycle */);
                 }
-                if (isPropertyMissing(PROPERTY_URL_SAFETYLEGAL)) {
-                    keys.add(KEY_SAFETY_LEGAL);
-                }
-                if (isPropertyMissing(PROPERTY_EQUIPMENT_ID)) {
-                    keys.add(KEY_EQUIPMENT_ID);
-                }
-                // Remove Baseband version if wifi-only device
-                if (Utils.isWifiOnly(context)) {
-                    keys.add((KEY_BASEBAND_VERSION));
-                }
-                // Dont show feedback option if there is no reporter.
-                if (TextUtils.isEmpty(DeviceInfoUtils.getFeedbackReporterPackage(context))) {
-                    keys.add(KEY_DEVICE_FEEDBACK);
-                }
-                new SystemUpdatePreferenceController(context, UserManager.get(context))
-                        .updateNonIndexableKeys(keys);
-                new AdditionalSystemUpdatePreferenceController(context)
-                        .updateNonIndexableKeys(keys);
-                return keys;
-            }
-
-            private boolean isPropertyMissing(String property) {
-                return SystemProperties.get(property).equals("");
-            }
-        };
-
+            };
 }
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index aa17499..6fbffe8 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -64,15 +64,20 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        if (mDashboardFeatureProvider.isEnabled()) {
-            return R.xml.ia_display_settings;
-        } else {
-            return R.xml.display_settings;
-        }
+        return R.xml.ia_display_settings;
     }
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context);
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_display;
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new AutoBrightnessPreferenceController(context));
         controllers.add(new AutoRotatePreferenceController(context));
@@ -91,11 +96,6 @@
         return controllers;
     }
 
-    @Override
-    protected int getHelpResource() {
-        return R.string.help_uri_display;
-    }
-
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
@@ -104,45 +104,14 @@
                     final ArrayList<SearchIndexableResource> result = new ArrayList<>();
 
                     final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    final boolean useNewIA = FeatureFactory.getFactory(context)
-                            .getDashboardFeatureProvider(context)
-                            .isEnabled();
-                    if (useNewIA) {
-                        sir.xmlResId = R.xml.ia_display_settings;
-                    } else {
-                        sir.xmlResId = R.xml.display_settings;
-                    }
+                    sir.xmlResId = R.xml.ia_display_settings;
                     result.add(sir);
                     return result;
                 }
 
                 @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    ArrayList<String> result = new ArrayList<>();
-
-                    new AutoBrightnessPreferenceController(context).updateNonIndexableKeys(result);
-                    new AutoRotatePreferenceController(context).updateNonIndexableKeys(result);
-                    new CameraGesturePreferenceController(context).updateNonIndexableKeys(result);
-                    new DozePreferenceController(context).updateNonIndexableKeys(result);
-                    new FontSizePreferenceController(context).updateNonIndexableKeys(result);
-                    new LiftToWakePreferenceController(context).updateNonIndexableKeys(result);
-                    new NightDisplayPreferenceController(context).updateNonIndexableKeys(result);
-                    new NightModePreferenceController(context).updateNonIndexableKeys(result);
-                    new ScreenSaverPreferenceController(context).updateNonIndexableKeys(result);
-                    new TapToWakePreferenceController(context).updateNonIndexableKeys(result);
-                    new TimeoutPreferenceController(context).updateNonIndexableKeys(result);
-                    new VrDisplayPreferenceController(context).updateNonIndexableKeys(result);
-                    new WallpaperPreferenceController(context).updateNonIndexableKeys(result);
-                    new ThemePreferenceController(context).updateNonIndexableKeys(result);
-
-                    return result;
-                }
-
-                @Override
                 public List<PreferenceController> getPreferenceControllers(Context context) {
-                    final List<PreferenceController> controllers = new ArrayList<>();
-                    controllers.add(new AutoBrightnessPreferenceController(context));
-                    return controllers;
+                    return buildPreferenceControllers(context);
                 }
             };
 }
diff --git a/src/com/android/settings/EncryptionAndCredential.java b/src/com/android/settings/EncryptionAndCredential.java
new file mode 100644
index 0000000..1750e75
--- /dev/null
+++ b/src/com/android/settings/EncryptionAndCredential.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
+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.SearchIndexableResource;
+import android.security.KeyStore;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Encryption and Credential settings.
+ * TODO: Extends this from {@link DashboardFragment} instead
+ */
+public class EncryptionAndCredential extends SettingsPreferenceFragment implements Indexable {
+
+    private static final String TAG = "EncryptionAndCredential";
+
+    // Misc Settings
+    private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
+    private static final String KEY_USER_CREDENTIALS = "user_credentials";
+    private static final String KEY_RESET_CREDENTIALS = "credentials_reset";
+    private static final String KEY_CREDENTIALS_INSTALL = "credentials_install";
+    private static final String KEY_CREDENTIALS_MANAGER = "credentials_management";
+
+    private static final int MY_USER_ID = UserHandle.myUserId();
+
+    private UserManager mUm;
+
+    private KeyStore mKeyStore;
+    private RestrictedPreference mResetCredentials;
+
+    private boolean mIsAdmin;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.ENCRYPTION_AND_CREDENTIAL;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Activity activity = getActivity();
+
+        mUm = UserManager.get(activity);
+    }
+
+    /**
+     * Important!
+     *
+     * Don't forget to update the SecuritySearchIndexProvider if you are doing any change in the
+     * logic or adding/removing preferences here.
+     */
+    private PreferenceScreen createPreferenceHierarchy() {
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        addPreferencesFromResource(R.xml.encryption_and_credential);
+        root = getPreferenceScreen();
+
+        // Add options for device encryption
+        mIsAdmin = mUm.isAdminUser();
+
+        if (mIsAdmin) {
+            if (LockPatternUtils.isDeviceEncryptionEnabled()) {
+                // The device is currently encrypted.
+                addPreferencesFromResource(R.xml.security_settings_encrypted);
+            } else {
+                // This device supports encryption but isn't encrypted.
+                addPreferencesFromResource(R.xml.security_settings_unencrypted);
+            }
+        }
+
+
+        // Credential storage
+        mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume()
+
+        if (!RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                UserManager.DISALLOW_CONFIG_CREDENTIALS, MY_USER_ID)) {
+            RestrictedPreference userCredentials = (RestrictedPreference) root.findPreference(
+                    KEY_USER_CREDENTIALS);
+            userCredentials.checkRestrictionAndSetDisabled(
+                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
+            RestrictedPreference credentialStorageType = (RestrictedPreference) root.findPreference(
+                    KEY_CREDENTIAL_STORAGE_TYPE);
+            credentialStorageType.checkRestrictionAndSetDisabled(
+                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
+            RestrictedPreference installCredentials = (RestrictedPreference) root.findPreference(
+                    KEY_CREDENTIALS_INSTALL);
+            installCredentials.checkRestrictionAndSetDisabled(
+                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
+            mResetCredentials = (RestrictedPreference) root.findPreference(KEY_RESET_CREDENTIALS);
+            mResetCredentials.checkRestrictionAndSetDisabled(
+                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
+
+            final int storageSummaryRes =
+                    mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware
+                            : R.string.credential_storage_type_software;
+            credentialStorageType.setSummary(storageSummaryRes);
+        } else {
+            PreferenceGroup credentialsManager = (PreferenceGroup)
+                    root.findPreference(KEY_CREDENTIALS_MANAGER);
+            credentialsManager.removePreference(root.findPreference(KEY_RESET_CREDENTIALS));
+            credentialsManager.removePreference(root.findPreference(KEY_CREDENTIALS_INSTALL));
+            credentialsManager.removePreference(root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE));
+            credentialsManager.removePreference(root.findPreference(KEY_USER_CREDENTIALS));
+        }
+
+        return root;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Make sure we reload the preference hierarchy since some of these settings
+        // depend on others...
+        createPreferenceHierarchy();
+
+        if (mResetCredentials != null && !mResetCredentials.isDisabledByAdmin()) {
+            mResetCredentials.setEnabled(!mKeyStore.isEmpty());
+        }
+    }
+
+    /**
+     * see confirmPatternThenDisableAndClear
+     */
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        createPreferenceHierarchy();
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_security;
+    }
+
+    /**
+     * For Search. Please keep it in sync when updating "createPreferenceHierarchy()"
+     */
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new SecuritySearchIndexProvider();
+
+    private static class SecuritySearchIndexProvider extends BaseSearchIndexProvider {
+
+        @Override
+        public List<SearchIndexableResource> getXmlResourcesToIndex(
+                Context context, boolean enabled) {
+            final List<SearchIndexableResource> index = new ArrayList<SearchIndexableResource>();
+
+            final DevicePolicyManager dpm = (DevicePolicyManager)
+                    context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+            final UserManager um = UserManager.get(context);
+
+            if (um.isAdminUser()) {
+                switch (dpm.getStorageEncryptionStatus()) {
+                    case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
+                        // The device is currently encrypted.
+                        index.add(getSearchResource(context, R.xml.security_settings_encrypted));
+                        break;
+                    case DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE:
+                        // This device supports encryption but isn't encrypted.
+                        index.add(getSearchResource(context, R.xml.security_settings_unencrypted));
+                        break;
+                }
+            }
+
+            return index;
+        }
+
+        private SearchIndexableResource getSearchResource(Context context, int xmlResId) {
+            final SearchIndexableResource sir = new SearchIndexableResource(context);
+            sir.xmlResId = xmlResId;
+            return sir;
+        }
+
+        @Override
+        public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
+            final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
+            final Resources res = context.getResources();
+
+            final String screenTitle = res.getString(
+                R.string.encryption_and_credential_settings_title);
+
+            SearchIndexableRaw data = new SearchIndexableRaw(context);
+            data.title = screenTitle;
+            data.screenTitle = screenTitle;
+            result.add(data);
+
+            final UserManager um = UserManager.get(context);
+            if (!um.isAdminUser()) {
+                int resId = um.isLinkedUser() ?
+                        R.string.profile_info_settings_title : R.string.user_info_settings_title;
+
+                data = new SearchIndexableRaw(context);
+                data.title = res.getString(resId);
+                data.screenTitle = screenTitle;
+                result.add(data);
+            }
+
+            // Credential storage
+            if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
+                KeyStore keyStore = KeyStore.getInstance();
+
+                final int storageSummaryRes = keyStore.isHardwareBacked() ?
+                        R.string.credential_storage_type_hardware :
+                        R.string.credential_storage_type_software;
+
+                data = new SearchIndexableRaw(context);
+                data.title = res.getString(storageSummaryRes);
+                data.screenTitle = screenTitle;
+                result.add(data);
+            }
+
+            return result;
+        }
+
+        @Override
+        public List<String> getNonIndexableKeys(Context context) {
+            final List<String> keys = new ArrayList<String>();
+
+            final UserManager um = UserManager.get(context);
+
+            if (um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
+                keys.add(KEY_CREDENTIALS_MANAGER);
+            }
+
+            return keys;
+        }
+    }
+
+}
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index 1b18b18..4f24381 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -196,6 +196,9 @@
         @Override
         public boolean onPreferenceTreeClick(Preference preference) {
             final String key = preference.getKey();
+            if (key == null) {
+                return super.onPreferenceTreeClick(preference);
+            }
             if (key.equals(KEY_ENCRYPT_REQUIRE_PASSWORD)) {
                 final boolean accEn = AccessibilityManager.getInstance(getActivity()).isEnabled();
                 if (accEn && !mPasswordRequired) {
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index e9d810a..a44e182 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -50,7 +50,7 @@
 /**
  * Gesture lock pattern settings.
  */
-public class PrivacySettings extends SettingsPreferenceFragment implements Indexable {
+public class PrivacySettings extends SettingsPreferenceFragment {
 
     // Vendor specific
     private static final String GSETTINGS_PROVIDER = "com.google.settings";
@@ -225,49 +225,6 @@
         return R.string.help_url_backup_reset;
     }
 
-    /**
-     * For Search.
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new PrivacySearchIndexProvider();
-
-    private static class PrivacySearchIndexProvider extends BaseSearchIndexProvider {
-
-        boolean mIsPrimary;
-
-        public PrivacySearchIndexProvider() {
-            super();
-
-            mIsPrimary = UserHandle.myUserId() == UserHandle.USER_SYSTEM;
-        }
-
-        @Override
-        public List<SearchIndexableResource> getXmlResourcesToIndex(
-                Context context, boolean enabled) {
-
-            List<SearchIndexableResource> result = new ArrayList<SearchIndexableResource>();
-
-            // For non-primary user, no backup or reset is available
-            // TODO: http://b/22388012
-            if (!mIsPrimary) {
-                return result;
-            }
-
-            SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = R.xml.privacy_settings;
-            result.add(sir);
-
-            return result;
-        }
-
-        @Override
-        public List<String> getNonIndexableKeys(Context context) {
-            final List<String> nonVisibleKeys = new ArrayList<>();
-            getNonVisibleKeys(context, nonVisibleKeys);
-            return nonVisibleKeys;
-        }
-    }
-
     private static void getNonVisibleKeys(Context context, Collection<String> nonVisibleKeys) {
         final IBackupManager backupManager = IBackupManager.Stub.asInterface(
                 ServiceManager.getService(Context.BACKUP_SERVICE));
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 04b2413..7417516 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -25,7 +25,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.IContentProvider;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -37,7 +36,6 @@
 import android.os.UserManager;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
-import android.security.KeyStore;
 import android.service.trust.TrustAgentService;
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
@@ -61,6 +59,7 @@
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.fingerprint.FingerprintSettings;
+import com.android.settings.location.LocationPreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
@@ -77,6 +76,8 @@
 import com.android.settingslib.drawer.TileUtils;
 
 import java.util.ArrayList;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
 import java.util.List;
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
@@ -101,7 +102,6 @@
     private static final String KEY_VISIBLE_PATTERN_PROFILE = "visiblepattern_profile";
     private static final String KEY_SECURITY_CATEGORY = "security_category";
     private static final String KEY_DEVICE_ADMIN_CATEGORY = "device_admin_category";
-    private static final String KEY_ADVANCED_SECURITY = "advanced_security";
     private static final String KEY_MANAGE_TRUST_AGENTS = "manage_trust_agents";
     private static final String KEY_UNIFICATION = "unification";
 
@@ -114,14 +114,8 @@
     private static final String TAG_UNIFICATION_DIALOG = "unification_dialog";
 
     // Misc Settings
-    private static final String KEY_SIM_LOCK = "sim_lock";
+    private static final String KEY_SIM_LOCK = "sim_lock_settings";
     private static final String KEY_SHOW_PASSWORD = "show_password";
-    private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
-    private static final String KEY_USER_CREDENTIALS = "user_credentials";
-    private static final String KEY_RESET_CREDENTIALS = "credentials_reset";
-    private static final String KEY_CREDENTIALS_INSTALL = "credentials_install";
-    private static final String KEY_CREDENTIALS_MANAGER = "credentials_management";
-    private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
     private static final String KEY_TRUST_AGENT = "trust_agent";
     private static final String KEY_SCREEN_PINNING = "screen_pinning_settings";
 
@@ -160,9 +154,6 @@
 
     private SwitchPreference mShowPassword;
 
-    private KeyStore mKeyStore;
-    private RestrictedPreference mResetCredentials;
-
     private boolean mIsAdmin;
 
     private Intent mTrustAgentClickIntent;
@@ -172,6 +163,8 @@
     private String mCurrentDevicePassword;
     private String mCurrentProfilePassword;
 
+    private LocationPreferenceController mLocationcontroller;
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.SECURITY;
@@ -206,6 +199,8 @@
                 && savedInstanceState.containsKey(TRUST_AGENT_CLICK_INTENT)) {
             mTrustAgentClickIntent = savedInstanceState.getParcelable(TRUST_AGENT_CLICK_INTENT);
         }
+
+        mLocationcontroller = new LocationPreferenceController(activity);
     }
 
     private static int getResIdForLockUnlockScreen(Context context,
@@ -304,19 +299,8 @@
             ((GearPreference) unlockSetOrChange).setOnGearClickListener(this);
         }
 
-        // Add options for device encryption
         mIsAdmin = mUm.isAdminUser();
 
-        if (mIsAdmin) {
-            if (LockPatternUtils.isDeviceEncryptionEnabled()) {
-                // The device is currently encrypted.
-                addPreferencesFromResource(R.xml.security_settings_encrypted);
-            } else {
-                // This device supports encryption but isn't encrypted.
-                addPreferencesFromResource(R.xml.security_settings_unencrypted);
-            }
-        }
-
         // Fingerprint and trust agents
         PreferenceGroup securityCategory = (PreferenceGroup)
                 root.findPreference(KEY_SECURITY_CATEGORY);
@@ -352,56 +336,19 @@
 
         // Show password
         mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);
-        mResetCredentials = (RestrictedPreference) root.findPreference(KEY_RESET_CREDENTIALS);
 
         // Credential storage
         final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-        mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume()
-
-        if (!RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
-                UserManager.DISALLOW_CONFIG_CREDENTIALS, MY_USER_ID)) {
-            RestrictedPreference userCredentials = (RestrictedPreference) root.findPreference(
-                    KEY_USER_CREDENTIALS);
-            userCredentials.checkRestrictionAndSetDisabled(
-                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
-            RestrictedPreference credentialStorageType = (RestrictedPreference) root.findPreference(
-                    KEY_CREDENTIAL_STORAGE_TYPE);
-            credentialStorageType.checkRestrictionAndSetDisabled(
-                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
-            RestrictedPreference installCredentials = (RestrictedPreference) root.findPreference(
-                    KEY_CREDENTIALS_INSTALL);
-            installCredentials.checkRestrictionAndSetDisabled(
-                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
-            mResetCredentials.checkRestrictionAndSetDisabled(
-                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
-
-            final int storageSummaryRes =
-                    mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware
-                            : R.string.credential_storage_type_software;
-            credentialStorageType.setSummary(storageSummaryRes);
-        } else {
-            PreferenceGroup credentialsManager = (PreferenceGroup)
-                    root.findPreference(KEY_CREDENTIALS_MANAGER);
-            credentialsManager.removePreference(root.findPreference(KEY_RESET_CREDENTIALS));
-            credentialsManager.removePreference(root.findPreference(KEY_CREDENTIALS_INSTALL));
-            credentialsManager.removePreference(root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE));
-            credentialsManager.removePreference(root.findPreference(KEY_USER_CREDENTIALS));
-        }
-
 
         // Application install
         PreferenceGroup deviceAdminCategory = (PreferenceGroup)
                 root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
 
         // Advanced Security features
-        PreferenceGroup advancedCategory =
-                (PreferenceGroup)root.findPreference(KEY_ADVANCED_SECURITY);
-        if (advancedCategory != null) {
-            Preference manageAgents = advancedCategory.findPreference(KEY_MANAGE_TRUST_AGENTS);
-            if (manageAgents != null && !mLockPatternUtils.isSecure(MY_USER_ID)) {
-                manageAgents.setEnabled(false);
-                manageAgents.setSummary(R.string.disabled_because_no_backup_security);
-            }
+        Preference manageAgents = root.findPreference(KEY_MANAGE_TRUST_AGENTS);
+        if (manageAgents != null && !mLockPatternUtils.isSecure(MY_USER_ID)) {
+            manageAgents.setEnabled(false);
+            manageAgents.setSummary(R.string.disabled_because_no_backup_security);
         }
 
         // The above preferences come and go based on security state, so we need to update
@@ -449,6 +396,8 @@
             final Preference pref = findPreference(SWITCH_PREFERENCE_KEYS[i]);
             if (pref != null) pref.setOnPreferenceChangeListener(this);
         }
+
+        mLocationcontroller.displayPreference(root);
         return root;
     }
 
@@ -611,9 +560,7 @@
                     Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
         }
 
-        if (mResetCredentials != null && !mResetCredentials.isDisabledByAdmin()) {
-            mResetCredentials.setEnabled(!mKeyStore.isEmpty());
-        }
+        mLocationcontroller.updateSummary();
     }
 
     private void updateUnificationPreference() {
@@ -837,19 +784,6 @@
                         lockPatternUtils, managedPasswordProvider, profileUserId)));
             }
 
-            if (um.isAdminUser()) {
-                switch (dpm.getStorageEncryptionStatus()) {
-                    case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
-                        // The device is currently encrypted.
-                        index.add(getSearchResource(context, R.xml.security_settings_encrypted));
-                        break;
-                    case DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE:
-                        // This device supports encryption but isn't encrypted.
-                        index.add(getSearchResource(context, R.xml.security_settings_unencrypted));
-                        break;
-                }
-            }
-
             final SearchIndexableResource sir = getSearchResource(context,
                     SecuritySubSettings.getResIdForLockUnlockSubScreen(context, lockPatternUtils,
                             managedPasswordProvider));
@@ -888,15 +822,6 @@
             result.add(data);
 
             final UserManager um = UserManager.get(context);
-            if (!um.isAdminUser()) {
-                int resId = um.isLinkedUser() ?
-                        R.string.profile_info_settings_title : R.string.user_info_settings_title;
-
-                data = new SearchIndexableRaw(context);
-                data.title = res.getString(resId);
-                data.screenTitle = screenTitle;
-                result.add(data);
-            }
 
             // Fingerprint
             final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(context);
@@ -928,20 +853,6 @@
                 }
             }
 
-            // Credential storage
-            if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
-                KeyStore keyStore = KeyStore.getInstance();
-
-                final int storageSummaryRes = keyStore.isHardwareBacked() ?
-                        R.string.credential_storage_type_hardware :
-                        R.string.credential_storage_type_software;
-
-                data = new SearchIndexableRaw(context);
-                data.title = res.getString(storageSummaryRes);
-                data.screenTitle = screenTitle;
-                result.add(data);
-            }
-
             // Advanced
             if (lockPatternUtils.isSecure(MY_USER_ID)) {
                 final TrustAgentManager trustAgentManager =
@@ -974,10 +885,6 @@
                 keys.add(KEY_SIM_LOCK);
             }
 
-            if (um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
-                keys.add(KEY_CREDENTIALS_MANAGER);
-            }
-
             // TrustAgent settings disappear when the user has no primary security.
             if (!lockPatternUtils.isSecure(MY_USER_ID)) {
                 keys.add(KEY_TRUST_AGENT);
@@ -1032,8 +939,8 @@
                         MY_USER_ID));
             }
             if (mPowerButtonInstantlyLocks != null) {
-                mPowerButtonInstantlyLocks.setChecked(mLockPatternUtils.getPowerButtonInstantlyLocks(
-                        MY_USER_ID));
+                mPowerButtonInstantlyLocks.setChecked(
+                        mLockPatternUtils.getPowerButtonInstantlyLocks(MY_USER_ID));
             }
 
             updateOwnerInfo();
@@ -1297,9 +1204,18 @@
                     FeatureFactory.getFactory(mContext).getDashboardFeatureProvider(mContext);
             if (dashboardFeatureProvider.isEnabled()
                     && (packageVerifierState == PACKAGE_VERIFIER_STATE_ENABLED)) {
-                DashboardCategory dashboardCategory =
-                        dashboardFeatureProvider.getTilesForCategory(CategoryKey.CATEGORY_SECURITY);
-                mSummaryLoader.setSummary(this, getPackageVerifierSummary(dashboardCategory));
+                // Calling the feature provider could potentially be slow, so do this on a separate
+                // thread so as to not block the loading of Settings.
+                Executors.newSingleThreadExecutor().execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        DashboardCategory dashboardCategory =
+                                dashboardFeatureProvider.getTilesForCategory(
+                                        CategoryKey.CATEGORY_SECURITY);
+                        mSummaryLoader.setSummary(SummaryProvider.this,
+                                getPackageVerifierSummary(dashboardCategory));
+                    }
+                });
             } else {
                 final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(mContext);
                 if (fpm != null && fpm.isHardwareDetected()) {
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 046deb3..a96fb1e 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -29,7 +29,6 @@
     * Settings subclasses for launching independently.
     */
     public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class WirelessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class SimSettingsActivity extends SettingsActivity { /* empty */ }
     public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }
     public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }
@@ -40,7 +39,6 @@
     public static class PublicVolumeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class InputMethodAndLanguageSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AvailableVirtualKeyboardActivity extends SettingsActivity { /* empty */ }
     public static class KeyboardLayoutPickerActivity extends SettingsActivity { /* empty */ }
     public static class PhysicalKeyboardActivity extends SettingsActivity { /* empty */ }
@@ -68,10 +66,7 @@
     }
     public static class BackgroundCheckSummaryActivity extends SettingsActivity { /* empty */ }
     public static class StorageUseActivity extends SettingsActivity { /* empty */ }
-    public static class DevelopmentSettingsActivity extends SettingsActivity {
-        public static final String DASHBOARD_ALIAS =
-                "com.android.settings.DevelopmentSettingsDashboardAlias";
-    }
+    public static class DevelopmentSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccessibilitySettingsActivity extends SettingsActivity { /* empty */ }
     public static class CaptioningSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccessibilityInversionSettingsActivity extends SettingsActivity { /* empty */ }
@@ -83,13 +78,10 @@
     public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }
     public static class FactoryResetActivity extends SettingsActivity { /* empty */ }
     public static class RunningServicesActivity extends SettingsActivity { /* empty */ }
-    public static class ManageAccountsSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }
     public static class BatterySaverSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class AccountSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }
-    public static class GestureSettingsActivity extends SettingsActivity { /* empty */ }
     public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DeviceAdminSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DataUsageSummaryActivity extends SettingsActivity { /* empty */ }
@@ -123,7 +115,6 @@
     public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
     public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ChannelNotificationSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageDomainUrlsActivity extends SettingsActivity { /* empty */ }
     public static class AutomaticStorageManagerSettingsActivity extends SettingsActivity { /* empty */ }
     public static class GamesStorageActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 0435d03..d5e886f 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -31,6 +31,10 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
 import android.nfc.NfcAdapter;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -58,7 +62,6 @@
 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.DashboardContainerFragment;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.DashboardSummary;
 import com.android.settings.dashboard.SearchResultsSummary;
@@ -154,6 +157,7 @@
     public static final String EXTRA_SHOW_FRAGMENT_AS_SUBSETTING =
             ":settings:show_fragment_as_subsetting";
 
+    @Deprecated
     public static final String EXTRA_HIDE_DRAWER = ":settings:hide_drawer";
 
     public static final String META_DATA_KEY_FRAGMENT_CLASS =
@@ -366,9 +370,6 @@
         if (intent.hasExtra(EXTRA_UI_OPTIONS)) {
             getWindow().setUiOptions(intent.getIntExtra(EXTRA_UI_OPTIONS, 0));
         }
-        if (intent.getBooleanExtra(EXTRA_HIDE_DRAWER, false)) {
-            setIsDrawerPresent(false);
-        }
 
         mDevelopmentPreferences = getSharedPreferences(DevelopmentSettings.PREF_FILE,
                 Context.MODE_PRIVATE);
@@ -435,40 +436,7 @@
             mDisplaySearch = savedState.getBoolean(SAVE_KEY_SHOW_SEARCH);
 
         } else {
-            if (!mIsShowingDashboard) {
-                mDisplaySearch = false;
-                // UP will be shown only if it is a sub settings
-                if (mIsShortcut) {
-                    mDisplayHomeAsUpEnabled = isSubSettings;
-                } else if (isSubSettings) {
-                    mDisplayHomeAsUpEnabled = true;
-                } else {
-                    mDisplayHomeAsUpEnabled = false;
-                }
-                setTitleFromIntent(intent);
-
-                Bundle initialArguments = intent.getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
-                switchToFragment(initialFragmentName, initialArguments, true, false,
-                        mInitialTitleResId, mInitialTitle, false);
-            } else {
-                // No UP affordance if we are displaying the main Dashboard
-                mDisplayHomeAsUpEnabled = false;
-                // Show Search affordance
-                mDisplaySearch = true;
-                mInitialTitleResId = R.string.dashboard_title;
-
-                // add argument to indicate which settings tab should be initially selected
-                final Bundle args = new Bundle();
-                final String extraName = DashboardContainerFragment.EXTRA_SELECT_SETTINGS_TAB;
-                args.putString(extraName, intent.getStringExtra(extraName));
-                if (isDashboardFeatureEnabled()) {
-                    switchToFragment(DashboardSummary.class.getName(), args, false, false,
-                            mInitialTitleResId, mInitialTitle, false);
-                } else {
-                    switchToFragment(DashboardContainerFragment.class.getName(), args, false, false,
-                            mInitialTitleResId, mInitialTitle, false);
-                }
-            }
+            launchSettingFragment(initialFragmentName, isSubSettings, intent);
         }
 
         mActionBar = getActionBar();
@@ -540,6 +508,35 @@
         }
     }
 
+    @VisibleForTesting
+    void launchSettingFragment(String initialFragmentName, boolean isSubSettings, Intent intent) {
+        if (!mIsShowingDashboard && initialFragmentName != null) {
+            mDisplaySearch = false;
+            // UP will be shown only if it is a sub settings
+            if (mIsShortcut) {
+                mDisplayHomeAsUpEnabled = isSubSettings;
+            } else if (isSubSettings) {
+                mDisplayHomeAsUpEnabled = true;
+            } else {
+                mDisplayHomeAsUpEnabled = false;
+            }
+            setTitleFromIntent(intent);
+
+            Bundle initialArguments = intent.getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+            switchToFragment(initialFragmentName, initialArguments, true, false,
+                mInitialTitleResId, mInitialTitle, false);
+        } else {
+            // No UP affordance if we are displaying the main Dashboard
+            mDisplayHomeAsUpEnabled = false;
+            // Show Search affordance
+            mDisplaySearch = true;
+            mInitialTitleResId = R.string.dashboard_title;
+
+            switchToFragment(DashboardSummary.class.getName(), null /* args */, false, false,
+                mInitialTitleResId, mInitialTitle, false);
+        }
+    }
+
     public void setDisplaySearchMenu(boolean displaySearch) {
         if (displaySearch != mDisplaySearch) {
             mDisplaySearch = displaySearch;
@@ -686,6 +683,13 @@
         mDevelopmentPreferencesListener = null;
     }
 
+    @Override
+    public void setTaskDescription(ActivityManager.TaskDescription taskDescription) {
+        final Bitmap icon = getBitmapFromXmlResource(R.drawable.ic_launcher_settings);
+        taskDescription.setIcon(icon);
+        super.setTaskDescription(taskDescription);
+    }
+
     protected boolean isValidFragment(String fragmentName) {
         // Almost all fragments are wrapped in this,
         // except for a few that have their own activities.
@@ -916,7 +920,11 @@
                 && !Utils.isMonkeyRunning(), isAdmin);
 
         setTileEnabled(new ComponentName(packageName,
-                        Settings.WirelessSettingsActivity.class.getName()),
+                Settings.NetworkDashboardActivity.class.getName()),
+                !UserManager.isDeviceInDemoMode(this), isAdmin);
+
+        setTileEnabled(new ComponentName(packageName,
+                Settings.ConnectedDeviceDashboardActivity.class.getName()),
                 !UserManager.isDeviceInDemoMode(this), isAdmin);
 
         setTileEnabled(new ComponentName(packageName,
@@ -944,18 +952,10 @@
         setTileEnabled(new ComponentName(packageName,
                         Settings.DevelopmentSettingsActivity.class.getName()),
                 showDev, isAdmin);
-        setTileEnabled(new ComponentName(packageName,
-                        Settings.DevelopmentSettingsActivity.DASHBOARD_ALIAS),
-                showDev, isAdmin);
 
         if (UserHandle.MU_ENABLED && !isAdmin) {
             // When on restricted users, disable all extra categories (but only the settings ones).
-            List<DashboardCategory> categories;
-            if (isDashboardFeatureEnabled()) {
-                categories = mDashboardFeatureProvider.getAllCategories();
-            } else {
-                categories = getDashboardCategories();
-            }
+            final List<DashboardCategory> categories = mDashboardFeatureProvider.getAllCategories();
 
             for (DashboardCategory category : categories) {
                 for (Tile tile : category.tiles) {
@@ -974,17 +974,11 @@
         setTileEnabled(new ComponentName(packageName,
                 BackupSettingsActivity.class.getName()), true,
                 isAdmin || Utils.isCarrierDemoUser(this));
-        setTileEnabled(new ComponentName(packageName,
-                "com.android.settings.BackupResetDashboardAlias"), true, isAdmin);
 
         setTileEnabled(new ComponentName(packageName,
                 Settings.EnterprisePrivacySettingsActivity.class.getName()),
                 FeatureFactory.getFactory(this).getEnterprisePrivacyFeatureProvider(this)
                         .hasDeviceOwner(), isAdmin);
-        setTileEnabled(new ComponentName(packageName,
-                        "com.android.settings.EnterprisePrivacyDashboardAlias"),
-                FeatureFactory.getFactory(this).getEnterprisePrivacyFeatureProvider(this)
-                        .hasDeviceOwner(), isAdmin);
         // Final step, refresh categories.
         updateCategories();
     }
@@ -1010,15 +1004,6 @@
         }
     }
 
-    @Override
-    protected boolean isDashboardFeatureEnabled() {
-        if (mDashboardFeatureProvider == null) {
-            mDashboardFeatureProvider =
-                    FeatureFactory.getFactory(this).getDashboardFeatureProvider(this);
-        }
-        return mDashboardFeatureProvider.isEnabled();
-    }
-
     // give subclasses access to the Next button
     public boolean hasNextButton() {
         return mNextButton != null;
@@ -1078,16 +1063,6 @@
     }
 
     @Override
-    protected void onTileClicked(Tile tile) {
-        if (mIsShowingDashboard) {
-            // If on dashboard, don't finish so the back comes back to here.
-            openTile(tile);
-        } else {
-            super.onTileClicked(tile);
-        }
-    }
-
-    @Override
     public void onProfileTileOpen() {
         if (!mIsShowingDashboard) {
             finish();
@@ -1154,4 +1129,17 @@
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
+
+    @VisibleForTesting
+    Bitmap getBitmapFromXmlResource(int drawableRes) {
+        Drawable drawable = getResources().getDrawable(drawableRes, getTheme());
+        Canvas canvas = new Canvas();
+        Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
+                drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+        canvas.setBitmap(bitmap);
+        drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+        drawable.draw(canvas);
+
+        return bitmap;
+    }
 }
diff --git a/src/com/android/settings/SmsDefaultDialog.java b/src/com/android/settings/SmsDefaultDialog.java
index 830187c..e4b49ee 100644
--- a/src/com/android/settings/SmsDefaultDialog.java
+++ b/src/com/android/settings/SmsDefaultDialog.java
@@ -125,6 +125,10 @@
             p.mOnClickListener = this;
             p.mNegativeButtonText = getString(R.string.cancel);
             p.mNegativeButtonListener = this;
+            if (p.mAdapter.isEmpty()) {
+                // If there is nothing to choose from, don't build the dialog.
+                return false;
+            }
         }
         setupAlert();
 
diff --git a/src/com/android/settings/TetherService.java b/src/com/android/settings/TetherService.java
index 6d359f2..610d320 100644
--- a/src/com/android/settings/TetherService.java
+++ b/src/com/android/settings/TetherService.java
@@ -252,7 +252,8 @@
         Intent intent = new Intent(provisionAction);
         int type = mCurrentTethers.get(index);
         intent.putExtra(TETHER_CHOICE, type);
-        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND
+                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
 
         return intent;
     }
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 3f5748c..4696dd3 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -63,7 +63,6 @@
 
 import com.android.internal.app.UnlaunchableAppActivity;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.util.ParcelableString;
 import com.android.internal.widget.LockPatternUtils;
 
 import java.security.cert.CertificateEncodingException;
@@ -125,7 +124,7 @@
             mSwitch = withSwitch;
         }
 
-        private List<ParcelableString> getAliases(IKeyChainService service) throws RemoteException {
+        private List<String> getAliases(IKeyChainService service) throws RemoteException {
             switch (this) {
                 case SYSTEM: {
                     return service.getSystemCaAliases().getList();
@@ -689,8 +688,8 @@
                     final int n = profiles.size();
                     // First we get all aliases for all profiles in order to show progress
                     // correctly. Otherwise this could all be in a single loop.
-                    SparseArray<List<ParcelableString>> aliasesByProfileId = new SparseArray<
-                            List<ParcelableString>>(n);
+                    SparseArray<List<String>> aliasesByProfileId = new SparseArray<
+                            List<String>>(n);
                     int max = 0;
                     int progress = 0;
                     for (int i = 0; i < n; ++i) {
@@ -704,7 +703,7 @@
                         // Saving the connection for later use on the certificate dialog.
                         mKeyChainConnectionByProfileId.put(profileId, keyChainConnection);
                         IKeyChainService service = keyChainConnection.getService();
-                        List<ParcelableString> aliases = mTab.getAliases(service);
+                        List<String> aliases = mTab.getAliases(service);
                         if (isCancelled()) {
                             return new SparseArray<List<CertHolder>>();
                         }
@@ -714,7 +713,7 @@
                     for (int i = 0; i < n; ++i) {
                         UserHandle profile = profiles.get(i);
                         int profileId = profile.getIdentifier();
-                        List<ParcelableString> aliases = aliasesByProfileId.get(profileId);
+                        List<String> aliases = aliasesByProfileId.get(profileId);
                         if (isCancelled()) {
                             return new SparseArray<List<CertHolder>>();
                         }
@@ -729,7 +728,7 @@
                         List<CertHolder> certHolders = new ArrayList<CertHolder>(max);
                         final int aliasMax = aliases.size();
                         for (int j = 0; j < aliasMax; ++j) {
-                            String alias = aliases.get(j).string;
+                            String alias = aliases.get(j);
                             byte[] encodedCertificate = service.getEncodedCaCertificate(alias,
                                     true);
                             X509Certificate cert = KeyChain.toCertificate(encodedCertificate);
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 0ac5c6a..350ab9c 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -16,6 +16,11 @@
 
 package com.android.settings;
 
+import static android.content.Intent.EXTRA_USER;
+import static android.content.Intent.EXTRA_USER_ID;
+import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
+import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
+
 import android.annotation.Nullable;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
@@ -60,6 +65,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
 import android.preference.PreferenceFrameLayout;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.Contacts;
@@ -104,11 +110,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import static android.content.Intent.EXTRA_USER;
-import static android.content.Intent.EXTRA_USER_ID;
-import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
-import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
-
 public final class Utils extends com.android.settingslib.Utils {
 
     private static final String TAG = "Settings";
@@ -1246,4 +1247,33 @@
                 && (Settings.Secure.getInt(context.getContentResolver(),
                         carrierDemoModeSetting, 0) == 1);
     }
+
+    /**
+     * Returns if a given user is a profile of another user.
+     * @param user The user whose profiles will be checked.
+     * @param profile The (potential) profile.
+     * @return if the profile is actually a profile
+     */
+    public static boolean isProfileOf(UserInfo user, UserInfo profile) {
+        return user.id == profile.id ||
+                (user.profileGroupId != UserInfo.NO_PROFILE_GROUP_ID
+                        && user.profileGroupId == profile.profileGroupId);
+    }
+
+    /**
+     * Tries to initalize a volume with the given bundle. If it is a valid, private, and readable
+     * {@link VolumeInfo}, it is returned. If it is not valid, null is returned.
+     */
+    @Nullable
+    public static VolumeInfo maybeInitializeVolume(StorageManager sm, Bundle bundle) {
+        final String volumeId = bundle.getString(VolumeInfo.EXTRA_VOLUME_ID,
+                VolumeInfo.ID_PRIVATE_INTERNAL);
+        VolumeInfo volume = sm.findVolumeById(volumeId);
+        return isVolumeValid(volume) ? volume : null;
+    }
+
+    private static boolean isVolumeValid(VolumeInfo volume) {
+        return (volume != null) && (volume.getType() == VolumeInfo.TYPE_PRIVATE)
+                && volume.isMountedReadable();
+    }
 }
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 196e4bd..78f9de6 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -252,15 +252,6 @@
 
         final Context context = getActivity();
 
-        if (ImsManager.isWfcEnabledByPlatform(context)) {
-            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
-
-            mSwitchBar.addOnSwitchChangeListener(this);
-
-            mValidListener = true;
-        }
-
         // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
         boolean wfcEnabled = ImsManager.isWfcEnabledByUser(context)
                 && ImsManager.isNonTtyOrTtyOnVolteEnabled(context);
@@ -271,6 +262,15 @@
         mButtonWfcRoamingMode.setValue(Integer.toString(wfcRoamingMode));
         updateButtonWfcMode(context, wfcEnabled, wfcMode, wfcRoamingMode);
 
+        if (ImsManager.isWfcEnabledByPlatform(context)) {
+            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+
+            mSwitchBar.addOnSwitchChangeListener(this);
+
+            mValidListener = true;
+        }
+
         context.registerReceiver(mIntentReceiver, mIntentFilter);
 
         Intent intent = getActivity().getIntent();
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
deleted file mode 100644
index 32dc0c3..0000000
--- a/src/com/android/settings/WirelessSettings.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.Log;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.network.AirplaneModePreferenceController;
-import com.android.settings.network.MobileNetworkPreferenceController;
-import com.android.settings.network.MobilePlanPreferenceController;
-import com.android.settings.network.ProxyPreferenceController;
-import com.android.settings.network.TetherPreferenceController;
-import com.android.settings.network.VpnPreferenceController;
-import com.android.settings.network.WifiCallingPreferenceController;
-import com.android.settings.nfc.NfcPreferenceController;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settingslib.RestrictedLockUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static com.android.settings.network.MobilePlanPreferenceController
-        .MANAGE_MOBILE_PLAN_DIALOG_ID;
-
-public class WirelessSettings extends SettingsPreferenceFragment implements Indexable,
-        MobilePlanPreferenceController.MobilePlanPreferenceHost {
-    private static final String TAG = "WirelessSettings";
-
-    private static final String KEY_WIMAX_SETTINGS = "wimax_settings";
-
-    private UserManager mUm;
-
-    private AirplaneModePreferenceController mAirplaneModePreferenceController;
-    private TetherPreferenceController mTetherPreferenceController;
-    private MobileNetworkPreferenceController mMobileNetworkPreferenceController;
-    private VpnPreferenceController mVpnPreferenceController;
-    private WifiCallingPreferenceController mWifiCallingPreferenceController;
-    private ProxyPreferenceController mProxyPreferenceController;
-    private MobilePlanPreferenceController mMobilePlanPreferenceController;
-    private NfcPreferenceController mNfcPreferenceController;
-
-    /**
-     * Invoked on each preference click in this hierarchy, overrides
-     * PreferenceFragment's implementation.  Used to make sure we track the
-     * preference click events.
-     */
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        log("onPreferenceTreeClick: preference=" + preference);
-        if (mAirplaneModePreferenceController.handlePreferenceTreeClick(preference)) {
-            return true;
-        }
-        if (mMobilePlanPreferenceController.handlePreferenceTreeClick(preference)) {
-            return true;
-        }
-        // Let the intents be launched by the Preference manager
-        return super.onPreferenceTreeClick(preference);
-    }
-
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        log("onCreateDialog: dialogId=" + dialogId);
-        switch (dialogId) {
-            case MANAGE_MOBILE_PLAN_DIALOG_ID:
-                return new AlertDialog.Builder(getActivity())
-                        .setMessage(mMobilePlanPreferenceController.getMobilePlanDialogMessage())
-                        .setCancelable(false)
-                        .setPositiveButton(com.android.internal.R.string.ok,
-                                new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int id) {
-                                        log("MANAGE_MOBILE_PLAN_DIALOG.onClickListener id=" + id);
-                                        mMobilePlanPreferenceController
-                                                .setMobilePlanDialogMessage(null);
-                                    }
-                                })
-                        .create();
-        }
-        return super.onCreateDialog(dialogId);
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        if (MANAGE_MOBILE_PLAN_DIALOG_ID == dialogId) {
-            return MetricsEvent.DIALOG_MANAGE_MOBILE_PLAN;
-        }
-        return 0;
-    }
-
-    private void log(String s) {
-        Log.d(TAG, s);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.WIRELESS;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mUm = (UserManager) getSystemService(Context.USER_SERVICE);
-
-        addPreferencesFromResource(R.xml.wireless_settings);
-
-        final boolean isAdmin = mUm.isAdminUser();
-
-        final Activity activity = getActivity();
-
-        final PreferenceScreen screen = getPreferenceScreen();
-        mAirplaneModePreferenceController = new AirplaneModePreferenceController(activity, this);
-        mTetherPreferenceController = new TetherPreferenceController(activity);
-        mMobileNetworkPreferenceController = new MobileNetworkPreferenceController(activity);
-        mVpnPreferenceController = new VpnPreferenceController(activity);
-        mWifiCallingPreferenceController = new WifiCallingPreferenceController(activity);
-        mProxyPreferenceController = new ProxyPreferenceController(activity);
-        mMobilePlanPreferenceController = new MobilePlanPreferenceController(activity, this);
-        mNfcPreferenceController = new NfcPreferenceController(activity);
-
-        mMobilePlanPreferenceController.onCreate(savedInstanceState);
-
-        mAirplaneModePreferenceController.displayPreference(screen);
-        mTetherPreferenceController.displayPreference(screen);
-        mMobileNetworkPreferenceController.displayPreference(screen);
-        mVpnPreferenceController.displayPreference(screen);
-        mWifiCallingPreferenceController.displayPreference(screen);
-        mProxyPreferenceController.displayPreference(screen);
-        mMobilePlanPreferenceController.displayPreference(screen);
-        mNfcPreferenceController.displayPreference(screen);
-
-        String toggleable = Settings.Global.getString(activity.getContentResolver(),
-                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
-
-        //enable/disable wimax depending on the value in config.xml
-        final boolean isWimaxEnabled = isAdmin && this.getResources().getBoolean(
-                com.android.internal.R.bool.config_wimaxEnabled);
-        if (!isWimaxEnabled || RestrictedLockUtils.hasBaseUserRestriction(activity,
-                UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, UserHandle.myUserId())) {
-            PreferenceScreen root = getPreferenceScreen();
-            Preference ps = findPreference(KEY_WIMAX_SETTINGS);
-            if (ps != null) root.removePreference(ps);
-        } else {
-            if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIMAX)
-                    && isWimaxEnabled) {
-                Preference ps = findPreference(KEY_WIMAX_SETTINGS);
-                ps.setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
-            }
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        mAirplaneModePreferenceController.onResume();
-        mNfcPreferenceController.onResume();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        mMobilePlanPreferenceController.onSaveInstanceState(outState);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mAirplaneModePreferenceController.onPause();
-        mNfcPreferenceController.onPause();
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        mAirplaneModePreferenceController.onActivityResult(requestCode, resultCode, data);
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-    @Override
-    public void showMobilePlanMessageDialog() {
-        showDialog(MANAGE_MOBILE_PLAN_DIALOG_ID);
-    }
-
-    @Override
-    protected int getHelpResource() {
-        return R.string.help_url_more_networks;
-    }
-}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index dc57bdd..807371e 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -81,8 +81,6 @@
             "toggle_power_button_ends_call_preference";
     private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE =
             "toggle_lock_screen_rotation_preference";
-    private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE =
-            "toggle_speak_password_preference";
     private static final String TOGGLE_LARGE_POINTER_ICON =
             "toggle_large_pointer_icon";
     private static final String TOGGLE_MASTER_MONO =
@@ -184,7 +182,6 @@
     private SwitchPreference mToggleHighTextContrastPreference;
     private SwitchPreference mTogglePowerButtonEndsCallPreference;
     private SwitchPreference mToggleLockScreenRotationPreference;
-    private SwitchPreference mToggleSpeakPasswordPreference;
     private SwitchPreference mToggleLargePointerIconPreference;
     private SwitchPreference mToggleMasterMonoPreference;
     private ListPreference mSelectLongPressTimeoutPreference;
@@ -334,9 +331,6 @@
         } else if (mToggleLockScreenRotationPreference == preference) {
             handleLockScreenRotationPreferenceClick();
             return true;
-        } else if (mToggleSpeakPasswordPreference == preference) {
-            handleToggleSpeakPasswordPreferenceClick();
-            return true;
         } else if (mToggleLargePointerIconPreference == preference) {
             handleToggleLargePointerIconPreferenceClick();
             return true;
@@ -369,12 +363,6 @@
                 !mToggleLockScreenRotationPreference.isChecked());
     }
 
-    private void handleToggleSpeakPasswordPreferenceClick() {
-        Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
-                mToggleSpeakPasswordPreference.isChecked() ? 1 : 0);
-    }
-
     private void handleToggleLargePointerIconPreferenceClick() {
         Settings.Secure.putInt(getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON,
@@ -424,10 +412,6 @@
             mSystemsCategory.removePreference(mToggleLockScreenRotationPreference);
         }
 
-        // Speak passwords.
-        mToggleSpeakPasswordPreference =
-                (SwitchPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
-
         // Large pointer icon.
         mToggleLargePointerIconPreference =
                 (SwitchPreference) findPreference(TOGGLE_LARGE_POINTER_ICON);
@@ -606,11 +590,6 @@
         // Auto-rotate screen
         updateLockScreenRotationCheckbox();
 
-        // Speak passwords.
-        final boolean speakPasswordEnabled = Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;
-        mToggleSpeakPasswordPreference.setChecked(speakPasswordEnabled);
-
         // Large pointer icon.
         mToggleLargePointerIconPreference.setChecked(Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, 0) != 0);
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index cf72383..b820cc2 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -46,7 +46,6 @@
 
         // Finish configuring the content view.
         getActionBar().setDisplayHomeAsUpEnabled(true);
-        setIsDrawerPresent(false);
     }
 
     @Override
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index 605688e..2ad21d9 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -46,7 +46,7 @@
 abstract class AccountPreferenceBase extends SettingsPreferenceFragment
         implements AuthenticatorHelper.OnAccountsUpdateListener {
 
-    protected static final String TAG = "AccountSettings";
+    protected static final String TAG = "AccountPreferenceBase";
     protected static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
 
     public static final String AUTHORITIES_FILTER_KEY = "authorities";
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index 635f440..c54a2d1 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -30,7 +30,6 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceGroup;
@@ -43,6 +42,7 @@
 import com.android.settings.DimmableIconPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
@@ -53,6 +53,7 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.Index;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.search2.SearchFeatureProviderImpl;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.accounts.AuthenticatorHelper;
 
@@ -85,8 +86,7 @@
     private Preference mProfileNotAvailablePreference;
     private String[] mAuthorities;
     private int mAuthoritiesCount = 0;
-    private PreferenceFragment mParent;
-    private boolean mIAEnabled;
+    private SettingsPreferenceFragment mParent;
     private int mAccountProfileOrder = ORDER_ACCOUNT_PROFILES;
     private AccountRestrictionHelper mHelper;
     private DashboardFeatureProvider mDashboardFeatureProvider;
@@ -122,13 +122,13 @@
         public UserInfo userInfo;
     }
 
-    public AccountPreferenceController(Context context, PreferenceFragment parent,
+    public AccountPreferenceController(Context context, SettingsPreferenceFragment parent,
         String[] authorities) {
         this(context, parent, authorities, new AccountRestrictionHelper(context));
     }
 
     @VisibleForTesting
-    AccountPreferenceController(Context context, PreferenceFragment parent,
+    AccountPreferenceController(Context context, SettingsPreferenceFragment parent,
         String[] authorities, AccountRestrictionHelper helper) {
         super(context);
         mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
@@ -140,7 +140,6 @@
         final FeatureFactory featureFactory = FeatureFactory.getFactory(mContext);
         mDashboardFeatureProvider = featureFactory.getDashboardFeatureProvider(mContext);
         mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();
-        mIAEnabled = mDashboardFeatureProvider.isEnabled();
         mHelper = helper;
     }
 
@@ -255,17 +254,9 @@
         if (!isAvailable()) {
             // This should not happen
             Log.e(TAG, "We should not be showing settings for a managed profile");
-            if (!mIAEnabled) {
-                ((AccountSettings) mParent).finish();
-            }
             return;
         }
 
-        if (!mIAEnabled) {
-            // Load the preferences from an XML resource
-            mParent.addPreferencesFromResource(R.xml.account_settings);
-        }
-
         if (mUm.isLinkedUser()) {
             // Restricted user or similar
             UserInfo userInfo = mUm.getUserInfo(UserHandle.myUserId());
@@ -330,8 +321,8 @@
                 DISALLOW_MODIFY_ACCOUNTS, userInfo.id);
         }
         mProfiles.put(userInfo.id, profileData);
-        Index.getInstance(mContext).updateFromClassNameResource(
-                AccountSettings.class.getName(), true, true);
+        new SearchFeatureProviderImpl().getIndexingManager(mContext).updateFromClassNameResource(
+                UserAndAccountDashboardFragment.class.getName(), true, true);
     }
 
     private DimmableIconPreference newAddAccountPreference(Context context) {
@@ -471,52 +462,29 @@
             final Drawable icon = helper.getDrawableForType(mContext, accountType);
             final Context prefContext = mParent.getPreferenceManager().getContext();
 
-            if (mIAEnabled) {
-                // Add a preference row for each individual account
-                for (Account account : accounts) {
-                    final ArrayList<String> auths =
-                        helper.getAuthoritiesForAccountType(account.type);
-                    if (!AccountRestrictionHelper.showAccount(mAuthorities, auths)) {
-                        continue;
-                    }
-                    final Bundle fragmentArguments = new Bundle();
-                    fragmentArguments.putParcelable(AccountDetailDashboardFragment.KEY_ACCOUNT,
-                        account);
-                    fragmentArguments.putParcelable(AccountDetailDashboardFragment.KEY_USER_HANDLE,
-                        userHandle);
-                    fragmentArguments.putString(AccountDetailDashboardFragment.KEY_ACCOUNT_TYPE,
-                        accountType);
-                    fragmentArguments.putString(AccountDetailDashboardFragment.KEY_ACCOUNT_LABEL,
-                        label.toString());
-                    fragmentArguments.putInt(AccountDetailDashboardFragment.KEY_ACCOUNT_TITLE_RES,
-                        titleResId);
-                    fragmentArguments.putParcelable(EXTRA_USER, userHandle);
-                    accountTypePreferences.add(new AccountTypePreference(
-                        prefContext, mMetricsFeatureProvider.getMetricsCategory(mParent),
-                            account.name, titleResPackageName, titleResId, label,
-                        AccountDetailDashboardFragment.class.getName(), fragmentArguments, icon));
+            // Add a preference row for each individual account
+            for (Account account : accounts) {
+                final ArrayList<String> auths =
+                    helper.getAuthoritiesForAccountType(account.type);
+                if (!AccountRestrictionHelper.showAccount(mAuthorities, auths)) {
+                    continue;
                 }
-            } else if (skipToAccount) {
                 final Bundle fragmentArguments = new Bundle();
-                fragmentArguments.putParcelable(AccountSyncSettings.ACCOUNT_KEY,
-                        accounts[0]);
+                fragmentArguments.putParcelable(AccountDetailDashboardFragment.KEY_ACCOUNT,
+                    account);
+                fragmentArguments.putParcelable(AccountDetailDashboardFragment.KEY_USER_HANDLE,
+                    userHandle);
+                fragmentArguments.putString(AccountDetailDashboardFragment.KEY_ACCOUNT_TYPE,
+                    accountType);
+                fragmentArguments.putString(AccountDetailDashboardFragment.KEY_ACCOUNT_LABEL,
+                    label.toString());
+                fragmentArguments.putInt(AccountDetailDashboardFragment.KEY_ACCOUNT_TITLE_RES,
+                    titleResId);
                 fragmentArguments.putParcelable(EXTRA_USER, userHandle);
-
                 accountTypePreferences.add(new AccountTypePreference(
-                        prefContext, mMetricsFeatureProvider.getMetricsCategory(mParent),
-                        label, titleResPackageName, titleResId, AccountSyncSettings.class.getName(),
-                        fragmentArguments, icon));
-            } else {
-                final Bundle fragmentArguments = new Bundle();
-                fragmentArguments.putString(ManageAccountsSettings.KEY_ACCOUNT_TYPE, accountType);
-                fragmentArguments.putString(ManageAccountsSettings.KEY_ACCOUNT_LABEL,
-                        label.toString());
-                fragmentArguments.putParcelable(EXTRA_USER, userHandle);
-
-                accountTypePreferences.add(new AccountTypePreference(
-                        prefContext, mMetricsFeatureProvider.getMetricsCategory(mParent), label,
-                        titleResPackageName, titleResId, ManageAccountsSettings.class.getName(),
-                        fragmentArguments, icon));
+                    prefContext, mMetricsFeatureProvider.getMetricsCategory(mParent),
+                    account.name, titleResPackageName, titleResId, label,
+                    AccountDetailDashboardFragment.class.getName(), fragmentArguments, icon));
             }
             helper.preloadDrawableForType(mContext, accountType);
         }
@@ -524,10 +492,7 @@
         Collections.sort(accountTypePreferences, new Comparator<AccountTypePreference>() {
             @Override
             public int compare(AccountTypePreference t1, AccountTypePreference t2) {
-                int result = 0;
-                if (mIAEnabled) {
-                    result = t1.getSummary().toString().compareTo(t2.getSummary().toString());
-                }
+                int result = t1.getSummary().toString().compareTo(t2.getSummary().toString());
                 return result != 0
                     ? result : t1.getTitle().toString().compareTo(t2.getTitle().toString());
             }
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
deleted file mode 100644
index de721bb..0000000
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accounts;
-
-import android.app.ActivityManager;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Process;
-import android.os.UserHandle;
-import android.provider.SearchIndexableResource;
-import android.util.Log;
-import android.util.SparseArray;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-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.settings.search.SearchIndexableRaw;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static android.provider.Settings.EXTRA_AUTHORITIES;
-
-/**
- * Settings screen for the account types on the device.
- * This shows all account types available for personal and work profiles.
- *
- * An extra {@link UserHandle} can be specified in the intent as {@link EXTRA_USER}, if the user for
- * which the action needs to be performed is different to the one the Settings App will run in.
- */
-public class AccountSettings extends SettingsPreferenceFragment implements Indexable {
-    public static final String TAG = "AccountSettings";
-
-
-    private String[] mAuthorities;
-
-    private AccountPreferenceController mAccountPreferenceController;
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.ACCOUNT;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mAuthorities = getActivity().getIntent().getStringArrayExtra(EXTRA_AUTHORITIES);
-        setHasOptionsMenu(true);
-        mAccountPreferenceController =
-            new AccountPreferenceController(getActivity(), this, mAuthorities);
-        getLifecycle().addObserver(mAccountPreferenceController);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.account_settings, menu);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        final UserHandle currentProfile = Process.myUserHandle();
-        SparseArray<AccountPreferenceController.ProfileData> profiles =
-            mAccountPreferenceController.getProfileData();
-
-        if (profiles.size() == 1) {
-            menu.findItem(R.id.account_settings_menu_auto_sync)
-                .setVisible(true)
-                .setOnMenuItemClickListener(new MasterSyncStateClickListener(currentProfile))
-                .setChecked(ContentResolver.getMasterSyncAutomaticallyAsUser(
-                    currentProfile.getIdentifier()));
-            menu.findItem(R.id.account_settings_menu_auto_sync_personal).setVisible(false);
-            menu.findItem(R.id.account_settings_menu_auto_sync_work).setVisible(false);
-        } else if (profiles.size() > 1) {
-            // We assume there's only one managed profile, otherwise UI needs to change
-            final UserHandle managedProfile = profiles.valueAt(1).userInfo.getUserHandle();
-
-            menu.findItem(R.id.account_settings_menu_auto_sync_personal)
-                .setVisible(true)
-                .setOnMenuItemClickListener(new MasterSyncStateClickListener(currentProfile))
-                .setChecked(ContentResolver.getMasterSyncAutomaticallyAsUser(
-                    currentProfile.getIdentifier()));
-            menu.findItem(R.id.account_settings_menu_auto_sync_work)
-                .setVisible(true)
-                .setOnMenuItemClickListener(new MasterSyncStateClickListener(managedProfile))
-                .setChecked(ContentResolver.getMasterSyncAutomaticallyAsUser(
-                    managedProfile.getIdentifier()));
-            menu.findItem(R.id.account_settings_menu_auto_sync).setVisible(false);
-        } else {
-            Log.w(TAG, "Method onPrepareOptionsMenu called before profiles was initialized");
-        }
-    }
-
-    private class MasterSyncStateClickListener implements MenuItem.OnMenuItemClickListener {
-        private final UserHandle mUserHandle;
-
-        public MasterSyncStateClickListener(UserHandle userHandle) {
-            mUserHandle = userHandle;
-        }
-
-        @Override
-        public boolean onMenuItemClick(MenuItem item) {
-            if (ActivityManager.isUserAMonkey()) {
-                Log.d(TAG, "ignoring monkey's attempt to flip sync state");
-            } else {
-                AutoSyncDataPreferenceController.ConfirmAutoSyncChangeFragment.show(
-                    AccountSettings.this, !item.isChecked(), mUserHandle, null/*preference*/);
-            }
-            return true;
-        }
-    }
-
-    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.account_settings;
-                return Arrays.asList(sir);
-            }
-
-            @Override
-            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
-                new AccountPreferenceController(context, null, null).updateRawDataToIndex(result);
-                return result;
-            }
-        };
-}
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index ce16ba3..345f9fc 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -72,7 +72,7 @@
     private static final String KEY_CALLER_IDENTITY = "pendingIntent";
     private static final String SHOULD_NOT_RESOLVE = "SHOULDN'T RESOLVE!";
 
-    private static final String TAG = "AccountSettings";
+    private static final String TAG = "AddAccountSettings";
 
     /* package */ static final String EXTRA_SELECTED_ACCOUNT = "selected_account";
 
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
deleted file mode 100644
index f93fe09..0000000
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accounts;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.SyncAdapterType;
-import android.content.SyncInfo;
-import android.content.SyncStatusInfo;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.ArraySet;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
-import com.android.settingslib.accounts.AuthenticatorHelper;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import static android.content.Intent.EXTRA_USER;
-
-/** Manages settings for Google Account. */
-public class ManageAccountsSettings extends AccountPreferenceBase
-        implements AuthenticatorHelper.OnAccountsUpdateListener {
-    public static final String KEY_ACCOUNT_TYPE = "account_type";
-    public static final String KEY_ACCOUNT_LABEL = "account_label";
-
-    private static final int MENU_SYNC_NOW_ID = Menu.FIRST;
-    private static final int MENU_SYNC_CANCEL_ID = Menu.FIRST + 1;
-
-    private static final int REQUEST_SHOW_SYNC_SETTINGS = 1;
-
-    private String[] mAuthorities;
-    private TextView mErrorInfoView;
-
-    // If an account type is set, then show only accounts of that type
-    private String mAccountType;
-    // Temporary hack, to deal with backward compatibility
-    // mFirstAccount is used for the injected preferences
-    private Account mFirstAccount;
-
-    protected Set<String> mUserFacingSyncAuthorities;
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.ACCOUNTS_MANAGE_ACCOUNTS;
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        Bundle args = getArguments();
-        if (args != null && args.containsKey(KEY_ACCOUNT_TYPE)) {
-            mAccountType = args.getString(KEY_ACCOUNT_TYPE);
-        }
-        addPreferencesFromResource(R.xml.manage_accounts_settings);
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mAuthenticatorHelper.listenToAccountUpdates();
-        updateAuthDescriptions();
-        showAccountsIfNeeded();
-        showSyncState();
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        final View view = inflater.inflate(R.layout.manage_accounts_screen, container, false);
-        final ViewGroup prefs_container = (ViewGroup) view.findViewById(R.id.prefs_container);
-        Utils.prepareCustomPreferencesList(container, view, prefs_container, false);
-        View prefs = super.onCreateView(inflater, prefs_container, savedInstanceState);
-        prefs_container.addView(prefs);
-        return view;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        final Activity activity = getActivity();
-        final View view = getView();
-
-        mErrorInfoView = (TextView) view.findViewById(R.id.sync_settings_error_info);
-        mErrorInfoView.setVisibility(View.GONE);
-
-        mAuthorities = activity.getIntent().getStringArrayExtra(AUTHORITIES_FILTER_KEY);
-
-        Bundle args = getArguments();
-        if (args != null && args.containsKey(KEY_ACCOUNT_LABEL)) {
-            getActivity().setTitle(args.getString(KEY_ACCOUNT_LABEL));
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mAuthenticatorHelper.stopListeningToAccountUpdates();
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        final Activity activity = getActivity();
-        activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
-        activity.getActionBar().setCustomView(null);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference instanceof AccountPreference) {
-            startAccountSettings((AccountPreference) preference);
-        } else {
-            return false;
-        }
-        return true;
-    }
-
-    private void startAccountSettings(AccountPreference acctPref) {
-        Bundle args = new Bundle();
-        args.putParcelable(AccountSyncSettings.ACCOUNT_KEY, acctPref.getAccount());
-        args.putParcelable(EXTRA_USER, mUserHandle);
-        ((SettingsActivity) getActivity()).startPreferencePanel(this,
-                AccountSyncSettings.class.getCanonicalName(), args,
-                R.string.account_sync_settings_title, acctPref.getAccount().name,
-                this, REQUEST_SHOW_SYNC_SETTINGS);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        menu.add(0, MENU_SYNC_NOW_ID, 0, getString(R.string.sync_menu_sync_now))
-                .setIcon(R.drawable.ic_menu_refresh_holo_dark);
-        menu.add(0, MENU_SYNC_CANCEL_ID, 0, getString(R.string.sync_menu_sync_cancel))
-                .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-        boolean syncActive = !getCurrentSyncs(mUserHandle.getIdentifier()).isEmpty();
-        menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive);
-        menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_SYNC_NOW_ID:
-                requestOrCancelSyncForAccounts(true);
-                return true;
-            case MENU_SYNC_CANCEL_ID:
-                requestOrCancelSyncForAccounts(false);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void requestOrCancelSyncForAccounts(boolean sync) {
-        final int userId = mUserHandle.getIdentifier();
-        SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser(userId);
-        Bundle extras = new Bundle();
-        extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
-        int count = getPreferenceScreen().getPreferenceCount();
-        // For each account
-        for (int i = 0; i < count; i++) {
-            Preference pref = getPreferenceScreen().getPreference(i);
-            if (pref instanceof AccountPreference) {
-                Account account = ((AccountPreference) pref).getAccount();
-                // For all available sync authorities, sync those that are enabled for the account
-                for (int j = 0; j < syncAdapters.length; j++) {
-                    SyncAdapterType sa = syncAdapters[j];
-                    if (syncAdapters[j].accountType.equals(mAccountType)
-                            && ContentResolver.getSyncAutomaticallyAsUser(account, sa.authority,
-                            userId)) {
-                        if (sync) {
-                            ContentResolver.requestSyncAsUser(account, sa.authority, userId,
-                                    extras);
-                        } else {
-                            ContentResolver.cancelSyncAsUser(account, sa.authority, userId);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void onSyncStateUpdated() {
-        final Activity activity = getActivity();
-        // Catch any delayed delivery of update messages
-        if (activity == null || activity.isFinishing()) {
-            return;
-        }
-        showSyncState();
-        activity.invalidateOptionsMenu();
-    }
-
-    private void tryInitUserFacingSyncAuthorities(int userId) {
-        if (mUserFacingSyncAuthorities != null) {
-            return;
-        }
-        mUserFacingSyncAuthorities = new ArraySet<>();
-
-        // only track userfacing sync adapters when deciding if account is synced or not
-        final SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser(userId);
-        for (int k = 0, n = syncAdapters.length; k < n; k++) {
-            final SyncAdapterType sa = syncAdapters[k];
-            if (sa.isUserVisible()) {
-                mUserFacingSyncAuthorities.add(sa.authority);
-            }
-        }
-    }
-
-    /**
-     * Shows the sync state of the accounts. Note: it must be called after the accounts have been
-     * loaded.
-     *
-     * @see {@link #showAccountsIfNeeded()}.
-     */
-    @VisibleForTesting
-    void showSyncState() {
-        final int userId = mUserHandle.getIdentifier();
-        tryInitUserFacingSyncAuthorities(userId);
-
-        // iterate over all the preferences, setting the state properly for each
-        final List<SyncInfo> currentSyncs = getCurrentSyncs(userId);
-
-        boolean anySyncFailed = false; // true if sync on any account failed
-        Date date = new Date();
-
-        final PreferenceScreen screen = getPreferenceScreen();
-        final int prefCount = screen.getPreferenceCount();
-        for (int i = 0; i < prefCount; i++) {
-            Preference pref = screen.getPreference(i);
-            if (!(pref instanceof AccountPreference)) {
-                continue;
-            }
-
-            final AccountPreference accountPref = (AccountPreference) pref;
-            final Account account = accountPref.getAccount();
-            int syncCount = 0;
-            long lastSuccessTime = 0;
-            boolean syncIsFailing = false;
-            final ArrayList<String> authorities = accountPref.getAuthorities();
-            boolean syncingNow = false;
-            if (authorities != null) {
-                for (String authority : authorities) {
-                    SyncStatusInfo status = getSyncStatusInfo(account, authority, userId);
-                    boolean syncEnabled = isSyncEnabled(userId, account, authority);
-                    boolean activelySyncing = isSyncing(currentSyncs, account, authority);
-                    boolean lastSyncFailed = status != null
-                            && syncEnabled
-                            && status.lastFailureTime != 0
-                            && status.getLastFailureMesgAsInt(0)
-                            != ContentResolver.SYNC_ERROR_SYNC_ALREADY_IN_PROGRESS;
-                    if (lastSyncFailed && !activelySyncing
-                            && !ContentResolver.isSyncPending(account, authority)) {
-                        syncIsFailing = true;
-                        anySyncFailed = true;
-                        break;
-                    }
-
-                    if (status != null && lastSuccessTime < status.lastSuccessTime) {
-                        lastSuccessTime = status.lastSuccessTime;
-                    }
-                    syncCount += syncEnabled && mUserFacingSyncAuthorities.contains(authority)
-                            ? 1 : 0;
-                    syncingNow |= activelySyncing;
-                    if (syncingNow) {
-                        break;
-                    }
-                }
-            } else {
-                if (VERBOSE) {
-                    Log.v(TAG, "no syncadapters found for " + account);
-                }
-            }
-            if (syncIsFailing) {
-                accountPref.setSyncStatus(AccountPreference.SYNC_ERROR, true);
-            } else if (syncCount == 0) {
-                accountPref.setSyncStatus(AccountPreference.SYNC_DISABLED, true);
-            } else if (syncCount > 0) {
-                if (syncingNow) {
-                    accountPref.setSyncStatus(AccountPreference.SYNC_IN_PROGRESS, true);
-                } else {
-                    accountPref.setSyncStatus(AccountPreference.SYNC_ENABLED, true);
-                    if (lastSuccessTime > 0) {
-                        accountPref.setSyncStatus(AccountPreference.SYNC_ENABLED, false);
-                        date.setTime(lastSuccessTime);
-                        final String timeString = formatSyncDate(date);
-                        accountPref.setSummary(getResources().getString(
-                                R.string.last_synced, timeString));
-                    }
-                }
-            } else {
-                accountPref.setSyncStatus(AccountPreference.SYNC_DISABLED, true);
-            }
-        }
-        if (mErrorInfoView != null) {
-            mErrorInfoView.setVisibility(anySyncFailed ? View.VISIBLE : View.GONE);
-        }
-    }
-
-    private boolean isSyncing(List<SyncInfo> currentSyncs, Account account, String authority) {
-        final int count = currentSyncs.size();
-        for (int i = 0; i < count; i++) {
-            SyncInfo syncInfo = currentSyncs.get(i);
-            if (syncInfo.account.equals(account) && syncInfo.authority.equals(authority)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @VisibleForTesting
-    protected boolean isSyncEnabled(int userId, Account account, String authority) {
-        return ContentResolver.getSyncAutomaticallyAsUser(account, authority, userId)
-                && ContentResolver.getMasterSyncAutomaticallyAsUser(userId)
-                && (ContentResolver.getIsSyncableAsUser(account, authority, userId) > 0);
-    }
-
-    @Override
-    public void onAccountsUpdate(UserHandle userHandle) {
-        showAccountsIfNeeded();
-        onSyncStateUpdated();
-    }
-
-    private void showAccountsIfNeeded() {
-        if (getActivity() == null) return;
-        Account[] accounts = AccountManager.get(getActivity()).getAccountsAsUser(
-                mUserHandle.getIdentifier());
-        getPreferenceScreen().removeAll();
-        mFirstAccount = null;
-        addPreferencesFromResource(R.xml.manage_accounts_settings);
-        for (int i = 0, n = accounts.length; i < n; i++) {
-            final Account account = accounts[i];
-            // If an account type is specified for this screen, skip other types
-            if (mAccountType != null && !account.type.equals(mAccountType)) continue;
-            final ArrayList<String> auths = getAuthoritiesForAccountType(account.type);
-
-            if (AccountRestrictionHelper.showAccount(mAuthorities, auths)) {
-                final Drawable icon = getDrawableForType(account.type);
-                final AccountPreference preference =
-                        new AccountPreference(getPrefContext(), account, icon, auths, false);
-                getPreferenceScreen().addPreference(preference);
-                if (mFirstAccount == null) {
-                    mFirstAccount = account;
-                }
-            }
-        }
-        if (mAccountType != null && mFirstAccount != null) {
-            addAuthenticatorSettings();
-        } else {
-            // There's no account, close activity
-            finish();
-        }
-    }
-
-    private void addAuthenticatorSettings() {
-        PreferenceScreen prefs = addPreferencesForType(mAccountType, getPreferenceScreen());
-        if (prefs != null) {
-            mAccountTypePreferenceLoader.updatePreferenceIntents(prefs, mAccountType, mFirstAccount);
-        }
-    }
-
-    @Override
-    protected void onAuthDescriptionsUpdated() {
-        // Update account icons for all account preference items
-        for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
-            Preference pref = getPreferenceScreen().getPreference(i);
-            if (pref instanceof AccountPreference) {
-                AccountPreference accPref = (AccountPreference) pref;
-                accPref.setSummary(getLabelForType(accPref.getAccount().type));
-            }
-        }
-    }
-
-    @VisibleForTesting
-    protected List<SyncInfo> getCurrentSyncs(int userId) {
-        return ContentResolver.getCurrentSyncsAsUser(userId);
-    }
-
-    @VisibleForTesting
-    protected SyncStatusInfo getSyncStatusInfo(Account account, String authority, int userId) {
-        return ContentResolver.getSyncStatusAsUser(account, authority, userId);
-    }
-}
diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/applications/AppHeaderController.java
index 01d5fc7..45b8960 100644
--- a/src/com/android/settings/applications/AppHeaderController.java
+++ b/src/com/android/settings/applications/AppHeaderController.java
@@ -37,7 +37,6 @@
 import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.applications.instantapps.InstantAppDetails;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.applications.ApplicationsState;
 
@@ -81,7 +80,7 @@
     @ActionType
     private int mRightAction;
 
-    private InstantAppDetails mInstantAppDetails;
+    private boolean mIsInstantApp;
 
     public AppHeaderController(Context context, Fragment fragment, View appHeader) {
         mContext = context;
@@ -154,8 +153,8 @@
         return this;
     }
 
-    public AppHeaderController setInstantAppDetails(InstantAppDetails instantAppDetails) {
-        mInstantAppDetails = instantAppDetails;
+    public AppHeaderController setIsInstantApp(boolean isInstantApp) {
+        this.mIsInstantApp = isInstantApp;
         return this;
     }
 
@@ -220,26 +219,9 @@
             bindAppHeaderButtons();
         }
 
-        if (mInstantAppDetails != null) {
-            setText(R.id.instant_app_developer_title, mInstantAppDetails.developerTitle);
-            View maturity = mAppHeader.findViewById(R.id.instant_app_maturity);
-
-            if (maturity != null) {
-                String maturityText = mInstantAppDetails.maturityRatingString;
-                Drawable maturityIcon = mInstantAppDetails.maturityRatingIcon;
-                if (!TextUtils.isEmpty(maturityText) || maturityIcon != null) {
-                    maturity.setVisibility(View.VISIBLE);
-                }
-                setText(R.id.instant_app_maturity_text, maturityText);
-                if (maturityIcon != null) {
-                    ImageView maturityIconView = (ImageView) mAppHeader.findViewById(
-                            R.id.instant_app_maturity_icon);
-                    if (maturityIconView != null) {
-                        maturityIconView.setImageDrawable(maturityIcon);
-                    }
-                }
-            }
-            setText(R.id.instant_app_monetization, mInstantAppDetails.monetizationNotice);
+        if (mIsInstantApp) {
+            setText(R.id.install_type,
+                    mAppHeader.getResources().getString(R.string.install_type_instant));
         }
 
         return mAppHeader;
@@ -267,6 +249,8 @@
                         || !AppHeader.includeAppInfo(mFragment)) {
                     button.setVisibility(View.GONE);
                 } else {
+                    button.setContentDescription(
+                            mContext.getString(R.string.application_info_label));
                     button.setImageResource(com.android.settings.R.drawable.ic_info);
                     button.setOnClickListener(v -> AppInfoBase.startAppInfoFragment(
                             InstalledAppDetails.class, R.string.application_info_label,
diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java
index 910b618..4f3e8fa 100644
--- a/src/com/android/settings/applications/AppInfoWithHeader.java
+++ b/src/com/android/settings/applications/AppInfoWithHeader.java
@@ -23,6 +23,7 @@
 
 import com.android.settings.AppHeader;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.applications.AppUtils;
 
 import static com.android.settings.applications.AppHeaderController.ActionType;
 
@@ -52,6 +53,7 @@
                     .setIcon(mPackageInfo.applicationInfo.loadIcon(mPm))
                     .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
                     .setSummary(mPackageInfo)
+                    .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
                     .setPackageName(mPackageName)
                     .setUid(mPackageInfo.applicationInfo.uid)
                     .setButtonActions(ActionType.ACTION_APP_INFO, ActionType.ACTION_NONE)
diff --git a/src/com/android/settings/applications/AppStateInstallAppsBridge.java b/src/com/android/settings/applications/AppStateInstallAppsBridge.java
index 6d22e25..39a31e6 100644
--- a/src/com/android/settings/applications/AppStateInstallAppsBridge.java
+++ b/src/com/android/settings/applications/AppStateInstallAppsBridge.java
@@ -123,9 +123,8 @@
             }
         }
 
-        public int getSummary() {
-            return canInstallApps() ? R.string.external_source_trusted
-                    : R.string.external_source_untrusted;
+        public boolean isPotentialAppSource() {
+            return appOpMode != AppOpsManager.MODE_DEFAULT || permissionRequested;
         }
 
         @Override
@@ -150,7 +149,7 @@
                 return false;
             }
             InstallAppsState state = (InstallAppsState) info.extraInfo;
-            return (state.appOpMode != AppOpsManager.MODE_DEFAULT) || state.permissionRequested;
+            return state.isPotentialAppSource();
         }
     };
 }
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index e97a9ac..b4d7526 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -19,9 +19,11 @@
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.AppGlobals;
+import android.app.LoaderManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.Loader;
 import android.content.UriPermission;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageDataObserver;
@@ -52,8 +54,9 @@
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.Callbacks;
+import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -64,7 +67,8 @@
 import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
 
 public class AppStorageSettings extends AppInfoWithHeader
-        implements OnClickListener, Callbacks, DialogInterface.OnClickListener {
+        implements OnClickListener, Callbacks, DialogInterface.OnClickListener,
+        LoaderManager.LoaderCallbacks<AppStorageStats> {
     private static final String TAG = AppStorageSettings.class.getSimpleName();
 
     //internal constants used in Handler
@@ -123,6 +127,7 @@
     private boolean mCanClearData = true;
     private boolean mHaveSizes = false;
 
+    private AppStorageStats mLastResult;
     private long mLastCodeSize = -1;
     private long mLastDataSize = -1;
     private long mLastExternalCodeSize = -1;
@@ -139,6 +144,7 @@
 
     private VolumeInfo[] mCandidates;
     private AlertDialog.Builder mDialogBuilder;
+    private ApplicationInfo mInfo;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -152,7 +158,7 @@
     @Override
     public void onResume() {
         super.onResume();
-        mState.requestSize(mPackageName, mUserId);
+        updateSize();
     }
 
     private void setupViews() {
@@ -266,79 +272,13 @@
         return Formatter.formatFileSize(getActivity(), size);
     }
 
-    private void refreshSizeInfo() {
-        if (mAppEntry.size == ApplicationsState.SIZE_INVALID
-                || mAppEntry.size == ApplicationsState.SIZE_UNKNOWN) {
-            mLastCodeSize = mLastDataSize = mLastCacheSize = mLastTotalSize = -1;
-            if (!mHaveSizes) {
-                mAppSize.setSummary(mComputingStr);
-                mDataSize.setSummary(mComputingStr);
-                mCacheSize.setSummary(mComputingStr);
-                mTotalSize.setSummary(mComputingStr);
-            }
-            mClearDataButton.setEnabled(false);
-            mClearCacheButton.setEnabled(false);
-        } else {
-            mHaveSizes = true;
-            long codeSize = mAppEntry.codeSize;
-            long dataSize = mAppEntry.dataSize;
-            if (Environment.isExternalStorageEmulated()) {
-                codeSize += mAppEntry.externalCodeSize;
-                dataSize +=  mAppEntry.externalDataSize;
-            } else {
-                if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
-                    mLastExternalCodeSize = mAppEntry.externalCodeSize;
-                    mExternalCodeSize.setSummary(getSizeStr(mAppEntry.externalCodeSize));
-                }
-                if (mLastExternalDataSize !=  mAppEntry.externalDataSize) {
-                    mLastExternalDataSize =  mAppEntry.externalDataSize;
-                    mExternalDataSize.setSummary(getSizeStr( mAppEntry.externalDataSize));
-                }
-            }
-            if (mLastCodeSize != codeSize) {
-                mLastCodeSize = codeSize;
-                mAppSize.setSummary(getSizeStr(codeSize));
-            }
-            if (mLastDataSize != dataSize) {
-                mLastDataSize = dataSize;
-                mDataSize.setSummary(getSizeStr(dataSize));
-            }
-            long cacheSize = mAppEntry.cacheSize + mAppEntry.externalCacheSize;
-            if (mLastCacheSize != cacheSize) {
-                mLastCacheSize = cacheSize;
-                mCacheSize.setSummary(getSizeStr(cacheSize));
-            }
-            if (mLastTotalSize != mAppEntry.size) {
-                mLastTotalSize = mAppEntry.size;
-                mTotalSize.setSummary(getSizeStr(mAppEntry.size));
-            }
-
-            if ((mAppEntry.dataSize+ mAppEntry.externalDataSize) <= 0 || !mCanClearData) {
-                mClearDataButton.setEnabled(false);
-            } else {
-                mClearDataButton.setEnabled(true);
-                mClearDataButton.setOnClickListener(this);
-            }
-            if (cacheSize <= 0) {
-                mClearCacheButton.setEnabled(false);
-            } else {
-                mClearCacheButton.setEnabled(true);
-                mClearCacheButton.setOnClickListener(this);
-            }
-        }
-        if (mAppsControlDisallowedBySystem) {
-            mClearCacheButton.setEnabled(false);
-            mClearDataButton.setEnabled(false);
-        }
-    }
-
     @Override
     protected boolean refreshUi() {
         retrieveAppEntry();
         if (mAppEntry == null) {
             return false;
         }
-        refreshSizeInfo();
+        updateUiWithSize(mLastResult);
         refreshGrantedUriPermissions();
 
         final VolumeInfo currentVol = getActivity().getPackageManager()
@@ -454,7 +394,7 @@
         mClearDataButton.setText(R.string.clear_user_data_text);
         if (result == OP_SUCCESSFUL) {
             Log.i(TAG, "Cleared user data for package : "+packageName);
-            mState.requestSize(mPackageName, mUserId);
+            updateSize();
         } else {
             mClearDataButton.setEnabled(true);
         }
@@ -570,8 +510,91 @@
 
     @Override
     public void onPackageSizeChanged(String packageName) {
-        if (packageName.equals(mAppEntry.info.packageName)) {
-            refreshSizeInfo();
+    }
+
+    @Override
+    public Loader<AppStorageStats> onCreateLoader(int id, Bundle args) {
+        Context context = getContext();
+        return new FetchPackageStorageAsyncLoader(
+                context, new StorageStatsSource(context), mInfo, UserHandle.of(mUserId));
+    }
+
+    @Override
+    public void onLoadFinished(Loader<AppStorageStats> loader, AppStorageStats result) {
+        mLastResult = result;
+        updateUiWithSize(result);
+    }
+
+    @Override
+    public void onLoaderReset(Loader<AppStorageStats> loader) {
+    }
+
+    private void updateSize() {
+        PackageManager packageManager = getPackageManager();
+        try {
+            mInfo = packageManager.getApplicationInfo(mPackageName, 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Could not find package", e);
+        }
+
+        if (mInfo == null) {
+            return;
+        }
+
+        getLoaderManager().restartLoader(1, Bundle.EMPTY, this);
+    }
+
+    private void updateUiWithSize(AppStorageStats result) {
+        if (result == null) {
+            mLastCodeSize = mLastDataSize = mLastCacheSize = mLastTotalSize = -1;
+            if (!mHaveSizes) {
+                mAppSize.setSummary(mComputingStr);
+                mDataSize.setSummary(mComputingStr);
+                mCacheSize.setSummary(mComputingStr);
+                mTotalSize.setSummary(mComputingStr);
+            }
+            mClearDataButton.setEnabled(false);
+            mClearCacheButton.setEnabled(false);
+        } else {
+            mHaveSizes = true;
+            long codeSize = result.getCodeBytes();
+            long dataSize = result.getDataBytes();
+            if (mLastCodeSize != codeSize) {
+                mLastCodeSize = codeSize;
+                mAppSize.setSummary(getSizeStr(codeSize));
+            }
+            if (mLastDataSize != dataSize) {
+                mLastDataSize = dataSize;
+                mDataSize.setSummary(getSizeStr(dataSize));
+            }
+            long cacheSize = result.getCacheBytes();
+            if (mLastCacheSize != cacheSize) {
+                mLastCacheSize = cacheSize;
+                mCacheSize.setSummary(getSizeStr(cacheSize));
+            }
+
+            long totalSize = codeSize + dataSize + cacheSize;
+            if (mLastTotalSize != totalSize) {
+                mLastTotalSize = totalSize;
+                mTotalSize.setSummary(getSizeStr(totalSize));
+            }
+
+            if (dataSize <= 0 || !mCanClearData) {
+                mClearDataButton.setEnabled(false);
+            } else {
+                mClearDataButton.setEnabled(true);
+                mClearDataButton.setOnClickListener(this);
+            }
+            if (cacheSize <= 0) {
+                mClearCacheButton.setEnabled(false);
+            } else {
+                mClearCacheButton.setEnabled(true);
+                mClearCacheButton.setOnClickListener(this);
+            }
+        }
+        if (mAppsControlDisallowedBySystem) {
+            mClearCacheButton.setEnabled(false);
+            mClearDataButton.setEnabled(false);
         }
     }
 
@@ -586,7 +609,7 @@
                     break;
                 case MSG_CLEAR_CACHE:
                     // Refresh size info
-                    mState.requestSize(mPackageName, mUserId);
+                    updateSize();
                     break;
             }
         }
diff --git a/src/com/android/settings/applications/ExternalSourcesDetails.java b/src/com/android/settings/applications/ExternalSourcesDetails.java
index fd8221c..af9251c 100644
--- a/src/com/android/settings/applications/ExternalSourcesDetails.java
+++ b/src/com/android/settings/applications/ExternalSourcesDetails.java
@@ -27,6 +27,7 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
 public class ExternalSourcesDetails extends AppInfoWithHeader
         implements OnPreferenceChangeListener {
@@ -74,6 +75,18 @@
         return false;
     }
 
+    static CharSequence getPreferenceSummary(Context context, AppEntry entry) {
+        final InstallAppsState appsState;
+        if (entry.extraInfo instanceof InstallAppsState) {
+            appsState = (InstallAppsState) entry.extraInfo;
+        } else {
+            appsState = new AppStateInstallAppsBridge(context, null, null)
+                    .createInstallAppsStateFor(entry.info.packageName, entry.info.uid);
+        }
+        return context.getString(appsState.canInstallApps() ? R.string.external_source_trusted
+                : R.string.external_source_untrusted);
+    }
+
     private void setCanInstallApps(boolean newState) {
         mAppOpsManager.setMode(AppOpsManager.OP_REQUEST_INSTALL_PACKAGES,
                 mPackageInfo.applicationInfo.uid, mPackageName,
diff --git a/src/com/android/settings/applications/FetchPackageStorageAsyncLoader.java b/src/com/android/settings/applications/FetchPackageStorageAsyncLoader.java
new file mode 100644
index 0000000..3477299
--- /dev/null
+++ b/src/com/android/settings/applications/FetchPackageStorageAsyncLoader.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.os.UserHandle;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.utils.AsyncLoader;
+import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
+
+/**
+ * Fetches the storage stats using the StorageStatsManager for a given package and user tuple.
+ */
+public class FetchPackageStorageAsyncLoader extends AsyncLoader<AppStorageStats> {
+    private final StorageStatsSource mSource;
+    private final ApplicationInfo mInfo;
+    private final UserHandle mUser;
+
+    public FetchPackageStorageAsyncLoader(Context context, @NonNull StorageStatsSource source,
+            @NonNull ApplicationInfo info, @NonNull UserHandle user) {
+        super(context);
+        mSource = Preconditions.checkNotNull(source);
+        mInfo = info;
+        mUser = user;
+    }
+
+    @Override
+    public AppStorageStats loadInBackground() {
+        return mSource.getStatsForPackage(mInfo.volumeUuid, mInfo.packageName, mUser);
+    }
+
+    @Override
+    protected void onDiscardResult(AppStorageStats result) {
+    }
+}
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 441a02e..3427d9e 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -81,7 +81,6 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
-import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;
 import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
@@ -102,6 +101,8 @@
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.PermissionsSummaryHelper;
+import com.android.settingslib.applications.PermissionsSummaryHelper.PermissionsResultCallback;
 import com.android.settingslib.net.ChartData;
 import com.android.settingslib.net.ChartDataLoader;
 
@@ -490,23 +491,7 @@
         if (mFinishing) {
             return;
         }
-        boolean showIt = true;
-        if (mUpdatedSysApp) {
-            showIt = false;
-        } else if (mAppEntry == null) {
-            showIt = false;
-        } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-            showIt = false;
-        } else if (mPackageInfo == null || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
-            showIt = false;
-        } else if (UserHandle.myUserId() != 0) {
-            showIt = false;
-        } else if (mUserManager.getUsers().size() < 2) {
-            showIt = false;
-        } else if (PackageUtil.countPackageInUsers(mPm, mUserManager, mPackageName) < 2) {
-            showIt = false;
-        }
-        menu.findItem(UNINSTALL_ALL_USERS_MENU).setVisible(showIt);
+        menu.findItem(UNINSTALL_ALL_USERS_MENU).setVisible(shouldShowUninstallForAll(mAppEntry));
         mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
         MenuItem uninstallUpdatesItem = menu.findItem(UNINSTALL_UPDATES);
         uninstallUpdatesItem.setVisible(mUpdatedSysApp && !mAppsControlDisallowedBySystem);
@@ -563,6 +548,7 @@
                     .setLabel(mAppEntry)
                     .setIcon(mAppEntry)
                     .setSummary(getString(getInstallationStatus(mAppEntry.info)))
+                    .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
                     .done(false /* rebindActions */);
             mVersionPreference.setSummary(getString(R.string.version_text, pkgInfo.versionName));
         } else {
@@ -572,6 +558,28 @@
     }
 
     @VisibleForTesting
+    boolean shouldShowUninstallForAll(ApplicationsState.AppEntry appEntry) {
+        boolean showIt = true;
+        if (mUpdatedSysApp) {
+            showIt = false;
+        } else if (appEntry == null) {
+            showIt = false;
+        } else if ((appEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+            showIt = false;
+        } else if (mPackageInfo == null || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+            showIt = false;
+        } else if (UserHandle.myUserId() != 0) {
+            showIt = false;
+        } else if (mUserManager.getUsers().size() < 2) {
+            showIt = false;
+        } else if (PackageUtil.countPackageInUsers(mPm, mUserManager, mPackageName) < 2
+                && (appEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) != 0) {
+            showIt = false;
+        }
+        return showIt;
+    }
+
+    @VisibleForTesting
     int getInstallationStatus(ApplicationInfo info) {
         if ((info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
             return R.string.not_installed;
@@ -760,6 +768,7 @@
                 MetricsEvent.ACTION_APP_FORCE_STOP, pkgName);
         ActivityManager am = (ActivityManager) getActivity().getSystemService(
                 Context.ACTIVITY_SERVICE);
+        Log.d(LOG_TAG, "Stopping package " + pkgName);
         am.forceStopPackage(pkgName);
         int userId = UserHandle.getUserId(mAppEntry.info.uid);
         mState.invalidatePackage(pkgName, userId);
@@ -782,10 +791,12 @@
     private void checkForceStop() {
         if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
             // User can't force stop device admin.
+            Log.w(LOG_TAG, "User can't force stop device admin");
             updateForceStopButton(false);
-        } else if ((mAppEntry.info.flags&ApplicationInfo.FLAG_STOPPED) == 0) {
+        } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_STOPPED) == 0) {
             // If the app isn't explicitly stopped, then always show the
             // force stop button.
+            Log.w(LOG_TAG, "App is not explicitly stopped");
             updateForceStopButton(true);
         } else {
             Intent intent = new Intent(Intent.ACTION_QUERY_PACKAGE_RESTART,
@@ -793,6 +804,8 @@
             intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { mAppEntry.info.packageName });
             intent.putExtra(Intent.EXTRA_UID, mAppEntry.info.uid);
             intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mAppEntry.info.uid));
+            Log.d(LOG_TAG, "Sending broadcast to query restart status for "
+                    + mAppEntry.info.packageName);
             getActivity().sendOrderedBroadcastAsUser(intent, UserHandle.CURRENT, null,
                     mCheckKillProcessesReceiver, null, Activity.RESULT_CANCELED, null, null);
         }
@@ -964,7 +977,9 @@
                 PictureInPictureSettings.checkPackageHasPictureInPictureActivities(
                         packageInfoWithActivities.packageName,
                         packageInfoWithActivities.activities);
-        if (hasDrawOverOtherApps || hasWriteSettings || hasPictureInPictureActivities) {
+        boolean isPotentialAppSource = isPotentialAppSource();
+        if (hasDrawOverOtherApps || hasWriteSettings || hasPictureInPictureActivities ||
+                isPotentialAppSource) {
             PreferenceCategory category = new PreferenceCategory(getPrefContext());
             category.setTitle(R.string.advanced_apps);
             screen.addPreference(category);
@@ -1014,11 +1029,32 @@
                 });
                 category.addPreference(pref);
             }
+            if (isPotentialAppSource) {
+                Preference pref = new Preference(getPrefContext());
+                pref.setTitle(R.string.install_other_apps);
+                pref.setKey("install_other_apps");
+                pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        startAppInfoFragment(ExternalSourcesDetails.class,
+                                getString(R.string.install_other_apps));
+                        return true;
+                    }
+                });
+                category.addPreference(pref);
+            }
         }
 
         addAppInstallerInfoPref(screen);
     }
 
+    private boolean isPotentialAppSource() {
+        AppStateInstallAppsBridge.InstallAppsState appState =
+                new AppStateInstallAppsBridge(getContext(), null, null)
+                        .createInstallAppsStateFor(mPackageName, mPackageInfo.applicationInfo.uid);
+        return appState.isPotentialAppSource();
+    }
+
     private void addAppInstallerInfoPref(PreferenceScreen screen) {
         String installerPackageName = null;
         try {
@@ -1104,6 +1140,10 @@
         if (pref != null) {
             pref.setSummary(WriteSettingsDetails.getSummary(getContext(), mAppEntry));
         }
+        pref = findPreference("install_other_apps");
+        if (pref != null) {
+            pref.setSummary(ExternalSourcesDetails.getPreferenceSummary(getContext(), mAppEntry));
+        }
     }
 
     public static void setupAppSnippet(View appSnippet, CharSequence label, Drawable icon,
@@ -1302,7 +1342,10 @@
     private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            updateForceStopButton(getResultCode() != Activity.RESULT_CANCELED);
+            final boolean enabled = getResultCode() != Activity.RESULT_CANCELED;
+            Log.d(LOG_TAG, "Got broadcast response: Restart status for "
+                    + mAppEntry.info.packageName + " " + enabled);
+            updateForceStopButton(enabled);
         }
     };
 
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 00e220c..ab99c9b 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.applications;
 
+import android.annotation.IdRes;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -31,6 +32,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.PreferenceFrameLayout;
+import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -52,6 +54,7 @@
 import android.widget.SectionIndexer;
 import android.widget.Spinner;
 
+import android.widget.TextView;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.AppHeader;
 import com.android.settings.R;
@@ -71,7 +74,6 @@
 import com.android.settings.applications.AppStateUsageBridge.UsageState;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.deviceinfo.storage.StorageStatsSource;
 import com.android.settings.fuelgauge.HighPowerDetail;
 import com.android.settings.fuelgauge.PowerWhitelistBackend;
 import com.android.settings.notification.AppNotificationSettings;
@@ -85,6 +87,7 @@
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
 import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
 import com.android.settingslib.applications.ApplicationsState.VolumeFilter;
+import com.android.settingslib.applications.StorageStatsSource;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -134,54 +137,84 @@
     public static final int FILTER_APPS_ALL = 2;
     public static final int FILTER_APPS_ENABLED = 3;
     public static final int FILTER_APPS_DISABLED = 4;
-    public static final int FILTER_APPS_BLOCKED = 5;
-    public static final int FILTER_APPS_PERSONAL = 6;
-    public static final int FILTER_APPS_WORK = 7;
-    public static final int FILTER_APPS_USAGE_ACCESS = 8;
-    public static final int FILTER_APPS_WITH_OVERLAY = 9;
-    public static final int FILTER_APPS_WRITE_SETTINGS = 10;
+    public static final int FILTER_APPS_INSTANT = 5;
+    public static final int FILTER_APPS_BLOCKED = 6;
+    public static final int FILTER_APPS_PERSONAL = 7;
+    public static final int FILTER_APPS_WORK = 8;
+    public static final int FILTER_APPS_USAGE_ACCESS = 9;
+    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;
+    public static final int FILTER_APPS_COUNT = 13;  // This should always be the last entry
+
+    // Mapping to string labels for the FILTER_APPS_* constants above.
+    public static final @IdRes int[] FILTER_LABELS = new int[FILTER_APPS_COUNT];
+
+    // Mapping to filters for the FILTER_APPS_* constants above.
+    public static final AppFilter[] FILTERS = new AppFilter[FILTER_APPS_COUNT];
+
+    static {
+        // High power whitelist, on
+        FILTER_LABELS[FILTER_APPS_POWER_WHITELIST] = R.string.high_power_filter_on;
+        FILTERS[FILTER_APPS_POWER_WHITELIST] = new CompoundFilter(
+                AppStatePowerBridge.FILTER_POWER_WHITELISTED,
+                ApplicationsState.FILTER_ALL_ENABLED);
+
+        // Without disabled until used
+        FILTER_LABELS[FILTER_APPS_POWER_WHITELIST_ALL] = R.string.filter_all_apps;
+        FILTERS[FILTER_APPS_POWER_WHITELIST_ALL] = new CompoundFilter(
+                ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED,
+                ApplicationsState.FILTER_ALL_ENABLED);
+
+        // All apps
+        FILTER_LABELS[FILTER_APPS_ALL] = R.string.filter_all_apps;
+        FILTERS[FILTER_APPS_ALL] = ApplicationsState.FILTER_EVERYTHING;
+
+        // Enabled
+        FILTER_LABELS[FILTER_APPS_ENABLED] = R.string.filter_enabled_apps;
+        FILTERS[FILTER_APPS_ENABLED] = ApplicationsState.FILTER_ALL_ENABLED;
+
+        // Disabled
+        FILTER_LABELS[FILTER_APPS_DISABLED] = R.string.filter_apps_disabled;
+        FILTERS[FILTER_APPS_DISABLED] = ApplicationsState.FILTER_DISABLED;
+
+        // Instant
+        FILTER_LABELS[FILTER_APPS_INSTANT] = R.string.filter_instant_apps;
+        FILTERS[FILTER_APPS_INSTANT] = ApplicationsState.FILTER_INSTANT;
+
+        // Blocked Notifications
+        FILTER_LABELS[FILTER_APPS_BLOCKED] = R.string.filter_notif_blocked_apps;
+        FILTERS[FILTER_APPS_BLOCKED] = AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED;
+
+        // Personal
+        FILTER_LABELS[FILTER_APPS_PERSONAL] = R.string.filter_personal_apps;
+        FILTERS[FILTER_APPS_PERSONAL] = ApplicationsState.FILTER_PERSONAL;
+
+        // Work
+        FILTER_LABELS[FILTER_APPS_WORK] = R.string.filter_work_apps;
+        FILTERS[FILTER_APPS_WORK] = ApplicationsState.FILTER_WORK;
+
+        // Usage access screen, never displayed.
+        FILTER_LABELS[FILTER_APPS_USAGE_ACCESS] = R.string.filter_all_apps;
+        FILTERS[FILTER_APPS_USAGE_ACCESS] = AppStateUsageBridge.FILTER_APP_USAGE;
+
+        // Apps that can draw overlays
+        FILTER_LABELS[FILTER_APPS_WITH_OVERLAY] = R.string.filter_overlay_apps;
+        FILTERS[FILTER_APPS_WITH_OVERLAY] = AppStateOverlayBridge.FILTER_SYSTEM_ALERT_WINDOW;
+
+        // Apps that can write system settings
+        FILTER_LABELS[FILTER_APPS_WRITE_SETTINGS] = R.string.filter_write_settings_apps;
+        FILTERS[FILTER_APPS_WRITE_SETTINGS] = AppStateWriteSettingsBridge.FILTER_WRITE_SETTINGS;
+
+        // Apps that are trusted sources of apks
+        FILTER_LABELS[FILTER_APPS_INSTALL_SOURCES] = R.string.filter_install_sources_apps;
+        FILTERS[FILTER_APPS_INSTALL_SOURCES] = AppStateInstallAppsBridge.FILTER_APP_SOURCES;
+    }
 
     // Storage types. Used to determine what the extra item in the list of preferences is.
     public static final int STORAGE_TYPE_DEFAULT = 0;
     public static final int STORAGE_TYPE_MUSIC = 1;
 
-    // This is the string labels for the filter modes above, the order must be kept in sync.
-    public static final int[] FILTER_LABELS = new int[]{
-            R.string.high_power_filter_on, // High power whitelist, on
-            R.string.filter_all_apps,      // Without disabled until used
-            R.string.filter_all_apps,      // All apps
-            R.string.filter_enabled_apps,  // Enabled
-            R.string.filter_apps_disabled, // Disabled
-            R.string.filter_notif_blocked_apps,   // Blocked Notifications
-            R.string.filter_personal_apps, // Personal
-            R.string.filter_work_apps,     // Work
-            R.string.filter_with_domain_urls_apps,     // Domain URLs
-            R.string.filter_all_apps,      // Usage access screen, never displayed
-            R.string.filter_overlay_apps,   // Apps with overlay permission
-            R.string.filter_write_settings_apps,   // Apps that can write system settings
-            R.string.filter_install_sources_apps, // Apps that are trusted sources of apks
-    };
-    // This is the actual mapping to filters from FILTER_ constants above, the order must
-    // be kept in sync.
-    public static final AppFilter[] FILTERS = new AppFilter[]{
-            new CompoundFilter(AppStatePowerBridge.FILTER_POWER_WHITELISTED,
-                    ApplicationsState.FILTER_ALL_ENABLED),     // High power whitelist, on
-            new CompoundFilter(ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED,
-                    ApplicationsState.FILTER_ALL_ENABLED),     // Without disabled until used
-            ApplicationsState.FILTER_EVERYTHING,  // All apps
-            ApplicationsState.FILTER_ALL_ENABLED, // Enabled
-            ApplicationsState.FILTER_DISABLED,    // Disabled
-            AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED,   // Blocked Notifications
-            ApplicationsState.FILTER_PERSONAL,    // Personal
-            ApplicationsState.FILTER_WORK,        // Work
-            ApplicationsState.FILTER_WITH_DOMAIN_URLS,   // Apps with Domain URLs
-            AppStateUsageBridge.FILTER_APP_USAGE, // Apps with Domain URLs
-            AppStateOverlayBridge.FILTER_SYSTEM_ALERT_WINDOW,   // Apps that can draw overlays
-            AppStateWriteSettingsBridge.FILTER_WRITE_SETTINGS,  // Apps that can write system settings
-            AppStateInstallAppsBridge.FILTER_APP_SOURCES,
-    };
-
     // sort order
     private int mSortOrder = R.id.sort_order_alpha;
 
@@ -694,6 +727,10 @@
         mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, hasDisabledApps);
     }
 
+    public void setHasInstant(boolean haveInstantApps) {
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_INSTANT, haveInstantApps);
+    }
+
     static class FilterSpinnerAdapter extends ArrayAdapter<CharSequence> {
 
         private final ManageApplications mManageApplications;
@@ -1047,6 +1084,7 @@
             }
 
             mManageApplications.setHasDisabled(mState.haveDisabledApps());
+            mManageApplications.setHasInstant(mState.haveInstantApps());
         }
 
         private void rebuildSections() {
@@ -1276,15 +1314,7 @@
                         holder.appIcon.setImageDrawable(entry.icon);
                     }
                     updateSummary(holder);
-                    if ((entry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
-                        holder.disabled.setVisibility(View.VISIBLE);
-                        holder.disabled.setText(R.string.not_installed);
-                    } else if (!entry.info.enabled) {
-                        holder.disabled.setVisibility(View.VISIBLE);
-                        holder.disabled.setText(R.string.disabled);
-                    } else {
-                        holder.disabled.setVisibility(View.GONE);
-                    }
+                    updateDisableView(holder.disabled, entry.info);
                 }
                 convertView.setEnabled(isEnabled(position));
             }
@@ -1294,6 +1324,20 @@
             return convertView;
         }
 
+        @VisibleForTesting
+        void updateDisableView(TextView view, ApplicationInfo info) {
+            if ((info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
+                view.setVisibility(View.VISIBLE);
+                view.setText(R.string.not_installed);
+            } else if (!info.enabled || info.enabledSetting
+                    == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) {
+                view.setVisibility(View.VISIBLE);
+                view.setText(R.string.disabled);
+            } else {
+                view.setVisibility(View.GONE);
+            }
+        }
+
         private void updateSummary(AppViewHolder holder) {
             switch (mManageApplications.mListType) {
                 case LIST_TYPE_NOTIFICATION:
@@ -1329,8 +1373,8 @@
                     break;
 
                 case LIST_TYPE_MANAGE_SOURCES:
-                    holder.summary
-                            .setText(((InstallAppsState) holder.entry.extraInfo).getSummary());
+                    holder.summary.setText(ExternalSourcesDetails.getPreferenceSummary(mContext,
+                            holder.entry));
                     break;
 
                 default:
diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java
deleted file mode 100644
index 8dd4d70..0000000
--- a/src/com/android/settings/applications/ManageAssist.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.applications;
-
-import android.app.AlertDialog;
-import android.content.ComponentName;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.os.Handler;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-
-import com.android.internal.app.AssistUtils;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.gestures.AssistGestureFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.voice.VoiceInputListPreference;
-
-/**
- * Settings screen to manage everything about assist.
- */
-public class ManageAssist extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener {
-
-    private static final String KEY_DEFAULT_ASSIST = "default_assist";
-    private static final String KEY_ASSIST_GESTURE = "gesture_assist";
-    private static final String KEY_CONTEXT = "context";
-    private static final String KEY_SCREENSHOT = "screenshot";
-    private static final String KEY_VOICE_INPUT = "voice_input_settings";
-    private static final String KEY_FLASH = "flash";
-
-    private DefaultAssistPreference mDefaultAssitPref;
-    private SwitchPreference mContextPref;
-    private SwitchPreference mScreenshotPref;
-    private SwitchPreference mFlashPref;
-    private VoiceInputListPreference mVoiceInputPref;
-    private Handler mHandler = new Handler();
-
-    private Preference mAssistGesturePref;
-    private AssistGestureFeatureProvider mAssistGestureFeatureProvider;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        addPreferencesFromResource(R.xml.manage_assist);
-
-        mDefaultAssitPref = (DefaultAssistPreference) findPreference(KEY_DEFAULT_ASSIST);
-        mDefaultAssitPref.setOnPreferenceChangeListener(this);
-
-        mAssistGesturePref = findPreference(KEY_ASSIST_GESTURE);
-        mAssistGestureFeatureProvider =
-                FeatureFactory.getFactory(getContext()).getAssistGestureFeatureProvider();
-
-        mContextPref = (SwitchPreference) findPreference(KEY_CONTEXT);
-        mContextPref.setChecked(Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1) != 0);
-        mContextPref.setOnPreferenceChangeListener(this);
-
-        mScreenshotPref = (SwitchPreference) findPreference(KEY_SCREENSHOT);
-        mScreenshotPref.setOnPreferenceChangeListener(this);
-
-        mFlashPref = (SwitchPreference) findPreference(KEY_FLASH);
-        mFlashPref.setOnPreferenceChangeListener(this);
-        mFooterPreferenceMixin.createFooterPreference()
-                .setTitle(R.string.assist_footer);
-        mVoiceInputPref = (VoiceInputListPreference) findPreference(KEY_VOICE_INPUT);
-        updateUi();
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.APPLICATIONS_MANAGE_ASSIST;
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mContextPref) {
-            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_STRUCTURE_ENABLED,
-                    (boolean) newValue ? 1 : 0);
-            mHandler.post(() -> {
-                guardFlashPref();
-            });
-            return true;
-        }
-        if (preference == mScreenshotPref) {
-            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_SCREENSHOT_ENABLED,
-                    (boolean) newValue ? 1 : 0);
-            return true;
-        }
-        if (preference == mFlashPref) {
-            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_DISCLOSURE_ENABLED,
-                    (boolean) newValue ? 1 : 0);
-            return true;
-        }
-        if (preference == mDefaultAssitPref) {
-            String newAssitPackage = (String)newValue;
-            if (newAssitPackage == null ||
-                    newAssitPackage.contentEquals(DefaultAssistPreference.ITEM_NONE_VALUE)) {
-                setDefaultAssist(DefaultAssistPreference.ITEM_NONE_VALUE);
-                return false;
-            }
-
-            final String currentPackage = mDefaultAssitPref.getValue();
-            if (currentPackage == null || !newAssitPackage.contentEquals(currentPackage)) {
-                confirmNewAssist(newAssitPackage);
-            }
-            return false;
-        }
-        return false;
-    }
-
-    private void guardFlashPref() {
-        ComponentName assistant = mDefaultAssitPref.getCurrentAssist();
-
-        boolean isContextChecked = mContextPref.isChecked();
-        boolean willShowFlash = AssistUtils.shouldDisclose(getContext(), assistant);
-        boolean isSystemAssistant = AssistUtils.isPreinstalledAssistant(getContext(), assistant);
-
-        mFlashPref.setEnabled(isContextChecked && isSystemAssistant);
-        mFlashPref.setChecked(willShowFlash);
-    }
-
-    private void updateUi() {
-        mDefaultAssitPref.refreshAssistApps();
-        mVoiceInputPref.refreshVoiceInputs();
-
-        final ComponentName currentAssist = mDefaultAssitPref.getCurrentAssist();
-        final boolean hasAssistant = currentAssist != null;
-        if (hasAssistant) {
-            getPreferenceScreen().addPreference(mContextPref);
-            getPreferenceScreen().addPreference(mScreenshotPref);
-        } else {
-            getPreferenceScreen().removePreference(mContextPref);
-            getPreferenceScreen().removePreference(mScreenshotPref);
-            getPreferenceScreen().removePreference(mFlashPref);
-        }
-
-        if (hasAssistant && mAssistGestureFeatureProvider.isSupported(getContext())) {
-            getPreferenceScreen().addPreference(mAssistGesturePref);
-        } else {
-            getPreferenceScreen().removePreference(mAssistGesturePref);
-        }
-
-        if (hasAssistant && AssistUtils.allowDisablingAssistDisclosure(getContext())) {
-            getPreferenceScreen().addPreference(mFlashPref);
-        } else {
-            getPreferenceScreen().removePreference(mFlashPref);
-        }
-
-        if (isCurrentAssistVoiceService()) {
-            getPreferenceScreen().removePreference(mVoiceInputPref);
-        } else {
-            getPreferenceScreen().addPreference(mVoiceInputPref);
-            mVoiceInputPref.setAssistRestrict(currentAssist);
-        }
-
-        guardFlashPref();
-    }
-
-    private boolean isCurrentAssistVoiceService() {
-        ComponentName currentAssist = mDefaultAssitPref.getCurrentAssist();
-        ComponentName activeService = mVoiceInputPref.getCurrentService();
-        return currentAssist == null && activeService == null ||
-                currentAssist != null && currentAssist.equals(activeService);
-    }
-
-    private void confirmNewAssist(final String newAssitPackage) {
-        final int selected = mDefaultAssitPref.findIndexOfValue(newAssitPackage);
-        final CharSequence appLabel = mDefaultAssitPref.getEntries()[selected];
-
-        final String title = getString(R.string.assistant_security_warning_title, appLabel);
-        final String message = getString(R.string.assistant_security_warning, appLabel);
-
-        final DialogInterface.OnClickListener onAgree = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                setDefaultAssist(newAssitPackage);
-            }
-        };
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-        builder.setTitle(title)
-                .setMessage(message)
-                .setCancelable(true)
-                .setPositiveButton(R.string.assistant_security_warning_agree, onAgree)
-                .setNegativeButton(R.string.assistant_security_warning_disagree, null);
-        AlertDialog dialog = builder.create();
-        dialog.show();
-    }
-
-    private void setDefaultAssist(String assistPackage) {
-        mDefaultAssitPref.setValue(assistPackage);
-        updateUi();
-    }
-}
diff --git a/src/com/android/settings/applications/MusicViewHolderController.java b/src/com/android/settings/applications/MusicViewHolderController.java
index fd7e320..4599fcc 100644
--- a/src/com/android/settings/applications/MusicViewHolderController.java
+++ b/src/com/android/settings/applications/MusicViewHolderController.java
@@ -26,7 +26,7 @@
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.deviceinfo.storage.StorageStatsSource;
+import com.android.settingslib.applications.StorageStatsSource;
 
 /**
  * MusicViewHolderController controls an Audio/Music file view in the ManageApplications view.
@@ -68,8 +68,10 @@
 
     @Override
     public void onClick(Fragment fragment) {
-        Intent intent = new Intent(DocumentsContract.ACTION_BROWSE);
-        intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"));
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndType(
+                DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"),
+                DocumentsContract.Root.MIME_TYPE_ITEM);
         intent.addCategory(Intent.CATEGORY_DEFAULT);
         intent.putExtra(Intent.EXTRA_USER_ID, mUser);
         Utils.launchIntent(fragment, intent);
diff --git a/src/com/android/settings/applications/PermissionsSummaryHelper.java b/src/com/android/settings/applications/PermissionsSummaryHelper.java
deleted file mode 100644
index bac6b24..0000000
--- a/src/com/android/settings/applications/PermissionsSummaryHelper.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.applications;
-
-import android.annotation.NonNull;
-import android.content.Context;
-import android.content.pm.permission.RuntimePermissionPresentationInfo;
-import android.content.pm.permission.RuntimePermissionPresenter;
-
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class PermissionsSummaryHelper  {
-
-    public static void getPermissionSummary(Context context, String pkg,
-            final PermissionsResultCallback callback) {
-        final RuntimePermissionPresenter presenter =
-                RuntimePermissionPresenter.getInstance(context);
-        presenter.getAppPermissions(pkg, new RuntimePermissionPresenter.OnResultCallback() {
-            @Override
-            public void onGetAppPermissions(
-                    @NonNull List<RuntimePermissionPresentationInfo> permissions) {
-                final int permissionCount = permissions.size();
-
-                int grantedStandardCount = 0;
-                int grantedAdditionalCount = 0;
-                int requestedCount = 0;
-                List<CharSequence> grantedStandardLabels = new ArrayList<>();
-
-                for (int i = 0; i < permissionCount; i++) {
-                    RuntimePermissionPresentationInfo permission = permissions.get(i);
-                    requestedCount++;
-                    if (permission.isGranted()) {
-                        if (permission.isStandard()) {
-                            grantedStandardLabels.add(permission.getLabel());
-                            grantedStandardCount++;
-                        } else {
-                            grantedAdditionalCount++;
-                        }
-                    }
-                }
-
-                Collator collator = Collator.getInstance();
-                collator.setStrength(Collator.PRIMARY);
-                Collections.sort(grantedStandardLabels, collator);
-
-                callback.onPermissionSummaryResult(grantedStandardCount, requestedCount,
-                        grantedAdditionalCount, grantedStandardLabels);
-            }
-        }, null);
-    }
-
-    public static abstract class PermissionsResultCallback {
-        public void onAppWithPermissionsCountsResult(int standardGrantedPermissionAppCount,
-                int standardUsedPermissionAppCount) {
-            /* do nothing - stub */
-        }
-
-        public void onPermissionSummaryResult(int standardGrantedPermissionCount,
-                int requestedPermissionCount, int additionalGrantedPermissionCount,
-                List<CharSequence> grantedGroupLabels) {
-            /* do nothing - stub */
-        }
-    }
-}
diff --git a/src/com/android/settings/applications/UserManagerWrapper.java b/src/com/android/settings/applications/UserManagerWrapper.java
new file mode 100644
index 0000000..daefb84
--- /dev/null
+++ b/src/com/android/settings/applications/UserManagerWrapper.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.pm.UserInfo;
+import java.util.List;
+
+/**
+ * This interface replicates a subset of the android.os.UserManager. The interface
+ * exists so that we can use a thin wrapper around the UserManager in production code and a mock in
+ * tests. We cannot directly mock or shadow the UserManager, because some of the methods we rely on
+ * are newer than the API version supported by Robolectric or are hidden.
+ */
+public interface UserManagerWrapper {
+    UserInfo getPrimaryUser();
+    List<UserInfo> getUsers();
+}
diff --git a/src/com/android/settings/applications/UserManagerWrapperImpl.java b/src/com/android/settings/applications/UserManagerWrapperImpl.java
new file mode 100644
index 0000000..14ea64a
--- /dev/null
+++ b/src/com/android/settings/applications/UserManagerWrapperImpl.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.applications;
+
+import android.content.pm.UserInfo;
+import android.os.UserManager;
+
+import java.util.List;
+
+public class UserManagerWrapperImpl implements UserManagerWrapper {
+    private UserManager mUserManager;
+
+    public UserManagerWrapperImpl(UserManager userManager) {
+        mUserManager = userManager;
+    }
+
+    @Override
+    public UserInfo getPrimaryUser() {
+        return mUserManager.getPrimaryUser();
+    }
+
+    @Override
+    public List<UserInfo> getUsers() {
+        return mUserManager.getUsers();
+    }
+}
diff --git a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
new file mode 100644
index 0000000..05bc8d6
--- /dev/null
+++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.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.applications.assist;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.TwoStatePreference;
+
+import com.android.internal.app.AssistUtils;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.core.lifecycle.LifecycleObserver;
+import com.android.settings.core.lifecycle.events.OnPause;
+import com.android.settings.core.lifecycle.events.OnResume;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class AssistContextPreferenceController extends PreferenceController
+        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+
+    private static final String KEY_CONTEXT = "context";
+
+    private final AssistUtils mAssistUtils;
+    private final SettingObserver mSettingObserver;
+
+    private Preference mPreference;
+    private PreferenceScreen mScreen;
+
+    public AssistContextPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        mAssistUtils = new AssistUtils(context);
+        mSettingObserver = new SettingObserver();
+
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mAssistUtils.getAssistComponentForUser(UserHandle.myUserId()) != null;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_CONTEXT;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mScreen = screen;
+        mPreference = screen.findPreference(getPreferenceKey());
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public void onResume() {
+        mSettingObserver.register(mContext.getContentResolver(), true);
+        updatePreference();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updatePreference();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingObserver.register(mContext.getContentResolver(), false);
+    }
+
+
+    private void updatePreference() {
+        if (mPreference == null || !(mPreference instanceof TwoStatePreference)) {
+            return;
+        }
+        if (isAvailable()) {
+            if (mScreen.findPreference(getPreferenceKey()) == null) {
+                // add it if it's not on scree
+                mScreen.addPreference(mPreference);
+            }
+        } else {
+            mScreen.removePreference(mPreference);
+        }
+
+        ((TwoStatePreference) mPreference).setChecked(isChecked(mContext));
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_STRUCTURE_ENABLED,
+                (boolean) newValue ? 1 : 0);
+        return true;
+    }
+
+    static boolean isChecked(Context context) {
+        return Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1) != 0;
+    }
+
+    class SettingObserver extends AssistSettingObserver {
+
+        private final Uri URI =
+                Settings.Secure.getUriFor(Settings.Secure.ASSIST_STRUCTURE_ENABLED);
+
+        @Override
+        protected List<Uri> getSettingUris() {
+            return Arrays.asList(URI);
+        }
+
+        @Override
+        public void onSettingChange() {
+            updatePreference();
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
new file mode 100644
index 0000000..e44e70f
--- /dev/null
+++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.net.Uri;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.TwoStatePreference;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.app.AssistUtils;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.core.lifecycle.LifecycleObserver;
+import com.android.settings.core.lifecycle.events.OnPause;
+import com.android.settings.core.lifecycle.events.OnResume;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class AssistFlashScreenPreferenceController extends PreferenceController
+        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+
+    private static final String KEY_FLASH = "flash";
+
+    private final AssistUtils mAssistUtils;
+    private final SettingObserver mSettingObserver;
+    private PreferenceScreen mScreen;
+    private Preference mPreference;
+
+    public AssistFlashScreenPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        mAssistUtils = new AssistUtils(context);
+        mSettingObserver = new SettingObserver();
+
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return getCurrentAssist() != null && allowDisablingAssistDisclosure();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_FLASH;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mScreen = screen;
+        mPreference = screen.findPreference(getPreferenceKey());
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public void onResume() {
+        mSettingObserver.register(mContext.getContentResolver(), true);
+        updatePreference();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updatePreference();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingObserver.register(mContext.getContentResolver(), false);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_DISCLOSURE_ENABLED,
+                (boolean) newValue ? 1 : 0);
+        return true;
+    }
+
+    private void updatePreference() {
+        if (mPreference == null || !(mPreference instanceof TwoStatePreference)) {
+            return;
+        }
+        if (isAvailable()) {
+            if (mScreen.findPreference(getPreferenceKey()) == null) {
+                // add it if it's not on scree
+                mScreen.addPreference(mPreference);
+            }
+        } else {
+            mScreen.removePreference(mPreference);
+        }
+        ComponentName assistant = getCurrentAssist();
+
+        boolean isContextChecked = AssistContextPreferenceController.isChecked(mContext);
+
+        mPreference.setEnabled(isContextChecked && isPreInstalledAssistant(assistant));
+        ((TwoStatePreference) mPreference).setChecked(willShowFlash(assistant));
+    }
+
+    @VisibleForTesting
+    boolean willShowFlash(ComponentName assistant) {
+        return AssistUtils.shouldDisclose(mContext, assistant);
+    }
+
+    @VisibleForTesting
+    boolean isPreInstalledAssistant(ComponentName assistant) {
+        return AssistUtils.isPreinstalledAssistant(mContext, assistant);
+    }
+
+    @VisibleForTesting
+    boolean allowDisablingAssistDisclosure() {
+        return AssistUtils.allowDisablingAssistDisclosure(mContext);
+    }
+
+    private ComponentName getCurrentAssist() {
+        return mAssistUtils.getAssistComponentForUser(UserHandle.myUserId());
+    }
+
+    class SettingObserver extends AssistSettingObserver {
+
+        private final Uri URI =
+                Settings.Secure.getUriFor(Settings.Secure.ASSIST_DISCLOSURE_ENABLED);
+        private final Uri CONTEXT_URI =
+                Settings.Secure.getUriFor(Settings.Secure.ASSIST_STRUCTURE_ENABLED);
+
+        @Override
+        protected List<Uri> getSettingUris() {
+            return Arrays.asList(URI, CONTEXT_URI);
+        }
+
+        @Override
+        public void onSettingChange() {
+            updatePreference();
+        }
+    }
+
+
+}
diff --git a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
new file mode 100644
index 0000000..21dfe19
--- /dev/null
+++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.TwoStatePreference;
+
+import com.android.internal.app.AssistUtils;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.core.lifecycle.LifecycleObserver;
+import com.android.settings.core.lifecycle.events.OnPause;
+import com.android.settings.core.lifecycle.events.OnResume;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class AssistScreenshotPreferenceController extends PreferenceController
+        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+
+    private static final String KEY_SCREENSHOT = "screenshot";
+
+    private final AssistUtils mAssistUtils;
+    private final SettingObserver mSettingObserver;
+
+    private PreferenceScreen mScreen;
+    private Preference mPreference;
+
+    public AssistScreenshotPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        mAssistUtils = new AssistUtils(context);
+        mSettingObserver = new SettingObserver();
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mAssistUtils.getAssistComponentForUser(UserHandle.myUserId()) != null;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mScreen = screen;
+        mPreference = screen.findPreference(getPreferenceKey());
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SCREENSHOT;
+    }
+
+    @Override
+    public void onResume() {
+        mSettingObserver.register(mContext.getContentResolver(), true);
+        updatePreference();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updatePreference();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingObserver.register(mContext.getContentResolver(), false);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_SCREENSHOT_ENABLED,
+                (boolean) newValue ? 1 : 0);
+        return true;
+    }
+
+    private void updatePreference() {
+        if (mPreference == null || !(mPreference instanceof TwoStatePreference)) {
+            return;
+        }
+        if (isAvailable()) {
+            if (mScreen.findPreference(getPreferenceKey()) == null) {
+                // add it if it's not on scree
+                mScreen.addPreference(mPreference);
+            }
+        } else {
+            mScreen.removePreference(mPreference);
+        }
+        final boolean checked = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0;
+        ((TwoStatePreference) mPreference).setChecked(checked);
+        final boolean contextChecked = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1) != 0;
+        mPreference.setEnabled(contextChecked);
+    }
+
+    class SettingObserver extends AssistSettingObserver {
+
+        private final Uri URI =
+                Settings.Secure.getUriFor(Settings.Secure.ASSIST_SCREENSHOT_ENABLED);
+        private final Uri CONTEXT_URI =
+                Settings.Secure.getUriFor(Settings.Secure.ASSIST_STRUCTURE_ENABLED);
+
+        @Override
+        protected List<Uri> getSettingUris() {
+            return Arrays.asList(URI, CONTEXT_URI);
+        }
+
+        @Override
+        public void onSettingChange() {
+            updatePreference();
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/assist/AssistSettingObserver.java b/src/com/android/settings/applications/assist/AssistSettingObserver.java
new file mode 100644
index 0000000..e4941d1
--- /dev/null
+++ b/src/com/android/settings/applications/assist/AssistSettingObserver.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+import android.content.ContentResolver;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Settings;
+
+import java.util.List;
+
+public abstract class AssistSettingObserver extends ContentObserver {
+
+    private final Uri ASSIST_URI =
+            Settings.Secure.getUriFor(Settings.Secure.ASSISTANT);
+
+    public AssistSettingObserver() {
+        super(null /* handler */);
+    }
+
+    public void register(ContentResolver cr, boolean register) {
+        if (register) {
+            cr.registerContentObserver(ASSIST_URI, false, this);
+            final List<Uri> settingUri = getSettingUris();
+            if (settingUri != null) {
+                for (Uri uri : settingUri)
+                cr.registerContentObserver(uri, false, this);
+            }
+        } else {
+            cr.unregisterContentObserver(this);
+        }
+    }
+
+    @Override
+    public void onChange(boolean selfChange, Uri uri) {
+        super.onChange(selfChange, uri);
+        boolean shouldUpdatePreference = false;
+        final List<Uri> settingUri = getSettingUris();
+        if (ASSIST_URI.equals(uri) || (settingUri != null && settingUri.contains(uri))) {
+            shouldUpdatePreference = true;
+        }
+        if (shouldUpdatePreference) {
+            onSettingChange();
+        }
+    }
+
+    protected abstract List<Uri> getSettingUris();
+
+    public abstract void onSettingChange();
+}
diff --git a/src/com/android/settings/applications/DefaultAssistPreference.java b/src/com/android/settings/applications/assist/DefaultAssistPicker.java
similarity index 62%
rename from src/com/android/settings/applications/DefaultAssistPreference.java
rename to src/com/android/settings/applications/assist/DefaultAssistPicker.java
index 0bd729e..703665a 100644
--- a/src/com/android/settings/applications/DefaultAssistPreference.java
+++ b/src/com/android/settings/applications/assist/DefaultAssistPicker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,49 +11,105 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License
+ * limitations under the License.
  */
 
-package com.android.settings.applications;
+package com.android.settings.applications.assist;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.os.UserHandle;
 import android.provider.Settings;
 import android.service.voice.VoiceInteractionService;
 import android.service.voice.VoiceInteractionServiceInfo;
 import android.speech.RecognitionService;
-import android.util.AttributeSet;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.app.AssistUtils;
-import com.android.settings.AppListPreferenceWithSettings;
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class DefaultAssistPreference extends AppListPreferenceWithSettings {
+public class DefaultAssistPicker extends DefaultAppPickerFragment {
 
-    private static final String TAG = DefaultAssistPreference.class.getSimpleName();
-
+    private static final String TAG = "DefaultAssistPicker";
+    private static final Intent ASSIST_SERVICE_PROBE =
+            new Intent(VoiceInteractionService.SERVICE_INTERFACE);
+    private static final Intent ASSIST_ACTIVITY_PROBE =
+            new Intent(Intent.ACTION_ASSIST);
     private final List<Info> mAvailableAssistants = new ArrayList<>();
 
-    private final AssistUtils mAssistUtils;
+    private AssistUtils mAssistUtils;
 
-    public DefaultAssistPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setShowItemNone(true);
-        setDialogTitle(R.string.choose_assist_title);
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DEFAULT_ASSIST_PICKER;
+    }
+
+    @Override
+    protected boolean shouldShowItemNone() {
+        return true;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
         mAssistUtils = new AssistUtils(context);
     }
 
     @Override
-    protected boolean persistString(String value) {
-        final Info info = findAssistantByPackageName(value);
+    protected List<DefaultAppInfo> getCandidates() {
+        mAvailableAssistants.clear();
+        addAssistServices();
+        addAssistActivities();
+
+        final List<String> packages = new ArrayList<>();
+        final List<DefaultAppInfo> candidates = new ArrayList<>();
+        for (Info info : mAvailableAssistants) {
+            final String packageName = info.component.getPackageName();
+            if (packages.contains(packageName)) {
+                // A service appears before an activity thus overrides it if from the same package.
+                continue;
+            }
+            packages.add(packageName);
+            candidates.add(new DefaultAppInfo(mUserId, info.component));
+        }
+        return candidates;
+    }
+
+    @Override
+    protected String getDefaultAppKey() {
+        final ComponentName cn = getCurrentAssist();
+        if (cn != null) {
+            return new DefaultAppInfo(mUserId, cn).getKey();
+        }
+        return null;
+    }
+
+    @Override
+    protected String getConfirmationMessage(DefaultAppInfo appInfo) {
+        if (appInfo == null) {
+            return null;
+        }
+        return getContext().getString(R.string.assistant_security_warning,
+                appInfo.loadLabel(mPm.getPackageManager()));
+    }
+
+    @Override
+    protected boolean setDefaultAppKey(String key) {
+        if (TextUtils.isEmpty(key)) {
+            setAssistNone();
+            return true;
+        }
+        ComponentName cn = ComponentName.unflattenFromString(key);
+        final Info info = findAssistantByPackageName(cn.getPackageName());
         if (info == null) {
             setAssistNone();
             return true;
@@ -67,20 +123,60 @@
         return true;
     }
 
+    public ComponentName getCurrentAssist() {
+        return mAssistUtils.getAssistComponentForUser(mUserId);
+    }
+
+    private void addAssistServices() {
+        final PackageManager pm = mPm.getPackageManager();
+        final List<ResolveInfo> services = pm.queryIntentServices(
+                ASSIST_SERVICE_PROBE, PackageManager.GET_META_DATA);
+        for (ResolveInfo resolveInfo : services) {
+            VoiceInteractionServiceInfo voiceInteractionServiceInfo =
+                    new VoiceInteractionServiceInfo(pm, resolveInfo.serviceInfo);
+            if (!voiceInteractionServiceInfo.getSupportsAssist()) {
+                continue;
+            }
+
+            mAvailableAssistants.add(new Info(
+                    new ComponentName(resolveInfo.serviceInfo.packageName,
+                            resolveInfo.serviceInfo.name),
+                    voiceInteractionServiceInfo));
+        }
+    }
+
+    private void addAssistActivities() {
+        final PackageManager pm = mPm.getPackageManager();
+        final List<ResolveInfo> activities = pm.queryIntentActivities(
+                ASSIST_ACTIVITY_PROBE, PackageManager.MATCH_DEFAULT_ONLY);
+        for (ResolveInfo resolveInfo : activities) {
+            mAvailableAssistants.add(new Info(
+                    new ComponentName(resolveInfo.activityInfo.packageName,
+                            resolveInfo.activityInfo.name)));
+        }
+    }
+
+    private Info findAssistantByPackageName(String packageName) {
+        for (Info info : mAvailableAssistants) {
+            if (TextUtils.equals(info.component.getPackageName(), packageName)) {
+                return info;
+            }
+        }
+        return null;
+    }
+
     private void setAssistNone() {
         Settings.Secure.putString(getContext().getContentResolver(),
-                Settings.Secure.ASSISTANT, ITEM_NONE_VALUE);
+                Settings.Secure.ASSISTANT, "");
         Settings.Secure.putString(getContext().getContentResolver(),
                 Settings.Secure.VOICE_INTERACTION_SERVICE, "");
         Settings.Secure.putString(getContext().getContentResolver(),
                 Settings.Secure.VOICE_RECOGNITION_SERVICE, getDefaultRecognizer());
-
-        setSummary(getContext().getText(R.string.default_assist_none));
-        setSettingsComponent(null);
     }
 
     private void setAssistService(Info serviceInfo) {
-        final String serviceComponentName = serviceInfo.component.flattenToShortString();
+        final String serviceComponentName = serviceInfo.component.
+                flattenToShortString();
         final String serviceRecognizerName = new ComponentName(
                 serviceInfo.component.getPackageName(),
                 serviceInfo.voiceInteractionServiceInfo.getRecognitionService())
@@ -92,13 +188,6 @@
                 Settings.Secure.VOICE_INTERACTION_SERVICE, serviceComponentName);
         Settings.Secure.putString(getContext().getContentResolver(),
                 Settings.Secure.VOICE_RECOGNITION_SERVICE, serviceRecognizerName);
-
-        setSummary(getEntry());
-        final String settingsActivity =
-                serviceInfo.voiceInteractionServiceInfo.getSettingsActivity();
-        setSettingsComponent(settingsActivity == null ?
-                null :
-                new ComponentName(serviceInfo.component.getPackageName(), settingsActivity));
     }
 
     private void setAssistActivity(Info activityInfo) {
@@ -108,13 +197,10 @@
                 Settings.Secure.VOICE_INTERACTION_SERVICE, "");
         Settings.Secure.putString(getContext().getContentResolver(),
                 Settings.Secure.VOICE_RECOGNITION_SERVICE, getDefaultRecognizer());
-
-        setSummary(getEntry());
-        setSettingsComponent(null);
     }
 
     private String getDefaultRecognizer() {
-        ResolveInfo resolveInfo = getContext().getPackageManager().resolveService(
+        final ResolveInfo resolveInfo = mPm.getPackageManager().resolveService(
                 new Intent(RecognitionService.SERVICE_INTERFACE),
                 PackageManager.GET_META_DATA);
         if (resolveInfo == null || resolveInfo.serviceInfo == null) {
@@ -126,76 +212,7 @@
                 resolveInfo.serviceInfo.name).flattenToShortString();
     }
 
-    private Info findAssistantByPackageName(String packageName) {
-        for (int i = 0; i < mAvailableAssistants.size(); ++i) {
-            Info info = mAvailableAssistants.get(i);
-            if (info.component.getPackageName().equals(packageName)) {
-                return info;
-            }
-        }
-        return null;
-    }
-
-    private void addAssistServices() {
-        PackageManager pm = getContext().getPackageManager();
-
-        List<ResolveInfo> services = pm.queryIntentServices(
-                new Intent(VoiceInteractionService.SERVICE_INTERFACE),
-                PackageManager.GET_META_DATA);
-        for (int i = 0; i < services.size(); ++i) {
-            ResolveInfo resolveInfo = services.get(i);
-            VoiceInteractionServiceInfo voiceInteractionServiceInfo =
-                    new VoiceInteractionServiceInfo(pm, resolveInfo.serviceInfo);
-            if (!voiceInteractionServiceInfo.getSupportsAssist()) {
-                continue;
-            }
-
-            mAvailableAssistants.add(new Info(
-                    new ComponentName(resolveInfo.serviceInfo.packageName,
-                                      resolveInfo.serviceInfo.name),
-                    voiceInteractionServiceInfo));
-        }
-    }
-
-    private void addAssistActivities() {
-        PackageManager pm = getContext().getPackageManager();
-
-        List<ResolveInfo> activities = pm.queryIntentActivities(
-                new Intent(Intent.ACTION_ASSIST),
-                PackageManager.MATCH_DEFAULT_ONLY);
-        for (int i = 0; i < activities.size(); ++i) {
-            ResolveInfo resolveInfo = activities.get(i);
-            mAvailableAssistants.add(new Info(
-                    new ComponentName(resolveInfo.activityInfo.packageName,
-                                      resolveInfo.activityInfo.name)));
-        }
-    }
-
-    public ComponentName getCurrentAssist() {
-        return mAssistUtils.getAssistComponentForUser(UserHandle.myUserId());
-    }
-
-    public void refreshAssistApps() {
-        mAvailableAssistants.clear();
-        addAssistServices();
-        addAssistActivities();
-
-        List<String> packages = new ArrayList<>();
-        for (int i = 0; i < mAvailableAssistants.size(); ++i) {
-            String packageName = mAvailableAssistants.get(i).component.getPackageName();
-            if (packages.contains(packageName)) {
-                // A service appears before an activity thus overrides it if from the same package.
-                continue;
-            }
-            packages.add(packageName);
-        }
-
-        ComponentName currentAssist = getCurrentAssist();
-        setPackageNames(packages.toArray(new String[packages.size()]),
-                currentAssist == null ? null : currentAssist.getPackageName());
-    }
-
-    private static class Info {
+    static class Info {
         public final ComponentName component;
         public final VoiceInteractionServiceInfo voiceInteractionServiceInfo;
 
diff --git a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
new file mode 100644
index 0000000..df34501
--- /dev/null
+++ b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.service.voice.VoiceInteractionService;
+import android.service.voice.VoiceInteractionServiceInfo;
+
+import com.android.internal.app.AssistUtils;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
+
+import java.util.List;
+
+public class DefaultAssistPreferenceController extends DefaultAppPreferenceController {
+
+    private static final String KEY_DEFAULT_ASSIST = "default_assist";
+
+    private AssistUtils mAssistUtils;
+
+    public DefaultAssistPreferenceController(Context context) {
+        super(context);
+        mAssistUtils = new AssistUtils(context);
+    }
+
+    @Override
+    protected Intent getSettingIntent(DefaultAppInfo info) {
+        final ComponentName cn = mAssistUtils.getAssistComponentForUser(mUserId);
+        if (cn == null) {
+            return null;
+        }
+        final Intent probe = new Intent(VoiceInteractionService.SERVICE_INTERFACE)
+                .setPackage(cn.getPackageName());
+
+        final PackageManager pm = mPackageManager.getPackageManager();
+        final List<ResolveInfo> services = pm.queryIntentServices(probe, PackageManager
+                .GET_META_DATA);
+        if (services == null || services.isEmpty()) {
+            return null;
+        }
+        final ResolveInfo resolveInfo = services.get(0);
+        final VoiceInteractionServiceInfo voiceInfo =
+                new VoiceInteractionServiceInfo(pm, resolveInfo.serviceInfo);
+        if (!voiceInfo.getSupportsAssist()) {
+            return null;
+        }
+        final String activity = voiceInfo.getSettingsActivity();
+        return new Intent(Intent.ACTION_MAIN)
+                .setComponent(new ComponentName(cn.getPackageName(), activity));
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_DEFAULT_ASSIST;
+    }
+
+    @Override
+    protected DefaultAppInfo getDefaultAppInfo() {
+        final ComponentName cn = mAssistUtils.getAssistComponentForUser(mUserId);
+        if (cn == null) {
+            return null;
+        }
+        return new DefaultAppInfo(mUserId, cn);
+    }
+}
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
new file mode 100644
index 0000000..7168aa5
--- /dev/null
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.android.internal.app.AssistUtils;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
+
+    private VoiceInputHelper mHelper;
+    private AssistUtils mAssistUtils;
+    private String mAssistRestrict;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DEFAULT_VOICE_INPUT_PICKER;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mAssistUtils = new AssistUtils(context);
+        mHelper = new VoiceInputHelper(context);
+        mHelper.buildUi();
+        final ComponentName assist = getCurrentAssist();
+        if (isCurrentAssistVoiceService(assist, getCurrentService(mHelper))) {
+            mAssistRestrict = assist.flattenToShortString();
+        }
+    }
+
+    @Override
+    protected List<VoiceInputDefaultAppInfo> getCandidates() {
+        final List<VoiceInputDefaultAppInfo> candidates = new ArrayList<>();
+        boolean hasEnabled = true;
+        for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
+            final boolean enabled = TextUtils.equals(info.key, mAssistRestrict);
+            hasEnabled |= enabled;
+            candidates.add(new VoiceInputDefaultAppInfo(mUserId, info, enabled));
+        }
+
+        final boolean assistIsService = !hasEnabled;
+        for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
+            final boolean enabled = !assistIsService;
+            candidates.add(new VoiceInputDefaultAppInfo(mUserId, info, enabled));
+        }
+        return candidates;
+    }
+
+    @Override
+    protected String getDefaultAppKey() {
+        final ComponentName currentService = getCurrentService(mHelper);
+        if (currentService == null) {
+            return null;
+        }
+        return currentService.flattenToShortString();
+    }
+
+    @Override
+    protected boolean setDefaultAppKey(String value) {
+        for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
+            if (TextUtils.equals(value, info.key)) {
+                Settings.Secure.putString(getContext().getContentResolver(),
+                        Settings.Secure.VOICE_INTERACTION_SERVICE, value);
+                Settings.Secure.putString(getContext().getContentResolver(),
+                        Settings.Secure.VOICE_RECOGNITION_SERVICE,
+                        new ComponentName(info.service.packageName,
+                                info.serviceInfo.getRecognitionService())
+                                .flattenToShortString());
+                return true;
+            }
+        }
+
+        for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
+            if (TextUtils.equals(value, info.key)) {
+                Settings.Secure.putString(getContext().getContentResolver(),
+                        Settings.Secure.VOICE_INTERACTION_SERVICE, "");
+                Settings.Secure.putString(getContext().getContentResolver(),
+                        Settings.Secure.VOICE_RECOGNITION_SERVICE, value);
+                return true;
+            }
+        }
+        return true;
+    }
+
+    public static ComponentName getCurrentService(VoiceInputHelper helper) {
+        if (helper.mCurrentVoiceInteraction != null) {
+            return helper.mCurrentVoiceInteraction;
+        } else if (helper.mCurrentRecognizer != null) {
+            return helper.mCurrentRecognizer;
+        } else {
+            return null;
+        }
+    }
+
+    private ComponentName getCurrentAssist() {
+        return mAssistUtils.getAssistComponentForUser(mUserId);
+    }
+
+    public static boolean isCurrentAssistVoiceService(ComponentName currentAssist,
+            ComponentName currentVoiceService) {
+        return currentAssist == null && currentVoiceService == null ||
+                currentAssist != null && currentAssist.equals(currentVoiceService);
+    }
+
+    public static class VoiceInputDefaultAppInfo extends DefaultAppInfo {
+
+        public VoiceInputHelper.BaseInfo mInfo;
+
+        public VoiceInputDefaultAppInfo(int userId, VoiceInputHelper.BaseInfo info,
+                boolean enabled) {
+            super(userId, info.componentName, null /* summary */, enabled);
+            mInfo = info;
+        }
+
+        @Override
+        public String getKey() {
+            return mInfo.key;
+        }
+
+        @Override
+        public CharSequence loadLabel(PackageManager pm) {
+            if (mInfo instanceof VoiceInputHelper.InteractionInfo) {
+                return mInfo.appLabel;
+            } else {
+                return mInfo.label;
+            }
+        }
+
+        public Intent getSettingIntent() {
+            if (mInfo.settings == null) {
+                return null;
+            }
+            return new Intent(Intent.ACTION_MAIN).setComponent(mInfo.settings);
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
new file mode 100644
index 0000000..918ec9c
--- /dev/null
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.internal.app.AssistUtils;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.core.lifecycle.LifecycleObserver;
+import com.android.settings.core.lifecycle.events.OnPause;
+import com.android.settings.core.lifecycle.events.OnResume;
+
+import java.util.List;
+
+public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceController
+        implements LifecycleObserver, OnResume, OnPause {
+
+    private static final String KEY_VOICE_INPUT = "voice_input_settings";
+
+    private VoiceInputHelper mHelper;
+    private AssistUtils mAssistUtils;
+    private PreferenceScreen mScreen;
+    private Preference mPreference;
+    private SettingObserver mSettingObserver;
+
+    public DefaultVoiceInputPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        mSettingObserver = new SettingObserver();
+        mAssistUtils = new AssistUtils(context);
+        mHelper = new VoiceInputHelper(context);
+        mHelper.buildUi();
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        // If current assist is also voice service, don't show voice preference.
+        final ComponentName currentVoiceService =
+                DefaultVoiceInputPicker.getCurrentService(mHelper);
+        final ComponentName currentAssist =
+                mAssistUtils.getAssistComponentForUser(mUserId);
+        return !DefaultVoiceInputPicker.isCurrentAssistVoiceService(
+                currentAssist, currentVoiceService);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_VOICE_INPUT;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mScreen = screen;
+        mPreference = screen.findPreference(getPreferenceKey());
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public void onResume() {
+        mSettingObserver.register(mContext.getContentResolver(), true);
+        updatePreference();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(mPreference);
+        updatePreference();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingObserver.register(mContext.getContentResolver(), false);
+    }
+
+    @Override
+    protected DefaultAppInfo getDefaultAppInfo() {
+        final String defaultKey = getDefaultAppKey();
+        if (defaultKey == null) {
+            return null;
+        }
+        for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
+            if (TextUtils.equals(defaultKey, info.key)) {
+                return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(
+                        mUserId, info, true /* enabled */);
+            }
+        }
+
+        for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
+            if (TextUtils.equals(defaultKey, info.key)) {
+                return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(
+                        mUserId, info, true /* enabled */);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected Intent getSettingIntent(DefaultAppInfo info) {
+        final DefaultAppInfo appInfo = getDefaultAppInfo();
+        if (appInfo == null
+                || !(appInfo instanceof DefaultVoiceInputPicker.VoiceInputDefaultAppInfo)) {
+            return null;
+        }
+        return ((DefaultVoiceInputPicker.VoiceInputDefaultAppInfo) appInfo).getSettingIntent();
+    }
+
+    private void updatePreference() {
+        if (mPreference == null) {
+            return;
+        }
+        mHelper.buildUi();
+        if (isAvailable()) {
+            if (mScreen.findPreference(getPreferenceKey()) == null) {
+                // add it if it's not on scree
+                mScreen.addPreference(mPreference);
+            }
+        } else {
+            mScreen.removePreference(mPreference);
+        }
+    }
+
+    private String getDefaultAppKey() {
+        final ComponentName currentService = DefaultVoiceInputPicker.getCurrentService(mHelper);
+        if (currentService == null) {
+            return null;
+        }
+        return currentService.flattenToShortString();
+    }
+
+    class SettingObserver extends AssistSettingObserver {
+        @Override
+        protected List<Uri> getSettingUris() {
+            return null;
+        }
+
+        @Override
+        public void onSettingChange() {
+            updatePreference();
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/assist/GestureAssistPreferenceController.java b/src/com/android/settings/applications/assist/GestureAssistPreferenceController.java
new file mode 100644
index 0000000..bd85a03
--- /dev/null
+++ b/src/com/android/settings/applications/assist/GestureAssistPreferenceController.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+import android.content.Context;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settings.gestures.AssistGestureFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
+
+public class GestureAssistPreferenceController extends PreferenceController {
+
+    private static final String KEY_ASSIST_GESTURE = "gesture_assist";
+
+    private AssistGestureFeatureProvider mFeatureProvider;
+
+    public GestureAssistPreferenceController(Context context) {
+        super(context);
+        mFeatureProvider = FeatureFactory.getFactory(context)
+                .getAssistGestureFeatureProvider();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mFeatureProvider.isSupported(mContext);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_ASSIST_GESTURE;
+    }
+}
diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java
new file mode 100644
index 0000000..a54f0ff
--- /dev/null
+++ b/src/com/android/settings/applications/assist/ManageAssist.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+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.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Settings screen to manage everything about assist.
+ */
+public class ManageAssist extends DashboardFragment {
+
+    private static final String TAG = "ManageAssist";
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.manage_assist;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.APPLICATIONS_MANAGE_ASSIST;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        mFooterPreferenceMixin.createFooterPreference()
+                .setTitle(R.string.assist_footer);
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new DefaultAssistPreferenceController(context));
+        controllers.add(new GestureAssistPreferenceController(context));
+        controllers.add(new AssistContextPreferenceController(context, lifecycle));
+        controllers.add(new AssistScreenshotPreferenceController(context, lifecycle));
+        controllers.add(new AssistFlashScreenPreferenceController(context, lifecycle));
+        controllers.add(new DefaultVoiceInputPreferenceController(context, lifecycle));
+        return controllers;
+    }
+
+
+    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.manage_assist;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
+            };
+}
diff --git a/src/com/android/settings/voice/VoiceInputHelper.java b/src/com/android/settings/applications/assist/VoiceInputHelper.java
similarity index 92%
rename from src/com/android/settings/voice/VoiceInputHelper.java
rename to src/com/android/settings/applications/assist/VoiceInputHelper.java
index ac73d84..58c0d49 100644
--- a/src/com/android/settings/voice/VoiceInputHelper.java
+++ b/src/com/android/settings/applications/assist/VoiceInputHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open 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.voice;
+package com.android.settings.applications.assist;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -71,7 +71,7 @@
 
         @Override
         public int compareTo(Object another) {
-            return labelStr.compareTo(((BaseInfo)another).labelStr);
+            return labelStr.compareTo(((BaseInfo) another).labelStr);
         }
     }
 
@@ -100,15 +100,11 @@
         mContext = context;
 
         mAvailableVoiceInteractions = mContext.getPackageManager().queryIntentServices(
-                        new Intent(VoiceInteractionService.SERVICE_INTERFACE),
-                        PackageManager.GET_META_DATA);
+                new Intent(VoiceInteractionService.SERVICE_INTERFACE),
+                PackageManager.GET_META_DATA);
         mAvailableRecognition = mContext.getPackageManager().queryIntentServices(
-                        new Intent(RecognitionService.SERVICE_INTERFACE),
-                        PackageManager.GET_META_DATA);
-    }
-
-    public boolean hasItems() {
-        return mAvailableVoiceInteractions.size() > 0 || mAvailableRecognition.size() > 0;
+                new Intent(RecognitionService.SERVICE_INTERFACE),
+                PackageManager.GET_META_DATA);
     }
 
     public void buildUi() {
@@ -178,7 +174,7 @@
                 AttributeSet attrs = Xml.asAttributeSet(parser);
 
                 int type;
-                while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
+                while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
                         && type != XmlPullParser.START_TAG) {
                 }
 
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java b/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
index ea3a27a..96512f5 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
@@ -37,13 +37,23 @@
     public final String summary;
     // Description for why this item is disabled, if null, the item is enabled.
     public final String disabledDescription;
+    public final boolean enabled;
+
+    public DefaultAppInfo(int uid, ComponentName cn) {
+        this(uid, cn, null /* summary */);
+    }
 
     public DefaultAppInfo(int uid, ComponentName cn, String summary) {
+        this(uid, cn, summary, true /* enabled */);
+    }
+
+    public DefaultAppInfo(int uid, ComponentName cn, String summary, boolean enabled) {
         packageItemInfo = null;
         userId = uid;
         componentName = cn;
         this.summary = summary;
         this.disabledDescription = null;
+        this.enabled = enabled;
     }
 
     public DefaultAppInfo(PackageItemInfo info, String description) {
@@ -52,6 +62,7 @@
         componentName = null;
         summary = null;
         this.disabledDescription = description;
+        enabled = true;
     }
 
     public DefaultAppInfo(PackageItemInfo info) {
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index 358b5f4..e4bcf06 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
@@ -97,7 +97,7 @@
     @VisibleForTesting
     public void updateCandidates() {
         mCandidates.clear();
-        final List<DefaultAppInfo> candidateList = getCandidates();
+        final List<? extends DefaultAppInfo> candidateList = getCandidates();
         if (candidateList != null) {
             for (DefaultAppInfo info : candidateList) {
                 mCandidates.put(info.getKey(), info);
@@ -134,6 +134,7 @@
                 pref.setEnabled(false);
                 pref.setSummary(app.getValue().disabledDescription);
             }
+            pref.setEnabled(info.enabled);
             pref.setOnClickListener(this);
             screen.addPreference(pref);
         }
@@ -200,14 +201,15 @@
         return null;
     }
 
-    protected abstract List<DefaultAppInfo> getCandidates();
+    protected abstract List<? extends DefaultAppInfo> getCandidates();
 
     protected abstract String getDefaultAppKey();
 
     protected abstract boolean setDefaultAppKey(String key);
 
     // Called after the user tries to select an item.
-    protected void onSelectionPerformed(boolean success) {}
+    protected void onSelectionPerformed(boolean success) {
+    }
 
     protected String getConfirmationMessage(DefaultAppInfo appInfo) {
         return null;
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutoFillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutoFillPicker.java
index 5b9fed4..b8190cd 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutoFillPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutoFillPicker.java
@@ -54,7 +54,7 @@
                 .queryIntentServices(AUTO_FILL_PROBE, PackageManager.GET_META_DATA);
         for (ResolveInfo info : resolveInfos) {
             candidates.add(new DefaultAppInfo(mUserId, new ComponentName(
-                    info.serviceInfo.packageName, info.serviceInfo.name), null /* summary */));
+                    info.serviceInfo.packageName, info.serviceInfo.name)));
         }
         return candidates;
     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutoFillPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAutoFillPreferenceController.java
index 35e4ade..b7f3b77 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutoFillPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutoFillPreferenceController.java
@@ -55,7 +55,7 @@
                 DefaultAutoFillPicker.SETTING);
         if (!TextUtils.isEmpty(flattenComponent)) {
             DefaultAppInfo appInfo = new DefaultAppInfo(
-                    mUserId, ComponentName.unflattenFromString(flattenComponent), null /*summary*/);
+                    mUserId, ComponentName.unflattenFromString(flattenComponent));
             return appInfo;
         }
         return null;
diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
index 7077912..9a5c224 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
@@ -39,7 +39,8 @@
 
     @Override
     public boolean isAvailable() {
-        return true;
+        final List<ResolveInfo> candidates = getCandidates();
+        return candidates != null && !candidates.isEmpty();
     }
 
     @Override
@@ -61,16 +62,6 @@
         }
     }
 
-    private String getOnlyAppLabel() {
-        // Resolve that intent and check that the handleAllWebDataURI boolean is set
-        final List<ResolveInfo> list = mPackageManager.queryIntentActivitiesAsUser(BROWSE_PROBE,
-                PackageManager.MATCH_ALL, mUserId);
-        if (list != null && list.size() == 1) {
-            return list.get(0).loadLabel(mPackageManager.getPackageManager()).toString();
-        }
-        return null;
-    }
-
     @Override
     protected DefaultAppInfo getDefaultAppInfo() {
         try {
@@ -81,6 +72,20 @@
         }
     }
 
+    private List<ResolveInfo> getCandidates() {
+        return mPackageManager.queryIntentActivitiesAsUser(BROWSE_PROBE, PackageManager.MATCH_ALL,
+                mUserId);
+    }
+
+    private String getOnlyAppLabel() {
+        // Resolve that intent and check that the handleAllWebDataURI boolean is set
+        final List<ResolveInfo> list = getCandidates();
+        if (list != null && list.size() == 1) {
+            return list.get(0).loadLabel(mPackageManager.getPackageManager()).toString();
+        }
+        return null;
+    }
+
     /**
      * Whether or not the pkg contains browser capability
      */
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
index 055c23b..7366d18 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
@@ -75,7 +75,7 @@
         final ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
         final ComponentName currentDefaultHome = mPackageManager.getHomeActivities(homeActivities);
 
-        return new DefaultAppInfo(mUserId, currentDefaultHome, null /* summary */);
+        return new DefaultAppInfo(mUserId, currentDefaultHome);
     }
 
     private String getOnlyAppLabel() {
diff --git a/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPicker.java b/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPicker.java
index af67917..06c5401 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPicker.java
@@ -76,7 +76,7 @@
             }
 
             candidates.add(new DefaultAppInfo(
-                    mUserId, new ComponentName(info.packageName, info.name), null /* summary */));
+                    mUserId, new ComponentName(info.packageName, info.name)));
         }
         return candidates;
     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
index fa0d28f..8a73468 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
@@ -42,7 +42,11 @@
         final boolean hasUserRestriction =
                 um.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS);
 
-        return !hasUserRestriction;
+        if (hasUserRestriction) {
+            return false;
+        }
+        final List<String> candidates = getCandidates();
+        return candidates != null && !candidates.isEmpty();
     }
 
     @Override
@@ -60,6 +64,10 @@
         }
     }
 
+    private List<String> getCandidates() {
+        return DefaultDialerManager.getInstalledDialerApplications(mContext, mUserId);
+    }
+
     public static boolean hasPhonePreference(String pkg, Context context) {
         List<String> dialerPackages =
                 DefaultDialerManager.getInstalledDialerApplications(context, UserHandle.myUserId());
diff --git a/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java
index 90b9d83..81a3af0 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java
@@ -47,7 +47,7 @@
     protected DefaultAppInfo getDefaultAppInfo() {
         final ComponentName app = SmsApplication.getDefaultSmsApplication(mContext, true);
         if (app != null) {
-            return new DefaultAppInfo(mUserId, app, null /* summary */);
+            return new DefaultAppInfo(mUserId, app);
         }
         return null;
     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultWorkBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultWorkBrowserPreferenceController.java
index 0cee3c5..0792ff9 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultWorkBrowserPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultWorkBrowserPreferenceController.java
@@ -23,21 +23,26 @@
 
 public class DefaultWorkBrowserPreferenceController extends DefaultBrowserPreferenceController {
 
+    private final UserHandle mUserHandle;
+
     public DefaultWorkBrowserPreferenceController(Context context) {
         super(context);
-        final UserHandle managedProfile = Utils.getManagedProfile(mUserManager);
-        if (managedProfile != null) {
-            mUserId = managedProfile.getIdentifier();
+        mUserHandle = Utils.getManagedProfile(mUserManager);
+        if (mUserHandle != null) {
+            mUserId = mUserHandle.getIdentifier();
         }
     }
 
     @Override
-    public boolean isAvailable() {
-        return Utils.getManagedProfile(mUserManager) != null;
-    }
-
-    @Override
     public String getPreferenceKey() {
         return "work_default_browser";
     }
+
+    @Override
+    public boolean isAvailable() {
+        if (mUserHandle == null) {
+            return false;
+        }
+        return super.isAvailable();
+    }
 }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultWorkPhonePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultWorkPhonePreferenceController.java
index f793fa3..c6d04fa 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultWorkPhonePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultWorkPhonePreferenceController.java
@@ -17,11 +17,28 @@
 package com.android.settings.applications.defaultapps;
 
 import android.content.Context;
+import android.os.UserHandle;
+
+import com.android.settings.Utils;
 
 public class DefaultWorkPhonePreferenceController extends DefaultPhonePreferenceController {
 
+    private final UserHandle mUserHandle;
+
     public DefaultWorkPhonePreferenceController(Context context) {
         super(context);
+        mUserHandle = Utils.getManagedProfile(mUserManager);
+        if (mUserHandle != null) {
+            mUserId = mUserHandle.getIdentifier();
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (mUserHandle == null) {
+            return false;
+        }
+        return super.isAvailable();
     }
 
     @Override
diff --git a/src/com/android/settings/applications/instantapps/InstantAppDetails.java b/src/com/android/settings/applications/instantapps/InstantAppDetails.java
deleted file mode 100644
index 8b54c20..0000000
--- a/src/com/android/settings/applications/instantapps/InstantAppDetails.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.applications.instantapps;
-
-import android.graphics.drawable.Drawable;
-import java.net.URL;
-
-/**
- * Encapsulates state about instant apps that is provided by an app store implementation.
- */
-public class InstantAppDetails {
-
-    // Most of these members are self-explanatory; the one that may not be is
-    // monetizationNotice, which is a string alerting users that the app contains ads and/or uses
-    // in-app purchases (this may eventually become two separate members).
-    public final Drawable maturityRatingIcon;
-    public final String maturityRatingString;
-    public final String monetizationNotice;
-    public final String developerTitle;
-    public final URL privacyPolicy;
-    public final URL developerWebsite;
-    public final String developerEmail;
-    public final String developerMailingAddress;
-
-    public static class Builder {
-        private Drawable mMaturityRatingIcon;
-        private String mMaturityRatingString;
-        private String mMonetizationNotice;
-        private String mDeveloperTitle;
-        private URL mPrivacyPolicy;
-        private URL mDeveloperWebsite;
-        private String mDeveloperEmail;
-        private String mDeveloperMailingAddress;
-
-        public Builder maturityRatingIcon(Drawable maturityRatingIcon) {
-            this.mMaturityRatingIcon = maturityRatingIcon;
-            return this;
-        }
-
-        public Builder maturityRatingString(String maturityRatingString) {
-            mMaturityRatingString = maturityRatingString;
-            return this;
-        }
-
-        public Builder monetizationNotice(String monetizationNotice) {
-            mMonetizationNotice = monetizationNotice;
-            return this;
-        }
-
-        public Builder developerTitle(String developerTitle) {
-            mDeveloperTitle = developerTitle;
-            return this;
-        }
-
-        public Builder privacyPolicy(URL privacyPolicy) {
-            mPrivacyPolicy = privacyPolicy;
-            return this;
-        }
-
-        public Builder developerWebsite(URL developerWebsite) {
-            mDeveloperWebsite = developerWebsite;
-            return this;
-        }
-
-        public Builder developerEmail(String developerEmail) {
-            mDeveloperEmail = developerEmail;
-            return this;
-        }
-
-        public Builder developerMailingAddress(String developerMailingAddress) {
-            mDeveloperMailingAddress = developerMailingAddress;
-            return this;
-        }
-
-        public InstantAppDetails build() {
-            return new InstantAppDetails(mMaturityRatingIcon, mMaturityRatingString,
-                    mMonetizationNotice, mDeveloperTitle, mPrivacyPolicy, mDeveloperWebsite,
-                    mDeveloperEmail, mDeveloperMailingAddress);
-        }
-    }
-
-    public static Builder builder() { return new Builder(); }
-
-    private InstantAppDetails(Drawable maturityRatingIcon, String maturityRatingString,
-            String monetizationNotice, String developerTitle, URL privacyPolicy,
-            URL developerWebsite, String developerEmail, String developerMailingAddress) {
-        this.maturityRatingIcon = maturityRatingIcon;
-        this.maturityRatingString = maturityRatingString;
-        this.monetizationNotice = monetizationNotice;
-        this.developerTitle = developerTitle;
-        this.privacyPolicy = privacyPolicy;
-        this.developerWebsite = developerWebsite;
-        this.developerEmail = developerEmail;
-        this.developerMailingAddress = developerMailingAddress;
-    }
-}
diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java
index f5c7ff8..f8bab3d 100644
--- a/src/com/android/settings/backup/BackupSettingsActivity.java
+++ b/src/com/android/settings/backup/BackupSettingsActivity.java
@@ -18,18 +18,29 @@
 
 import android.app.Activity;
 import android.app.FragmentManager;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 
+import com.android.settings.R;
+
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * The activity used to launch the configured Backup activity or the preference screen
  * if the manufacturer provided their backup settings.
  */
-public class BackupSettingsActivity extends Activity {
+public class BackupSettingsActivity extends Activity implements Indexable {
     private static final String TAG = "BackupSettingsActivity";
     private FragmentManager mFragmentManager;
 
@@ -68,6 +79,52 @@
         }
     }
 
+    /**
+     * For Search.
+     */
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                private static final String BACKUP_SEARCH_INDEX_KEY = "backup";
+
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+
+                    final List<SearchIndexableRaw> result = new ArrayList<>();
+
+                    // Add the activity title
+                    SearchIndexableRaw data = new SearchIndexableRaw(context);
+                    data.title = context.getResources().getString(R.string.privacy_settings_title);
+                    data.screenTitle = context.getResources().getString(
+                            R.string.privacy_settings_title);
+                    data.keywords = context.getResources().getString(
+                            R.string.keywords_backup);
+                    data.intentTargetPackage = context.getPackageName();
+                    data.intentTargetClass = BackupSettingsActivity.class.getName();
+                    data.intentAction = "android.intent.action.MAIN";
+                    data.key = BACKUP_SEARCH_INDEX_KEY;
+                    result.add(data);
+
+                    return result;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = new ArrayList<String>();
+
+                    // For non-primary user, no backup is available, so don't show it in search
+                    // TODO: http://b/22388012
+                    if (UserHandle.myUserId() != UserHandle.USER_SYSTEM) {
+                        if (Log.isLoggable(TAG, Log.DEBUG)) {
+                            Log.d(TAG, "Not a system user, not indexing the screen");
+                        }
+                        keys.add(BACKUP_SEARCH_INDEX_KEY);
+                    }
+
+                    return keys;
+                }
+            };
+
     @VisibleForTesting
     void setFragmentManager(FragmentManager fragmentManager) {
         mFragmentManager = fragmentManager;
diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java
index dcc1608..a451272 100644
--- a/src/com/android/settings/backup/BackupSettingsFragment.java
+++ b/src/com/android/settings/backup/BackupSettingsFragment.java
@@ -18,11 +18,6 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.provider.SearchIndexableResource;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.Log;
-
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -32,7 +27,6 @@
 import com.android.settings.search.Indexable;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -72,15 +66,10 @@
         return controllers;
     }
 
+    // The intention is to index {@link BackupSettingsActivity} instead of the fragments,
+    // therefore leaving this index provider empty.
     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.backup_settings;
-                    return Arrays.asList(sir);
-                }
             };
 
     @Override
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 1c36bca..96aace9 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -16,110 +16,47 @@
 
 package com.android.settings.bluetooth;
 
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.PowerManager;
-import android.text.TextUtils;
-
-import com.android.settings.R;
+import android.os.UserHandle;
 
 /**
  * BluetoothPairingRequest is a receiver for any Bluetooth pairing request. It
  * checks if the Bluetooth Settings is currently visible and brings up the PIN, the passkey or a
- * confirmation entry dialog. Otherwise it puts a Notification in the status bar, which can
- * be clicked to bring up the Pairing entry dialog.
+ * confirmation entry dialog. Otherwise it starts the BluetoothPairingService which
+ * starts a notification in the status bar that can be clicked to bring up the same dialog.
  */
 public final class BluetoothPairingRequest extends BroadcastReceiver {
 
-    private static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        String action = intent.getAction();
-        if (action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
-            // convert broadcast intent into activity intent (same action string)
-            BluetoothDevice device =
-                    intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-            int type = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
-                    BluetoothDevice.ERROR);
-            Intent pairingIntent = new Intent();
-            pairingIntent.setClass(context, BluetoothPairingDialog.class);
-            pairingIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
-            pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, type);
-            if (type == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION ||
-                    type == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY ||
-                    type == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN) {
-                int pairingKey = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY,
-                        BluetoothDevice.ERROR);
-                pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_KEY, pairingKey);
-            }
-            pairingIntent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
-            pairingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-            PowerManager powerManager =
-                    (PowerManager)context.getSystemService(Context.POWER_SERVICE);
-            String deviceAddress = device != null ? device.getAddress() : null;
-            String deviceName = device != null ? device.getName() : null;
-            boolean shouldShowDialog= LocalBluetoothPreferences.shouldShowDialogInForeground(
-                        context, deviceAddress, deviceName);
-            if (powerManager.isInteractive() && shouldShowDialog) {
-                // Since the screen is on and the BT-related activity is in the foreground,
-                // just open the dialog
-                context.startActivity(pairingIntent);
-            } else {
-                // Put up a notification that leads to the dialog
-                Resources res = context.getResources();
-                Notification.Builder builder = new Notification.Builder(context)
-                        .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)
-                        .setTicker(res.getString(R.string.bluetooth_notif_ticker));
-
-                PendingIntent pending = PendingIntent.getActivity(context, 0,
-                        pairingIntent, PendingIntent.FLAG_ONE_SHOT);
-
-                String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
-                if (TextUtils.isEmpty(name)) {
-                    name = device != null ? device.getAliasName() :
-                            context.getString(android.R.string.unknownName);
-                }
-
-                builder.setContentTitle(res.getString(R.string.bluetooth_notif_title))
-                        .setContentText(res.getString(R.string.bluetooth_notif_message, name))
-                        .setContentIntent(pending)
-                        .setAutoCancel(true)
-                        .setDefaults(Notification.DEFAULT_SOUND)
-                        .setColor(context.getColor(
-                                com.android.internal.R.color.system_notification_accent_color));
-
-                NotificationManager manager = (NotificationManager)
-                        context.getSystemService(Context.NOTIFICATION_SERVICE);
-                manager.notify(NOTIFICATION_ID, builder.getNotification());
-            }
-
-        } else if (action.equals(BluetoothDevice.ACTION_PAIRING_CANCEL)) {
-
-            // Remove the notification
-            NotificationManager manager = (NotificationManager) context
-                    .getSystemService(Context.NOTIFICATION_SERVICE);
-            manager.cancel(NOTIFICATION_ID);
-
-        } else if (BluetoothDevice.ACTION_BOND_STATE_CHANGED.equals(action)) {
-            int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
-                    BluetoothDevice.ERROR);
-            int oldState = intent.getIntExtra(BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE,
-                    BluetoothDevice.ERROR);
-            if((oldState == BluetoothDevice.BOND_BONDING) &&
-                    (bondState == BluetoothDevice.BOND_NONE)) {
-                // Remove the notification
-                NotificationManager manager = (NotificationManager) context
-                    .getSystemService(Context.NOTIFICATION_SERVICE);
-                manager.cancel(NOTIFICATION_ID);
-            }
-        }
+  @Override
+  public void onReceive(Context context, Intent intent) {
+    String action = intent.getAction();
+    if (!action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
+      return;
     }
+    // convert broadcast intent into activity intent (same action string)
+    Intent pairingIntent = BluetoothPairingService.getPairingDialogIntent(context, intent);
+
+    PowerManager powerManager =
+        (PowerManager)context.getSystemService(Context.POWER_SERVICE);
+    BluetoothDevice device =
+        intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+    String deviceAddress = device != null ? device.getAddress() : null;
+    String deviceName = device != null ? device.getName() : null;
+    boolean shouldShowDialog = LocalBluetoothPreferences.shouldShowDialogInForeground(
+        context, deviceAddress, deviceName);
+    if (powerManager.isInteractive() && shouldShowDialog) {
+      // Since the screen is on and the BT-related activity is in the foreground,
+      // just open the dialog
+      context.startActivity(pairingIntent);
+    } else {
+      // Put up a notification that leads to the dialog
+      intent.setClass(context, BluetoothPairingService.class);
+      context.startServiceAsUser(intent, UserHandle.CURRENT);
+    }
+  }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingService.java b/src/com/android/settings/bluetooth/BluetoothPairingService.java
new file mode 100644
index 0000000..a24a3f0
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothPairingService.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.bluetooth.BluetoothDevice;
+import android.content.IntentFilter;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.IBinder;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.R;
+
+/**
+ * BluetoothPairingService shows a notification if there is a pending bond request
+ * which can launch the appropriate pairing dialog when tapped.
+ */
+public final class BluetoothPairingService extends Service {
+
+  private static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
+
+  private static final String TAG = "BluetoothPairingService";
+
+  private BluetoothDevice mDevice;
+
+  public static Intent getPairingDialogIntent(Context context, Intent intent) {
+
+    BluetoothDevice device =
+        intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+    int type = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
+        BluetoothDevice.ERROR);
+    Intent pairingIntent = new Intent();
+    pairingIntent.setClass(context, BluetoothPairingDialog.class);
+    pairingIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
+    pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, type);
+    if (type == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION ||
+        type == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY ||
+        type == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN) {
+      int pairingKey = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY,
+          BluetoothDevice.ERROR);
+      pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_KEY, pairingKey);
+    }
+    pairingIntent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
+    pairingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    return pairingIntent;
+  }
+
+  private final BroadcastReceiver mCancelReceiver = new BroadcastReceiver() {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      String action = intent.getAction();
+      if (action.equals(BluetoothDevice.ACTION_BOND_STATE_CHANGED)) {
+        int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
+            BluetoothDevice.ERROR);
+        if ((bondState != BluetoothDevice.BOND_NONE) && (bondState != BluetoothDevice.BOND_BONDED)) {
+          return;
+        }
+        Log.d(TAG, "Dismiss pairing for " + mDevice.getAddress() + " (" + mDevice.getName() + "), BondState: " + bondState);
+      } else {
+        Log.d(TAG, "Dismiss pairing for " + mDevice.getAddress() + " (" + mDevice.getName() + "), Cancelled.");
+      }
+      stopForeground(true);
+    }
+  };
+
+  @Override
+  public void onCreate() {
+  }
+
+  @Override
+  public int onStartCommand(Intent intent, int flags, int startId) {
+    Resources res = getResources();
+    Notification.Builder builder = new Notification.Builder(this)
+        .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)
+        .setTicker(res.getString(R.string.bluetooth_notif_ticker));
+
+    PendingIntent pending = PendingIntent.getActivity(this, 0,
+        getPairingDialogIntent(this, intent), PendingIntent.FLAG_ONE_SHOT);
+
+    mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+
+    String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
+    if (TextUtils.isEmpty(name)) {
+      BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+      name = device != null ? device.getAliasName() : getString(android.R.string.unknownName);
+    }
+
+    Log.d(TAG, "Show pairing notification for " + mDevice.getAddress() + " (" + name + ")");
+
+    builder.setContentTitle(res.getString(R.string.bluetooth_notif_title))
+        .setContentText(res.getString(R.string.bluetooth_notif_message, name))
+        .setContentIntent(pending)
+        .setDefaults(Notification.DEFAULT_SOUND)
+        .setColor(getColor(com.android.internal.R.color.system_notification_accent_color));
+
+    IntentFilter filter = new IntentFilter();
+    filter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
+    filter.addAction(BluetoothDevice.ACTION_PAIRING_CANCEL);
+    registerReceiver(mCancelReceiver, filter);
+
+    startForeground(NOTIFICATION_ID, builder.getNotification());
+    return START_STICKY;
+  }
+
+  @Override
+  public void onDestroy() {
+    unregisterReceiver(mCancelReceiver);
+    stopForeground(true);
+  }
+
+  @Override
+  public IBinder onBind(Intent intent) {
+    // No binding.
+    return null;
+  }
+
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 7a8ff4c..99c46bf 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -79,6 +79,8 @@
     /* Private intent to show the list of received files */
     private static final String BTOPP_ACTION_OPEN_RECEIVED_FILES =
             "android.btopp.intent.action.OPEN_RECEIVED_FILES";
+    private static final String BTOPP_PACKAGE =
+            "com.android.bluetooth";
 
     private static final String KEY_PAIRED_DEVICES = "paired_devices";
 
@@ -266,6 +268,7 @@
                 mMetricsFeatureProvider.action(getActivity(),
                         MetricsEvent.ACTION_BLUETOOTH_FILES);
                 Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES);
+                intent.setPackage(BTOPP_PACKAGE);
                 getActivity().sendBroadcast(intent);
                 return true;
         }
diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java
index 867389b..303d4d8 100644
--- a/src/com/android/settings/core/InstrumentedFragment.java
+++ b/src/com/android/settings/core/InstrumentedFragment.java
@@ -29,9 +29,12 @@
 
     protected MetricsFeatureProvider mMetricsFeatureProvider;
 
+    private final VisibilityLoggerMixin mVisibilityLoggerMixin;
+
     public InstrumentedFragment() {
         // Mixin that logs visibility change for activity.
-        getLifecycle().addObserver(new VisibilityLoggerMixin(getMetricsCategory()));
+        mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory());
+        getLifecycle().addObserver(mVisibilityLoggerMixin);
         getLifecycle().addObserver(new SurveyMixin(this, getClass().getSimpleName()));
     }
 
@@ -40,4 +43,10 @@
         super.onAttach(context);
         mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
     }
+
+    @Override
+    public void onResume() {
+        mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
+        super.onResume();
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index 91ef3f1..746c10d 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -17,13 +17,7 @@
 package com.android.settings.core;
 
 import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
@@ -31,7 +25,6 @@
 import com.android.settings.core.lifecycle.ObservablePreferenceFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.survey.SurveyMixin;
-import com.android.settings.widget.PreferenceDividerDecoration;
 
 /**
  * Instrumented fragment that logs visibility state.
@@ -44,9 +37,6 @@
     // metrics placeholder value. Only use this for development.
     protected final int PLACEHOLDER_METRIC = 10000;
 
-    private final PreferenceDividerDecoration mDividerDecoration =
-            new PreferenceDividerDecoration();
-
     private final VisibilityLoggerMixin mVisibilityLoggerMixin;
 
     public InstrumentedPreferenceFragment() {
@@ -63,14 +53,6 @@
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        final View view = super.onCreateView(inflater, container, savedInstanceState);
-        getListView().addItemDecoration(mDividerDecoration);
-        return view;
-    }
-
-    @Override
     public void onResume() {
         mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
         super.onResume();
@@ -80,12 +62,6 @@
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
     }
 
-    @Override
-    public void setDivider(Drawable divider) {
-        mDividerDecoration.setDivider(divider);
-        super.setDivider(new ColorDrawable(Color.TRANSPARENT));
-    }
-
     protected final Context getPrefContext() {
         return getPreferenceManager().getContext();
     }
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 92d6ace..742f727 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -39,12 +39,10 @@
 import com.android.settings.UserDictionarySettings;
 import com.android.settings.WallpaperTypeSettings;
 import com.android.settings.WifiCallingSettings;
-import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;
 import com.android.settings.accessibility.CaptionPropertiesFragment;
 import com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment;
-import com.android.settings.accounts.AccountSettings;
 import com.android.settings.accounts.AccountSyncSettings;
 import com.android.settings.accounts.ChooseAccountActivity;
 import com.android.settings.accounts.ManagedProfileSettings;
@@ -54,7 +52,6 @@
 import com.android.settings.applications.DrawOverlayDetails;
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.applications.ManageApplications;
-import com.android.settings.applications.ManageAssist;
 import com.android.settings.applications.ManageDomainUrls;
 import com.android.settings.applications.NotificationApps;
 import com.android.settings.applications.PictureInPictureSettings;
@@ -63,6 +60,7 @@
 import com.android.settings.applications.UsageAccessDetails;
 import com.android.settings.applications.VrListenerSettings;
 import com.android.settings.applications.WriteSettingsDetails;
+import com.android.settings.applications.assist.ManageAssist;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.dashboard.SupportFragment;
@@ -85,11 +83,9 @@
 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.InputMethodAndLanguageSettings;
 import com.android.settings.inputmethod.KeyboardLayoutPickerFragment;
 import com.android.settings.inputmethod.PhysicalKeyboardFragment;
 import com.android.settings.inputmethod.SpellCheckersSettings;
@@ -105,7 +101,6 @@
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.NotificationAccessSettings;
 import com.android.settings.notification.NotificationStation;
-import com.android.settings.notification.OtherSoundSettings;
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.ZenAccessSettings;
 import com.android.settings.notification.ZenModeAutomationSettings;
@@ -137,7 +132,6 @@
      * security exception if the fragment it needs to display is not in this list.
      */
     public static final String[] ENTRY_FRAGMENTS = {
-            WirelessSettings.class.getName(),
             WifiSettings.class.getName(),
             ConfigureWifiSettings.class.getName(),
             SavedAccessPointsWifiSettings.class.getName(),
@@ -148,7 +142,6 @@
             VpnSettings.class.getName(),
             DateTimeSettings.class.getName(),
             LocaleListEditor.class.getName(),
-            InputMethodAndLanguageSettings.class.getName(),
             AvailableVirtualKeyboardFragment.class.getName(),
             LanguageAndInputSettings.class.getName(),
             SpellCheckersSettings.class.getName(),
@@ -181,8 +174,6 @@
             WifiDisplaySettings.class.getName(),
             PowerUsageSummary.class.getName(),
             AccountSyncSettings.class.getName(),
-            AccountSettings.class.getName(),
-            GestureSettings.class.getName(),
             AssistGestureSettings.class.getName(),
             SwipeToNotificationSettings.class.getName(),
             DoubleTapPowerSettings.class.getName(),
@@ -210,7 +201,6 @@
             BatterySaverSettings.class.getName(),
             AppNotificationSettings.class.getName(),
             ChannelNotificationSettings.class.getName(),
-            OtherSoundSettings.class.getName(),
             ApnSettings.class.getName(),
             ApnEditor.class.getName(),
             WifiCallingSettings.class.getName(),
@@ -256,39 +246,33 @@
             //wireless_section
             Settings.WifiSettingsActivity.class.getName(),
             Settings.BluetoothSettingsActivity.class.getName(),
-            Settings.DataUsageSummaryActivity.class.getName(),
             Settings.SimSettingsActivity.class.getName(),
-            Settings.WirelessSettingsActivity.class.getName(),
             //device_section
             Settings.SoundSettingsActivity.class.getName(),
             Settings.DisplaySettingsActivity.class.getName(),
             Settings.StorageSettingsActivity.class.getName(),
             Settings.ManageApplicationsActivity.class.getName(),
             Settings.PowerUsageSummaryActivity.class.getName(),
-            Settings.GestureSettingsActivity.class.getName(),
             //personal_section
             Settings.LocationSettingsActivity.class.getName(),
             Settings.SecuritySettingsActivity.class.getName(),
-            Settings.InputMethodAndLanguageSettingsActivity.class.getName(),
             Settings.UserSettingsActivity.class.getName(),
-            Settings.AccountSettingsActivity.class.getName(),
             //system_section
             Settings.DateTimeSettingsActivity.class.getName(),
             Settings.DeviceInfoSettingsActivity.class.getName(),
             Settings.AccessibilitySettingsActivity.class.getName(),
             Settings.PrintSettingsActivity.class.getName(),
             Settings.PaymentSettingsActivity.class.getName(),
-            Settings.EnterprisePrivacySettingsActivity.class.getName(),
+
 
             // New IA
             // Home page
             Settings.NetworkDashboardActivity.class.getName(),
             Settings.ConnectedDeviceDashboardActivity.class.getName(),
+            Settings.WifiDisplaySettingsActivity.class.getName(),
             Settings.AppAndNotificationDashboardActivity.class.getName(),
-            "com.android.settings.BatteryDashboardAlias",
-            "com.android.settings.DisplayDashboardAlias",
+            Settings.StorageDashboardActivity.class.getName(),
             "com.android.settings.SoundDashboardAlias",
-            "com.android.settings.SecurityDashboardAlias",
             "com.android.settings.UsersDashboardAlias",
             Settings.UserAndAccountDashboardActivity.class.getName(),
             Settings.SystemDashboardActivity.class.getName(),
@@ -297,14 +281,9 @@
             "com.android.settings.ManageApplicationsDashboardAlias",
             "com.android.settings.PaymentSettingsDashboardAlias",
             // Home page > Network & Internet
-            "com.android.settings.DataUsageDashboardAlias",
-            // Home page > Security
-            "com.android.settings.LocationDashboardAlias",
+            Settings.DataUsageSummaryActivity.class.getName(),
             // Home page > System
             Settings.LanguageAndInputSettingsActivity.class.getName(),
-            "com.android.settings.DateTimeDashboardAlias",
-            "com.android.settings.AccessibilityDashboardAlias",
-            "com.android.settings.AboutDeviceDashboardAlias",
-            "com.android.settings.EnterprisePrivacyDashboardAlias",
+            Settings.EnterprisePrivacySettingsActivity.class.getName(),
     };
 }
diff --git a/src/com/android/settings/core/instrumentation/EventLogWriter.java b/src/com/android/settings/core/instrumentation/EventLogWriter.java
index 2e0be30..e7628e8 100644
--- a/src/com/android/settings/core/instrumentation/EventLogWriter.java
+++ b/src/com/android/settings/core/instrumentation/EventLogWriter.java
@@ -39,8 +39,8 @@
         MetricsLogger.hidden(context, category);
     }
 
-    public void action(Context context, int category) {
-        MetricsLogger.action(context, category, "");
+    public void action(Context context, int category, Pair<Integer, Object>... taggedData) {
+        action(context, category, "", taggedData);
     }
 
     public void actionWithSource(Context context, int source, int category) {
diff --git a/src/com/android/settings/core/instrumentation/LogWriter.java b/src/com/android/settings/core/instrumentation/LogWriter.java
index 54ed1a8..584217d 100644
--- a/src/com/android/settings/core/instrumentation/LogWriter.java
+++ b/src/com/android/settings/core/instrumentation/LogWriter.java
@@ -36,7 +36,7 @@
     /**
      * Logs an user action.
      */
-    void action(Context context, int category);
+    void action(Context context, int category, Pair<Integer, Object>... taggedData);
 
     /**
      * Logs an user action.
diff --git a/src/com/android/settings/core/instrumentation/MetricsFeatureProvider.java b/src/com/android/settings/core/instrumentation/MetricsFeatureProvider.java
index 66986d6..afdec55 100644
--- a/src/com/android/settings/core/instrumentation/MetricsFeatureProvider.java
+++ b/src/com/android/settings/core/instrumentation/MetricsFeatureProvider.java
@@ -15,7 +15,10 @@
  */
 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;
@@ -57,9 +60,9 @@
         }
     }
 
-    public void action(Context context, int category) {
+    public void action(Context context, int category, Pair<Integer, Object>... taggedData) {
         for (LogWriter writer : mLoggerWriters) {
-            writer.action(context, category);
+            writer.action(context, category, taggedData);
         }
     }
 
@@ -100,4 +103,28 @@
         }
         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, MetricsProto.MetricsEvent.ACTION_SETTINGS_TILE_CLICK, action,
+                    Pair.create(MetricsProto.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, MetricsProto.MetricsEvent.ACTION_SETTINGS_TILE_CLICK, cn.flattenToString(),
+                Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, sourceMetricsCategory));
+    }
 }
diff --git a/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java b/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java
index 1c4e26e..bbdf8c9 100644
--- a/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java
+++ b/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java
@@ -17,12 +17,10 @@
 package com.android.settings.core.instrumentation;
 
 import android.content.Context;
-import android.metrics.LogMaker;
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.logging.MetricsLogger;
-import com.android.settings.suggestions.EventStore;
+import com.android.settings.dashboard.suggestions.EventStore;
 
 /**
  * {@link LogWriter} that writes setting suggestion related logs.
@@ -40,7 +38,7 @@
     }
 
     @Override
-    public void action(Context context, int category) {
+    public void action(Context context, int category, Pair<Integer, Object>... taggedData) {
     }
 
     @Override
diff --git a/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java b/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java
index 0a1a628..abe1427 100644
--- a/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java
+++ b/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java
@@ -88,4 +88,11 @@
         super.onPause();
     }
 
+    @CallSuper
+    @Override
+    public void onDestroy() {
+        mLifecycle.onDestroy();
+        super.onDestroy();
+    }
+
 }
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index beb9477..d9cef65 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -406,7 +406,8 @@
         popup.show();
     }
 
-    private void onBindSuggestionHeader(final DashboardItemHolder holder, DashboardData
+    @VisibleForTesting
+    void onBindSuggestionHeader(final DashboardItemHolder holder, DashboardData
             .SuggestionHeaderData data) {
         final boolean moreSuggestions = data.hasMoreSuggestions;
         final int undisplayedSuggestionCount = data.undisplayedSuggestionCount;
@@ -436,10 +437,8 @@
                 final int suggestionMode;
                 if (moreSuggestions) {
                     suggestionMode = DashboardData.SUGGESTION_MODE_EXPANDED;
-                    List<Tile> expandedSuggestions = mDashboardData.getSuggestions().subList(
-                            DashboardData.DEFAULT_SUGGESTION_COUNT,
-                            mDashboardData.getSuggestions().size());
-                    for (Tile suggestion : expandedSuggestions) {
+
+                    for (Tile suggestion : mDashboardData.getSuggestions()) {
                         String suggestionId =
                                 DashboardAdapter.getSuggestionIdentifier(mContext, suggestion);
                         if (!mSuggestionsShownLogged.contains(suggestionId)) {
diff --git a/src/com/android/settings/dashboard/DashboardContainerFragment.java b/src/com/android/settings/dashboard/DashboardContainerFragment.java
deleted file mode 100644
index b3ee808..0000000
--- a/src/com/android/settings/dashboard/DashboardContainerFragment.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v13.app.FragmentPagerAdapter;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.overlay.SupportFeatureProvider;
-import com.android.settings.widget.RtlCompatibleViewPager;
-import com.android.settings.widget.SlidingTabLayout;
-import com.android.settingslib.drawer.SettingsDrawerActivity;
-
-/**
- * Container for Dashboard fragments.
- */
-public final class DashboardContainerFragment extends InstrumentedFragment {
-
-    public static final String EXTRA_SELECT_SETTINGS_TAB = ":settings:select_settings_tab";
-
-    private static final String ARG_SUPPORT_TAB = "SUPPORT";
-    private static final String ARG_SUMMARY_TAB = "SUMMARY";
-    private static final int INDEX_SUMMARY_FRAGMENT = 0;
-    private static final int INDEX_SUPPORT_FRAGMENT = 1;
-
-    private RtlCompatibleViewPager mViewPager;
-    private View mHeaderView;
-    private DashboardViewPagerAdapter mPagerAdapter;
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.DASHBOARD_CONTAINER;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
-        final View content = inflater.inflate(R.layout.dashboard_container, parent, false);
-        mViewPager = (RtlCompatibleViewPager) content.findViewById(R.id.pager);
-        mPagerAdapter = new DashboardViewPagerAdapter(getContext(),
-                getChildFragmentManager(), mViewPager);
-        mViewPager.setAdapter(mPagerAdapter);
-        mViewPager.addOnPageChangeListener(
-                new TabChangeListener((SettingsActivity) getActivity(), mMetricsFeatureProvider));
-
-        // check if support tab needs to be selected
-        final String selectedTab = getArguments().
-                getString(EXTRA_SELECT_SETTINGS_TAB, ARG_SUMMARY_TAB);
-        if (TextUtils.equals(selectedTab, ARG_SUPPORT_TAB)) {
-            mViewPager.setCurrentItem(INDEX_SUPPORT_FRAGMENT);
-        } else {
-            mViewPager.setCurrentItem(INDEX_SUMMARY_FRAGMENT);
-        }
-
-        mHeaderView = inflater.inflate(R.layout.dashboard_container_header, parent, false);
-        ((SlidingTabLayout) mHeaderView).setViewPager(mViewPager);
-        return content;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (mPagerAdapter.getCount() > 1) {
-            final Activity activity = getActivity();
-            if (activity instanceof SettingsDrawerActivity) {
-                ((SettingsDrawerActivity) getActivity()).setContentHeaderView(mHeaderView);
-            }
-        }
-    }
-
-    private static final class DashboardViewPagerAdapter extends FragmentPagerAdapter {
-
-        private final Context mContext;
-        private final SupportFeatureProvider mSupportFeatureProvider;
-        private final RtlCompatibleViewPager mViewPager;
-
-        public DashboardViewPagerAdapter(Context context, FragmentManager fragmentManager,
-                RtlCompatibleViewPager viewPager) {
-            super(fragmentManager);
-            mContext = context;
-            mSupportFeatureProvider =
-                    FeatureFactory.getFactory(context).getSupportFeatureProvider(context);
-            mViewPager = viewPager;
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            switch (position) {
-                case INDEX_SUMMARY_FRAGMENT:
-                    return mContext.getString(R.string.page_tab_title_summary);
-                case INDEX_SUPPORT_FRAGMENT:
-                    return mContext.getString(R.string.page_tab_title_support);
-            }
-            return super.getPageTitle(position);
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            switch (position) {
-                case INDEX_SUMMARY_FRAGMENT:
-                    return new DashboardSummary();
-                case INDEX_SUPPORT_FRAGMENT:
-                    return new SupportFragment();
-                default:
-                    throw new IllegalArgumentException(
-                            String.format(
-                                    "Position %d does not map to a valid dashboard fragment",
-                                    position));
-            }
-        }
-
-        @Override
-        public Object instantiateItem(ViewGroup container, int position) {
-            return super.instantiateItem(container,
-                    mViewPager.getRtlAwareIndex(position));
-        }
-
-        @Override
-        public int getCount() {
-            return mSupportFeatureProvider == null ? 1 : 2;
-        }
-    }
-
-    private static final class TabChangeListener
-            implements RtlCompatibleViewPager.OnPageChangeListener {
-
-        private final SettingsActivity mActivity;
-        private final MetricsFeatureProvider mMetricsFeatureProvider;
-
-        public TabChangeListener(SettingsActivity activity,
-                MetricsFeatureProvider metricsFeatureProvider) {
-            mActivity = activity;
-            mMetricsFeatureProvider = metricsFeatureProvider;
-        }
-
-        @Override
-        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-            // Do nothing.
-        }
-
-        @Override
-        public void onPageScrollStateChanged(int state) {
-            // Do nothing
-        }
-
-        @Override
-        public void onPageSelected(int position) {
-            switch (position) {
-                case INDEX_SUMMARY_FRAGMENT:
-                    mMetricsFeatureProvider.action(
-                            mActivity, MetricsProto.MetricsEvent.ACTION_SELECT_SUMMARY);
-                    mActivity.setDisplaySearchMenu(true);
-                    break;
-                case INDEX_SUPPORT_FRAGMENT:
-                    mMetricsFeatureProvider.action(
-                            mActivity, MetricsProto.MetricsEvent.ACTION_SELECT_SUPPORT_FRAGMENT);
-                    mActivity.setDisplaySearchMenu(false);
-                    break;
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 0db8c20..1184e89 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -27,10 +27,8 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SubSettings;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.drawer.CategoryManager;
@@ -154,7 +152,7 @@
                 intent.setAction(action);
             }
             pref.setOnPreferenceClickListener(preference -> {
-                launchIntentOrSelectProfile(activity, tile, intent);
+                launchIntentOrSelectProfile(activity, tile, intent, sourceMetricsCategory);
                 return true;
             });
         }
@@ -204,37 +202,20 @@
                         MetricsEvent.DASHBOARD_SUMMARY)
                 .putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true)
                 .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        launchIntentOrSelectProfile(activity, tile, intent);
+        launchIntentOrSelectProfile(activity, tile, intent, MetricsEvent.DASHBOARD_SUMMARY);
     }
 
-    private void launchIntentOrSelectProfile(Activity activity, Tile tile, Intent intent) {
+    private void launchIntentOrSelectProfile(Activity activity, Tile tile, Intent intent,
+            int sourceMetricCategory) {
         ProfileSelectDialog.updateUserHandlesIfNeeded(mContext, tile);
         if (tile.userHandle == null) {
-            logStartActivity(intent);
+            mMetricsFeatureProvider.logDashboardStartIntent(mContext, intent, sourceMetricCategory);
             activity.startActivityForResult(intent, 0);
         } else if (tile.userHandle.size() == 1) {
-            logStartActivity(intent);
+            mMetricsFeatureProvider.logDashboardStartIntent(mContext, intent, sourceMetricCategory);
             activity.startActivityForResultAsUser(intent, 0, tile.userHandle.get(0));
         } else {
             ProfileSelectDialog.show(activity.getFragmentManager(), tile);
         }
     }
-
-    private void logStartActivity(Intent intent) {
-        if (intent == null) {
-            return;
-        }
-        final ComponentName cn = intent.getComponent();
-        if (cn == null) {
-            // Not loggable
-            return;
-        } else if (TextUtils.equals(cn.getPackageName(), mContext.getPackageName())) {
-            // Going to a Setting internal page, skip click logging in favor of page's own
-            // visibility logging.
-            return;
-        }
-        mMetricsFeatureProvider.action(mContext,
-                MetricsEvent.ACTION_SETTINGS_TILE_CLICK,
-                cn.flattenToString());
-    }
 }
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index d650fc7..29cee5e 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -157,6 +157,9 @@
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         Collection<PreferenceController> controllers = mPreferenceControllers.values();
+        // If preference contains intent, log it before handling.
+        mMetricsFeatureProvider.logDashboardStartIntent(
+                getContext(), preference.getIntent(), getMetricsCategory());
         // Give all controllers a chance to handle click.
         for (PreferenceController controller : controllers) {
             if (controller.handlePreferenceTreeClick(preference)) {
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index 4d0b8cf..8935ee3 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -28,7 +28,6 @@
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.fuelgauge.PowerUsageSummary;
-import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.notification.SoundSettings;
@@ -80,8 +79,6 @@
                 CategoryKey.CATEGORY_ACCOUNT);
         PARENT_TO_CATEGORY_KEY_MAP.put(
                 SystemDashboardFragment.class.getName(), CategoryKey.CATEGORY_SYSTEM);
-        PARENT_TO_CATEGORY_KEY_MAP.put(InputMethodAndLanguageSettings.class.getName(),
-                CategoryKey.CATEGORY_SYSTEM_LANGUAGE);
         PARENT_TO_CATEGORY_KEY_MAP.put(LanguageAndInputSettings.class.getName(),
                 CategoryKey.CATEGORY_SYSTEM_LANGUAGE);
         PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettings.class.getName(),
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 7d28e4e..5206336 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -36,8 +36,8 @@
 import com.android.settings.dashboard.conditional.ConditionAdapterUtils;
 import com.android.settings.dashboard.conditional.ConditionManager;
 import com.android.settings.dashboard.conditional.FocusRecyclerView;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.suggestions.SuggestionFeatureProvider;
 import com.android.settingslib.SuggestionParser;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.DashboardCategory;
@@ -70,6 +70,7 @@
     private SuggestionsChecks mSuggestionsChecks;
     private DashboardFeatureProvider mDashboardFeatureProvider;
     private SuggestionFeatureProvider mSuggestionFeatureProvider;
+    private boolean isOnCategoriesChangedCalled;
 
     @Override
     public int getMetricsCategory() {
@@ -204,25 +205,27 @@
             Log.d(TAG, "onViewCreated took "
                     + (System.currentTimeMillis() - startTime) + " ms");
         }
-        rebuildUI(true /* rebuildSuggestions */);
+        rebuildUI();
     }
 
-    private void rebuildUI(boolean rebuildSuggestions) {
-        if (rebuildSuggestions) {
-            // recheck to see if any suggestions have been changed.
-            new SuggestionLoader().execute();
-            // Set categories on their own if loading suggestions takes too long.
-            mHandler.postDelayed(() -> {
-                updateCategoryAndSuggestion(null /* tiles */);
-            }, MAX_WAIT_MILLIS);
-        } else {
+    @VisibleForTesting
+    void rebuildUI() {
+        new SuggestionLoader().execute();
+        // Set categories on their own if loading suggestions takes too long.
+        mHandler.postDelayed(() -> {
             updateCategoryAndSuggestion(null /* tiles */);
-        }
+        }, MAX_WAIT_MILLIS);
     }
 
     @Override
     public void onCategoriesChanged() {
-        rebuildUI(false /* rebuildSuggestions */);
+        // Bypass rebuildUI() on the first call of onCategoriesChanged, since rebuildUI() happens
+        // in onViewCreated as well when app starts. But, on the subsequent calls we need to
+        // rebuildUI() because there might be some changes to suggestions and categories.
+        if (isOnCategoriesChangedCalled) {
+            rebuildUI();
+        }
+        isOnCategoriesChangedCalled = true;
     }
 
     @Override
diff --git a/src/com/android/settings/dashboard/SuggestionsChecks.java b/src/com/android/settings/dashboard/SuggestionsChecks.java
index 66a0ef5..9cf0868 100644
--- a/src/com/android/settings/dashboard/SuggestionsChecks.java
+++ b/src/com/android/settings/dashboard/SuggestionsChecks.java
@@ -30,6 +30,7 @@
 import android.os.ServiceManager;
 
 import com.android.ims.ImsManager;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
 import com.android.settings.Settings.FingerprintSuggestionActivity;
 import com.android.settings.Settings.ScreenLockSuggestionActivity;
@@ -38,7 +39,6 @@
 import com.android.settings.Utils;
 import com.android.settings.WallpaperSuggestionActivity;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.suggestions.SuggestionFeatureProvider;
 import com.android.settingslib.drawer.Tile;
 
 import java.util.Collection;
diff --git a/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java b/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java
index 37faeab..2d6a14d 100644
--- a/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java
+++ b/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java
@@ -73,7 +73,7 @@
     @Override
     public void onPrimaryClick() {
         mManager.getContext().startActivity(new Intent(mManager.getContext(),
-                Settings.WirelessSettingsActivity.class));
+                Settings.NetworkDashboardActivity.class));
     }
 
     @Override
diff --git a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java b/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
index fb6b9c9..beed7b4 100644
--- a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
+++ b/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
@@ -84,7 +84,7 @@
     @Override
     public void onPrimaryClick() {
         mManager.getContext().startActivity(new Intent(mManager.getContext(),
-                Settings.AccountSettingsActivity.class));
+                Settings.UserAndAccountDashboardActivity.class));
     }
 
     @Override
diff --git a/src/com/android/settings/suggestions/EventStore.java b/src/com/android/settings/dashboard/suggestions/EventStore.java
similarity index 98%
rename from src/com/android/settings/suggestions/EventStore.java
rename to src/com/android/settings/dashboard/suggestions/EventStore.java
index bf94f48..43ed65b 100644
--- a/src/com/android/settings/suggestions/EventStore.java
+++ b/src/com/android/settings/dashboard/suggestions/EventStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/src/com/android/settings/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
similarity index 96%
rename from src/com/android/settings/suggestions/SuggestionFeatureProvider.java
rename to src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
index e6af3bd..18fbd90 100644
--- a/src/com/android/settings/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import android.content.Context;
 
diff --git a/src/com/android/settings/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
similarity index 96%
rename from src/com/android/settings/suggestions/SuggestionFeatureProviderImpl.java
rename to src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 97220df..3a4d545 100644
--- a/src/com/android/settings/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import android.content.Context;
 
diff --git a/src/com/android/settings/suggestions/SuggestionFeaturizer.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizer.java
similarity index 98%
rename from src/com/android/settings/suggestions/SuggestionFeaturizer.java
rename to src/com/android/settings/dashboard/suggestions/SuggestionFeaturizer.java
index eb43272..18ac50a 100644
--- a/src/com/android/settings/suggestions/SuggestionFeaturizer.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/com/android/settings/suggestions/SuggestionRanker.java b/src/com/android/settings/dashboard/suggestions/SuggestionRanker.java
similarity index 98%
rename from src/com/android/settings/suggestions/SuggestionRanker.java
rename to src/com/android/settings/dashboard/suggestions/SuggestionRanker.java
index 9f9796b..a7458bc 100644
--- a/src/com/android/settings/suggestions/SuggestionRanker.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionRanker.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import com.android.settingslib.drawer.Tile;
 
diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index 9f47f7c..f72d465 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -50,11 +50,8 @@
     public ChartDataUsagePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         setSelectable(false);
-        // TODO: Resource.
-        mLimitColor = 0xfff4511e;
-        TypedArray a = context.getTheme().obtainStyledAttributes(
-                new int[]{android.R.attr.textColorSecondary});
-        mWarningColor = a.getColor(0, 0);
+        mLimitColor = Utils.getColorAttr(context, android.R.attr.colorError);
+        mWarningColor = Utils.getColorAttr(context, android.R.attr.textColorSecondary);
         setLayoutResource(R.layout.data_usage_graph);
     }
 
diff --git a/src/com/android/settings/development/TelephonyMonitorPreferenceController.java b/src/com/android/settings/development/TelephonyMonitorPreferenceController.java
new file mode 100644
index 0000000..135af7d
--- /dev/null
+++ b/src/com/android/settings/development/TelephonyMonitorPreferenceController.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.widget.Toast;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settings.R;
+
+public class TelephonyMonitorPreferenceController extends PreferenceController {
+
+    private static final String KEY_TELEPHONY_MONITOR_SWITCH = "telephony_monitor_switch";
+    static final String BUILD_TYPE = "ro.build.type";
+    static final String PROPERTY_TELEPHONY_MONITOR = "persist.radio.enable_tel_mon";
+
+    private SwitchPreference mPreference;
+
+    public TelephonyMonitorPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        if (isAvailable()) {
+            mPreference = (SwitchPreference) screen.findPreference(KEY_TELEPHONY_MONITOR_SWITCH);
+            mPreference.setChecked(SystemProperties.getBoolean(PROPERTY_TELEPHONY_MONITOR, false));
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_TELEPHONY_MONITOR_SWITCH;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor) &&
+                (SystemProperties.get(BUILD_TYPE).equals("userdebug") ||
+                        SystemProperties.get(BUILD_TYPE).equals("eng"));
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updatePreference();
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_TELEPHONY_MONITOR_SWITCH.equals(preference.getKey())) {
+            final SwitchPreference switchPreference = (SwitchPreference) preference;
+            SystemProperties.set(PROPERTY_TELEPHONY_MONITOR,
+                    switchPreference.isChecked() ? "true" : "false");
+            Toast.makeText(mContext, R.string.telephony_monitor_toast,
+                    Toast.LENGTH_LONG).show();
+            return true;
+        }
+        return false;
+    }
+
+    public void enablePreference(boolean enabled) {
+        if (isAvailable()) {
+            mPreference.setEnabled(enabled);
+        }
+    }
+
+    public boolean updatePreference() {
+        if (!isAvailable()) {
+            return false;
+        }
+        final boolean enabled = SystemProperties.getBoolean(PROPERTY_TELEPHONY_MONITOR, false);
+        mPreference.setChecked(enabled);
+        return enabled;
+    }
+
+}
diff --git a/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java b/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java
new file mode 100644
index 0000000..1153d12
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.core.PreferenceController;
+
+public class BasebandVersionPreferenceController extends PreferenceController {
+
+    private static final String BASEBAND_PROPERTY = "gsm.version.baseband";
+    private static final String KEY_BASEBAND_VERSION = "baseband_version";
+
+    public BasebandVersionPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !Utils.isWifiOnly(mContext);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BASEBAND_VERSION;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        preference.setSummary(SystemProperties.get(BASEBAND_PROPERTY,
+                mContext.getResources().getString(R.string.device_info_default)));
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index d118a45..d6fe1aa 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -26,15 +26,20 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
+import android.util.Pair;
 import android.widget.Toast;
 
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.DevelopmentSettings;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.core.lifecycle.LifecycleObserver;
 import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.Index;
 import com.android.settingslib.RestrictedLockUtils;
 
@@ -49,6 +54,7 @@
     private final Activity mActivity;
     private final Fragment mFragment;
     private final UserManager mUm;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
 
     private Toast mDevHitToast;
     private RestrictedLockUtils.EnforcedAdmin mDebuggingFeaturesDisallowedAdmin;
@@ -56,11 +62,16 @@
     private int mDevHitCountdown;
     private boolean mProcessingLastDevHit;
 
-    public BuildNumberPreferenceController(Context context, Activity activity, Fragment fragment) {
+    public BuildNumberPreferenceController(Context context, Activity activity, Fragment fragment,
+            Lifecycle lifecycle) {
         super(context);
         mActivity = activity;
         mFragment = fragment;
-        mUm = UserManager.get(activity);
+        mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
     }
 
     @Override
@@ -106,11 +117,15 @@
         }
         // Don't enable developer options for secondary users.
         if (!mUm.isAdminUser()) {
+            mMetricsFeatureProvider.action(
+                    mContext, MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF);
             return false;
         }
 
         // Don't enable developer options until device has been provisioned
         if (!Utils.isDeviceProvisioned(mContext)) {
+            mMetricsFeatureProvider.action(
+                    mContext, MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF);
             return false;
         }
 
@@ -120,6 +135,8 @@
                 RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext,
                         mDebuggingFeaturesDisallowedAdmin);
             }
+            mMetricsFeatureProvider.action(
+                    mContext, MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF);
             return false;
         }
 
@@ -136,6 +153,10 @@
                 if (!mProcessingLastDevHit) {
                     enableDevelopmentSettings();
                 }
+                mMetricsFeatureProvider.action(
+                        mContext, MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF,
+                        Pair.create(MetricsEvent.FIELD_SETTINGS_BUILD_NUMBER_DEVELOPER_MODE_ENABLED,
+                                mProcessingLastDevHit ? 0 : 1));
             } else if (mDevHitCountdown > 0
                     && mDevHitCountdown < (TAPS_TO_BE_A_DEVELOPER - 2)) {
                 if (mDevHitToast != null) {
@@ -148,6 +169,10 @@
                         Toast.LENGTH_SHORT);
                 mDevHitToast.show();
             }
+            mMetricsFeatureProvider.action(
+                    mContext, MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF,
+                    Pair.create(MetricsEvent.FIELD_SETTINGS_BUILD_NUMBER_DEVELOPER_MODE_ENABLED,
+                            0));
         } else if (mDevHitCountdown < 0) {
             if (mDevHitToast != null) {
                 mDevHitToast.cancel();
@@ -155,6 +180,10 @@
             mDevHitToast = Toast.makeText(mContext, R.string.show_dev_already,
                     Toast.LENGTH_LONG);
             mDevHitToast.show();
+            mMetricsFeatureProvider.action(
+                    mContext, MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF,
+                    Pair.create(MetricsEvent.FIELD_SETTINGS_BUILD_NUMBER_DEVELOPER_MODE_ENABLED,
+                            1));
         }
         return true;
     }
diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
new file mode 100644
index 0000000..1b47561
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.os.Build;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.DeviceInfoUtils;
+
+public class DeviceModelPreferenceController extends PreferenceController {
+
+    private static final String KEY_DEVICE_MODEL = "device_model";
+
+    public DeviceModelPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference pref = screen.findPreference(KEY_DEVICE_MODEL);
+        if (pref != null) {
+            pref.setSummary(Build.MODEL + DeviceInfoUtils.getMsvSuffix());
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_DEVICE_MODEL;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java
new file mode 100644
index 0000000..4f8de71
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+
+public class FccEquipmentIdPreferenceController extends PreferenceController {
+
+
+    private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid";
+    private static final String KEY_EQUIPMENT_ID = "fcc_equipment_id";
+
+    public FccEquipmentIdPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !TextUtils.isEmpty(SystemProperties.get(PROPERTY_EQUIPMENT_ID));
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference pref = screen.findPreference(KEY_EQUIPMENT_ID);
+        if (pref != null) {
+            final String summary = SystemProperties.get(PROPERTY_EQUIPMENT_ID,
+                    mContext.getResources().getString(R.string.device_info_default));
+            pref.setSummary(summary);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_EQUIPMENT_ID;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java
new file mode 100644
index 0000000..ed61a92
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.DeviceInfoUtils;
+
+public class FeedbackPreferenceController extends PreferenceController {
+    private static final String KEY_DEVICE_FEEDBACK = "device_feedback";
+
+    private final Fragment mHost;
+    private final Intent intent;
+
+    public FeedbackPreferenceController(Fragment host, Context context) {
+        super(context);
+        this.mHost = host;
+        intent = new Intent("android.intent.action.BUG_REPORT");
+    }
+
+    public boolean isAvailable() {
+        return !TextUtils.isEmpty(DeviceInfoUtils.getFeedbackReporterPackage(mContext));
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        intent.setPackage(DeviceInfoUtils.getFeedbackReporterPackage(mContext));
+        preference.setIntent(intent);
+    }
+
+    public String getPreferenceKey() {
+        return KEY_DEVICE_FEEDBACK;
+    }
+
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), KEY_DEVICE_FEEDBACK)) {
+            return false;
+        }
+        if (!this.isAvailable()) {
+            return false;
+        }
+
+        this.mHost.startActivityForResult(intent, 0);
+        return true;
+    }
+}
+
diff --git a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
new file mode 100644
index 0000000..e8792f2
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.core.lifecycle.LifecycleObserver;
+import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.RestrictedLockUtils;
+
+
+public class FirmwareVersionPreferenceController extends PreferenceController
+        implements LifecycleObserver, OnResume {
+
+    private static final String TAG = "FirmwareVersionPref";
+    private static final String KEY_FIRMWARE_VERSION = "firmware_version";
+
+    private final UserManager mUserManager;
+
+    private RestrictedLockUtils.EnforcedAdmin mFunDisallowedAdmin;
+    private boolean mFunDisallowedBySystem;
+
+    private long[] mHits = new long[3];
+
+    public FirmwareVersionPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference pref = screen.findPreference(KEY_FIRMWARE_VERSION);
+        if (pref != null) {
+            pref.setSummary(Build.VERSION.RELEASE);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_FIRMWARE_VERSION;
+    }
+
+    @Override
+    public void onResume() {
+        mFunDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(
+                mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
+        mFunDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
+                mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), KEY_FIRMWARE_VERSION)) {
+            return false;
+        }
+        System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1);
+        mHits[mHits.length - 1] = SystemClock.uptimeMillis();
+        if (mHits[0] >= (SystemClock.uptimeMillis() - 500)) {
+            if (mUserManager.hasUserRestriction(UserManager.DISALLOW_FUN)) {
+                if (mFunDisallowedAdmin != null && !mFunDisallowedBySystem) {
+                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext,
+                            mFunDisallowedAdmin);
+                }
+                Log.d(TAG, "Sorry, no fun for you!");
+                return false;
+            }
+
+            final Intent intent = new Intent(Intent.ACTION_MAIN)
+                    .setClassName(
+                            "android", com.android.internal.app.PlatLogoActivity.class.getName());
+            try {
+                mContext.startActivity(intent);
+                return true;
+            } catch (Exception e) {
+                Log.e(TAG, "Unable to start activity " + intent.toString());
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
new file mode 100644
index 0000000..3a84c1e
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.DeviceInfoUtils;
+
+public class KernelVersionPreferenceController extends PreferenceController {
+
+    private static final String KEY_KERNEL_VERSION = "kernel_version";
+
+    public KernelVersionPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        preference.setSummary(DeviceInfoUtils.getFormattedKernelVersion());
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_KERNEL_VERSION;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/ManualPreferenceController.java b/src/com/android/settings/deviceinfo/ManualPreferenceController.java
new file mode 100644
index 0000000..dbaa00f
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/ManualPreferenceController.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.deviceinfo;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+
+public class ManualPreferenceController extends PreferenceController {
+
+    private static final String KEY_MANUAL = "manual";
+
+    public ManualPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mContext.getResources().getBoolean(R.bool.config_show_manual);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_MANUAL;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 6c3b9e6..076ec05 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -228,7 +228,7 @@
         // Add current user and its profiles first
         for (int userIndex = 0; userIndex < userCount; ++userIndex) {
             final UserInfo userInfo = allUsers.get(userIndex);
-            if (isProfileOf(mCurrentUser, userInfo)) {
+            if (Utils.isProfileOf(mCurrentUser, userInfo)) {
                 final PreferenceGroup details = showHeaders ?
                         addCategory(screen, userInfo.name) : screen;
                 addDetailItems(details, showShared, userInfo.id);
@@ -242,7 +242,7 @@
                     getText(R.string.storage_other_users));
             for (int userIndex = 0; userIndex < userCount; ++userIndex) {
                 final UserInfo userInfo = allUsers.get(userIndex);
-                if (!isProfileOf(mCurrentUser, userInfo)) {
+                if (!Utils.isProfileOf(mCurrentUser, userInfo)) {
                     addItem(otherUsers, /* titleRes */ 0, userInfo.name, userInfo.id);
                 }
             }
@@ -483,20 +483,26 @@
 
             } break;
             case R.string.storage_detail_images: {
-                intent = new Intent(DocumentsContract.ACTION_BROWSE);
-                intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "images_root"));
+                intent = new Intent(Intent.ACTION_VIEW);
+                intent.setDataAndType(
+                        DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "images_root"),
+                        DocumentsContract.Root.MIME_TYPE_ITEM);
                 intent.addCategory(Intent.CATEGORY_DEFAULT);
 
             } break;
             case R.string.storage_detail_videos: {
-                intent = new Intent(DocumentsContract.ACTION_BROWSE);
-                intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "videos_root"));
+                intent = new Intent(Intent.ACTION_VIEW);
+                intent.setDataAndType(
+                        DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "videos_root"),
+                        DocumentsContract.Root.MIME_TYPE_ITEM);
                 intent.addCategory(Intent.CATEGORY_DEFAULT);
 
             } break;
             case R.string.storage_detail_audio: {
-                intent = new Intent(DocumentsContract.ACTION_BROWSE);
-                intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"));
+                intent = new Intent(DocumentsContract.Root.MIME_TYPE_ITEM);
+                intent.setDataAndType(
+                        DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"),
+                        DocumentsContract.Root.MIME_TYPE_ITEM);
                 intent.addCategory(Intent.CATEGORY_DEFAULT);
 
             } break;
@@ -649,12 +655,6 @@
         pref.setStorageSize(size, mTotalSize);
     }
 
-    private boolean isProfileOf(UserInfo user, UserInfo profile) {
-        return user.id == profile.id ||
-                (user.profileGroupId != UserInfo.NO_PROFILE_GROUP_ID
-                && user.profileGroupId == profile.profileGroupId);
-    }
-
     private static long totalValues(MeasurementDetails details, int userId, String... keys) {
         long total = 0;
         HashMap<String, Long> map = details.mediaSize.get(userId);
diff --git a/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java b/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java
new file mode 100644
index 0000000..f82fd0b
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+
+import com.android.settings.core.PreferenceController;
+
+public class RegulatoryInfoPreferenceController extends PreferenceController {
+
+    private static final String KEY_REGULATORY_INFO = "regulatory_info";
+    private static final Intent INTENT_PROBE = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);
+
+    public RegulatoryInfoPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !mContext.getPackageManager().queryIntentActivities(INTENT_PROBE, 0).isEmpty();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_REGULATORY_INFO;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java b/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java
new file mode 100644
index 0000000..b8529d2
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.os.SELinux;
+import android.os.SystemProperties;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+
+public class SELinuxStatusPreferenceController extends PreferenceController {
+
+    private static final String PROPERTY_SELINUX_STATUS = "ro.build.selinux";
+    private static final String KEY_SELINUX_STATUS = "selinux_status";
+
+    public SELinuxStatusPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !TextUtils.isEmpty(SystemProperties.get(PROPERTY_SELINUX_STATUS));
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SELINUX_STATUS;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference pref = screen.findPreference(KEY_SELINUX_STATUS);
+        if (pref == null) {
+            return;
+        }
+        if (!SELinux.isSELinuxEnabled()) {
+            String status = mContext.getResources().getString(R.string.selinux_status_disabled);
+            pref.setSummary(status);
+        } else if (!SELinux.isSELinuxEnforced()) {
+            String status = mContext.getResources().getString(R.string.selinux_status_permissive);
+            pref.setSummary(status);
+        }
+    }
+}
+
diff --git a/src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java b/src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java
new file mode 100644
index 0000000..bde4dd0
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+
+import com.android.settings.core.PreferenceController;
+
+public class SafetyInfoPreferenceController extends PreferenceController {
+
+    private static final Intent INTENT_PROBE =
+            new Intent("android.settings.SHOW_SAFETY_AND_REGULATORY_INFO");
+
+    private final PackageManager mPackageManager;
+
+    public SafetyInfoPreferenceController(Context context) {
+        super(context);
+        mPackageManager = mContext.getPackageManager();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !mPackageManager.queryIntentActivities(INTENT_PROBE, 0).isEmpty();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return "safety_info";
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/SafetyLegalPreferenceController.java b/src/com/android/settings/deviceinfo/SafetyLegalPreferenceController.java
new file mode 100644
index 0000000..c158d64
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/SafetyLegalPreferenceController.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.text.TextUtils;
+
+import com.android.settings.core.PreferenceController;
+
+public class SafetyLegalPreferenceController extends PreferenceController {
+
+    private static final String KEY_SAFETY_LEGAL = "safetylegal";
+    private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";
+
+
+    public SafetyLegalPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !TextUtils.isEmpty(SystemProperties.get(PROPERTY_URL_SAFETYLEGAL));
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SAFETY_LEGAL;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java b/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java
new file mode 100644
index 0000000..64a1159
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.DeviceInfoUtils;
+
+public class SecurityPatchPreferenceController extends PreferenceController {
+
+    private static final String KEY_SECURITY_PATCH = "security_patch";
+    private static final String TAG = "SecurityPatchPref";
+
+    private final String mPatch;
+    private final PackageManager mPackageManager;
+
+    public SecurityPatchPreferenceController(Context context) {
+        super(context);
+        mPackageManager = mContext.getPackageManager();
+        mPatch = DeviceInfoUtils.getSecurityPatch();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !TextUtils.isEmpty(mPatch);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SECURITY_PATCH;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference pref = screen.findPreference(KEY_SECURITY_PATCH);
+        if (pref != null) {
+            pref.setSummary(mPatch);
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), KEY_SECURITY_PATCH)) {
+            return false;
+        }
+        if (mPackageManager.queryIntentActivities(preference.getIntent(), 0).isEmpty()) {
+            // Don't send out the intent to stop crash
+            Log.w(TAG, "Stop click action on " + KEY_SECURITY_PATCH + ": "
+                    + "queryIntentActivities() returns empty");
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 4444d48..3be20bf 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -48,8 +48,8 @@
 import android.widget.TabWidget;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.telephony.DefaultPhoneNotifier;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstantConversions;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -292,7 +292,7 @@
 
     private void updateDataState() {
         final int state =
-                DefaultPhoneNotifier.convertDataState(mPhone.getDataConnectionState());
+                PhoneConstantConversions.convertDataState(mPhone.getDataConnectionState());
 
         String display = mRes.getString(R.string.radioInfo_unknown);
 
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 914a8fe..298a7ad 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -16,46 +16,76 @@
 
 package com.android.settings.deviceinfo;
 
+import android.app.LoaderManager;
 import android.content.Context;
+import android.content.Loader;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
 import android.provider.SearchIndexableResource;
-import android.support.annotation.VisibleForTesting;
+import android.util.SparseArray;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.PackageManagerWrapperImpl;
+import com.android.settings.applications.UserManagerWrapper;
+import com.android.settings.applications.UserManagerWrapperImpl;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.deviceinfo.storage.SecondaryUserController;
+import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
 import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
 import com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class StorageDashboardFragment extends DashboardFragment {
+public class StorageDashboardFragment extends DashboardFragment
+    implements LoaderManager.LoaderCallbacks<SparseArray<StorageAsyncLoader.AppsStorageResult>> {
     private static final String TAG = "StorageDashboardFrag";
-    private static final int APPS_JOB_ID = 0;
+    private static final int STORAGE_JOB_ID = 0;
 
     private VolumeInfo mVolume;
 
     private StorageSummaryDonutPreferenceController mSummaryController;
     private StorageItemPreferenceController mPreferenceController;
-
-    private boolean isVolumeValid() {
-        return (mVolume != null) && (mVolume.getType() == VolumeInfo.TYPE_PRIVATE)
-                && mVolume.isMountedReadable();
-    }
+    private List<PreferenceController> mSecondaryUsers;
 
     @Override
     public void onResume() {
         super.onResume();
-        getLoaderManager().initLoader(APPS_JOB_ID, Bundle.EMPTY, mPreferenceController);
+        getLoaderManager().initLoader(STORAGE_JOB_ID, Bundle.EMPTY, this);
+    }
+
+    @Override
+    public Loader<SparseArray<StorageAsyncLoader.AppsStorageResult>> onCreateLoader(int id,
+            Bundle args) {
+        Context context = getContext();
+        return new StorageAsyncLoader(context,
+                new UserManagerWrapperImpl(context.getSystemService(UserManager.class)),
+                mVolume.fsUuid,
+                new StorageStatsSource(context),
+                new PackageManagerWrapperImpl(context.getPackageManager()));
+    }
+
+    @Override
+    public void onLoadFinished(Loader<SparseArray<StorageAsyncLoader.AppsStorageResult>> loader,
+            SparseArray<StorageAsyncLoader.AppsStorageResult> data) {
+        mPreferenceController.onLoadFinished(data.get(UserHandle.myUserId()));
+        updateSecondaryUserControllers(mSecondaryUsers, data);
+    }
+
+    @Override
+    public void onLoaderReset(Loader<SparseArray<StorageAsyncLoader.AppsStorageResult>> loader) {
     }
 
     @Override
@@ -65,7 +95,8 @@
         // Initialize the storage sizes that we can quickly calc.
         final Context context = getActivity();
         StorageManager sm = context.getSystemService(StorageManager.class);
-        if (!initializeVolume(sm, getArguments())) {
+        mVolume = Utils.maybeInitializeVolume(sm, getArguments());
+        if (mVolume == null) {
             getActivity().finish();
             return;
         }
@@ -110,19 +141,29 @@
         mPreferenceController = new StorageItemPreferenceController(context, this,
                 mVolume, new StorageManagerVolumeProvider(sm));
         controllers.add(mPreferenceController);
+
+        UserManagerWrapper userManager =
+                new UserManagerWrapperImpl(context.getSystemService(UserManager.class));
+        mSecondaryUsers = SecondaryUserController.getSecondaryUserControllers(context, userManager);
+        controllers.addAll(mSecondaryUsers);
+
         controllers.add(new ManageStoragePreferenceController(context));
         return controllers;
     }
 
     /**
-     * Initializes the volume with a given bundle and returns if the volume is valid.
+     * Updates the secondary user controller sizes.
      */
-    @VisibleForTesting
-    boolean initializeVolume(StorageManager sm, Bundle bundle) {
-        String volumeId = bundle.getString(VolumeInfo.EXTRA_VOLUME_ID,
-                VolumeInfo.ID_PRIVATE_INTERNAL);
-        mVolume = sm.findVolumeById(volumeId);
-        return isVolumeValid();
+    private void updateSecondaryUserControllers(List<PreferenceController> controllers,
+            SparseArray<StorageAsyncLoader.AppsStorageResult> stats) {
+        for (int i = 0, size = controllers.size(); i < size; i++) {
+            PreferenceController controller = controllers.get(i);
+            if (controller instanceof StorageAsyncLoader.ResultHandler) {
+                StorageAsyncLoader.ResultHandler userController =
+                        (StorageAsyncLoader.ResultHandler) controller;
+                userController.handleResult(stats);
+            }
+        }
     }
 
     /**
@@ -143,16 +184,19 @@
                 }
 
                 @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    if (!FeatureFactory.getFactory(context).getDashboardFeatureProvider(context)
-                            .isEnabled()) {
-                        return null;
-                    }
-                    final ManageStoragePreferenceController controller =
-                            new ManageStoragePreferenceController(context);
-                    final List<String> keys = new ArrayList<>();
-                    controller.updateNonIndexableKeys(keys);
-                    return keys;
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    final StorageManager sm = context.getSystemService(StorageManager.class);
+                    final UserManagerWrapper userManager =
+                            new UserManagerWrapperImpl(context.getSystemService(UserManager.class));
+                    final List<PreferenceController> controllers = new ArrayList<>();
+                    controllers.add(new StorageSummaryDonutPreferenceController(context));
+                    controllers.add(new StorageItemPreferenceController(context, null /* host */,
+                            null /* volume */, new StorageManagerVolumeProvider(sm)));
+                    controllers.addAll(SecondaryUserController.getSecondaryUserControllers(
+                            context, userManager));
+                    controllers.add(new ManageStoragePreferenceController(context));
+                    return controllers;
                 }
+
             };
 }
diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
new file mode 100644
index 0000000..6ae03da
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.LoaderManager;
+import android.content.Context;
+import android.content.Loader;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.util.SparseArray;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.PackageManagerWrapperImpl;
+import com.android.settings.applications.UserManagerWrapperImpl;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
+import com.android.settings.deviceinfo.storage.StorageAsyncLoader.AppsStorageResult;
+import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
+import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * StorageProfileFragment is a fragment which shows the storage results for a profile of the
+ * primary user.
+ */
+public class StorageProfileFragment extends DashboardFragment
+        implements LoaderManager.LoaderCallbacks<SparseArray<AppsStorageResult>> {
+    private static final String TAG = "StorageProfileFragment";
+    public static final String USER_ID_EXTRA = "userId";
+    private static final int APPS_JOB_ID = 0;
+
+    private VolumeInfo mVolume;
+    private int mUserId;
+    private StorageItemPreferenceController mPreferenceController;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        final Bundle args = getArguments();
+
+        // Initialize the storage sizes that we can quickly calc.
+        final Context context = getActivity();
+        final StorageManager sm = context.getSystemService(StorageManager.class);
+        mVolume = Utils.maybeInitializeVolume(sm, args);
+        if (mVolume == null) {
+            getActivity().finish();
+            return;
+        }
+
+        mPreferenceController.setVolume(mVolume);
+        mUserId = args.getInt(USER_ID_EXTRA, UserHandle.myUserId());
+        mPreferenceController.setUserId(mUserId);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        getLoaderManager().initLoader(APPS_JOB_ID, Bundle.EMPTY, this);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.SETTINGS_STORAGE_PROFILE;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.storage_profile_fragment;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        final StorageManager sm = context.getSystemService(StorageManager.class);
+        mPreferenceController = new StorageItemPreferenceController(context, this,
+                mVolume, new StorageManagerVolumeProvider(sm));
+        controllers.add(mPreferenceController);
+        return controllers;
+    }
+
+    @Override
+    public Loader<SparseArray<AppsStorageResult>> onCreateLoader(int id, Bundle args) {
+        Context context = getContext();
+        return new StorageAsyncLoader(context,
+                new UserManagerWrapperImpl(context.getSystemService(UserManager.class)),
+                mVolume.fsUuid,
+                new StorageStatsSource(context),
+                new PackageManagerWrapperImpl(context.getPackageManager()));
+    }
+
+    @Override
+    public void onLoadFinished(Loader<SparseArray<AppsStorageResult>> loader,
+            SparseArray<AppsStorageResult> result) {
+        mPreferenceController.onLoadFinished(result.get(mUserId));
+    }
+
+    @Override
+    public void onLoaderReset(Loader<SparseArray<AppsStorageResult>> loader) {
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 31bcc4e..c062a56 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -76,7 +76,6 @@
     private static final String TAG_DISK_INIT = "disk_init";
 
     static final int COLOR_PUBLIC = Color.parseColor("#ff9e9e9e");
-    static final int COLOR_WARNING = Color.parseColor("#fff4511e");
 
     static final int[] COLOR_PRIVATE = new int[] {
             Color.parseColor("#ff26a69a"),
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index 2ef42fa..91bdfbf 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -32,6 +32,7 @@
 
 import com.android.settings.R;
 import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
+import com.android.settingslib.Utils;
 
 import java.io.File;
 
@@ -83,7 +84,7 @@
             }
 
             if (freeBytes < mStorageManager.getStorageLowBytes(path)) {
-                mColor = StorageSettings.COLOR_WARNING;
+                mColor = Utils.getColorAttr(context, android.R.attr.colorError);
                 icon = context.getDrawable(R.drawable.ic_warning_24dp);
             }
 
diff --git a/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java b/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
index 0bf43e2..4fcacd8 100644
--- a/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
@@ -28,8 +28,6 @@
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
 
-import java.util.List;
-
 import static android.content.Context.CARRIER_CONFIG_SERVICE;
 
 public class SystemUpdatePreferenceController extends PreferenceController {
@@ -67,14 +65,6 @@
     }
 
     @Override
-    public void updateNonIndexableKeys(List<String> keys) {
-        // TODO: system update needs to be fixed for non-owner user b/22760654
-        if (!isAvailable()) {
-            keys.add(KEY_SYSTEM_UPDATE_SETTINGS);
-        }
-    }
-
-    @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (KEY_SYSTEM_UPDATE_SETTINGS.equals(preference.getKey())) {
             CarrierConfigManager configManager =
diff --git a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
new file mode 100644
index 0000000..a5e8373
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.storage;
+
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.SparseArray;
+
+import com.android.settings.Utils;
+import com.android.settings.applications.UserManagerWrapper;
+import com.android.settings.core.PreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * SecondaryUserController controls the preferences on the Storage screen which had to do with
+ * secondary users.
+ */
+public class SecondaryUserController extends PreferenceController implements
+        StorageAsyncLoader.ResultHandler {
+    // PreferenceGroupKey to try to add our preference onto.
+    private static final String TARGET_PREFERENCE_GROUP_KEY = "pref_secondary_users";
+    private static final String PREFERENCE_KEY_BASE = "pref_user_";
+    private static final int USER_PROFILE_INSERTION_LOCATION = 6;
+    private static final int SIZE_NOT_SET = -1;
+
+    private @NonNull UserInfo mUser;
+    private @Nullable StorageItemPreferenceAlternate mStoragePreference;
+    private long mSize;
+
+    /**
+     * Adds the appropriate controllers to a controller list for handling all secondary users on
+     * a device.
+     * @param context Context for initializing the preference controllers.
+     * @param userManager UserManagerWrapper for figuring out which controllers to add.
+     */
+    public static List<PreferenceController> getSecondaryUserControllers(
+            Context context, UserManagerWrapper userManager) {
+        List<PreferenceController> controllers = new ArrayList<>();
+        UserInfo primaryUser = userManager.getPrimaryUser();
+        boolean addedUser = false;
+        List<UserInfo> infos = userManager.getUsers();
+        for (int i = 0, size = infos.size(); i < size; i++) {
+            UserInfo info = infos.get(i);
+            if (info.equals(primaryUser)) {
+                continue;
+            }
+
+            if (info == null || Utils.isProfileOf(primaryUser, info)) {
+                controllers.add(new UserProfileController(context, info,
+                        USER_PROFILE_INSERTION_LOCATION));
+                continue;
+            }
+
+            controllers.add(new SecondaryUserController(context, info));
+            addedUser = true;
+        }
+
+        if (!addedUser) {
+            controllers.add(new NoSecondaryUserController(context));
+        }
+        return controllers;
+    }
+
+    /**
+     * Constructor for a given secondary user.
+     * @param context Context to initialize the underlying {@link PreferenceController}.
+     * @param info {@link UserInfo} for the secondary user which this controllers covers.
+     */
+    @VisibleForTesting
+    SecondaryUserController(Context context, @NonNull UserInfo info) {
+        super(context);
+        mUser = info;
+        mSize = SIZE_NOT_SET;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        if (mStoragePreference == null) {
+            mStoragePreference = new StorageItemPreferenceAlternate(mContext);
+
+            PreferenceGroup group =
+                    (PreferenceGroup) screen.findPreference(TARGET_PREFERENCE_GROUP_KEY);
+            mStoragePreference.setTitle(mUser.name);
+            mStoragePreference.setKey(PREFERENCE_KEY_BASE + mUser.id);
+            if (mSize != SIZE_NOT_SET) {
+                mStoragePreference.setStorageSize(mSize);
+            }
+            group.setVisible(true);
+            group.addPreference(mStoragePreference);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return mStoragePreference != null ? mStoragePreference.getKey() : null;
+    }
+
+    /**
+     * Returns the user for which this is the secondary user controller.
+     */
+    @NonNull
+    public UserInfo getUser() {
+        return mUser;
+    }
+
+    /**
+     * Sets the size for the preference.
+     * @param size Size in bytes.
+     */
+    public void setSize(long size) {
+        mSize = size;
+        if (mStoragePreference != null) {
+            mStoragePreference.setStorageSize(mSize);
+        }
+    }
+
+    public void handleResult(SparseArray<StorageAsyncLoader.AppsStorageResult> stats) {
+        int userId = getUser().id;
+        StorageAsyncLoader.AppsStorageResult result = stats.get(userId);
+        if (result != null) {
+            setSize(result.externalStats.totalBytes);
+        }
+    }
+
+    private static class NoSecondaryUserController extends PreferenceController {
+        public NoSecondaryUserController(Context context) {
+            super(context);
+        }
+
+        @Override
+        public void displayPreference(PreferenceScreen screen) {
+            PreferenceGroup group =
+                    (PreferenceGroup) screen.findPreference(TARGET_PREFERENCE_GROUP_KEY);
+            if (group == null) {
+                return;
+            }
+            screen.removePreference(group);
+        }
+
+        @Override
+        public boolean isAvailable() {
+            return true;
+        }
+
+        @Override
+        public String getPreferenceKey() {
+            return null;
+        }
+
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
index b16590e..f54c685 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
@@ -21,74 +21,96 @@
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.UserInfo;
 import android.os.UserHandle;
-import android.util.ArraySet;
+import android.util.Log;
+import android.util.SparseArray;
 
 import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settings.applications.UserManagerWrapper;
 import com.android.settings.utils.AsyncLoader;
+import com.android.settingslib.applications.StorageStatsSource;
 
 import java.util.List;
 
 /**
- * AppsAsyncLoader is a Loader which loads app storage information and categories it by the app's
- * specified categorization.
+ * StorageAsyncLoader is a Loader which loads categorized app information and external stats for all
+ * users
  */
-public class StorageAsyncLoader extends AsyncLoader<StorageAsyncLoader.AppsStorageResult> {
-    private int mUserId;
+public class StorageAsyncLoader
+        extends AsyncLoader<SparseArray<StorageAsyncLoader.AppsStorageResult>> {
+    private UserManagerWrapper mUserManager;
+    private static final String TAG = "StorageAsyncLoader";
+
     private String mUuid;
     private StorageStatsSource mStatsManager;
     private PackageManagerWrapper mPackageManager;
 
-    public StorageAsyncLoader(Context context, int userId, String uuid, StorageStatsSource source,
-            PackageManagerWrapper pm) {
+    public StorageAsyncLoader(Context context, UserManagerWrapper userManager,
+            String uuid, StorageStatsSource source, PackageManagerWrapper pm) {
         super(context);
-        mUserId = userId;
+        mUserManager = userManager;
         mUuid = uuid;
         mStatsManager = source;
         mPackageManager = pm;
     }
 
     @Override
-    public AppsStorageResult loadInBackground() {
+    public SparseArray<AppsStorageResult> loadInBackground() {
         return loadApps();
     }
 
-    private AppsStorageResult loadApps() {
-        AppsStorageResult result = new AppsStorageResult();
-        ArraySet<Integer> seenUid = new ArraySet<>(); // some apps share a uid
+    private SparseArray<AppsStorageResult> loadApps() {
+        SparseArray<AppsStorageResult> result = new SparseArray<>();
+        List<UserInfo> infos = mUserManager.getUsers();
+        for (int i = 0, userCount = infos.size(); i < userCount; i++) {
+            UserInfo info = infos.get(i);
+            result.put(info.id, getStorageResultForUser(info.id));
+        }
+        return result;
+    }
 
+    private AppsStorageResult getStorageResultForUser(int userId) {
+        Log.d(TAG, "Loading apps");
         List<ApplicationInfo> applicationInfos =
-                mPackageManager.getInstalledApplicationsAsUser(0, mUserId);
-        int size = applicationInfos.size();
-        for (int i = 0; i < size; i++) {
+                mPackageManager.getInstalledApplicationsAsUser(0, userId);
+        AppsStorageResult result = new AppsStorageResult();
+        UserHandle myUser = UserHandle.of(userId);
+        for (int i = 0, size = applicationInfos.size(); i < size; i++) {
             ApplicationInfo app = applicationInfos.get(i);
-            if (seenUid.contains(app.uid)) {
-                continue;
-            }
-            seenUid.add(app.uid);
+            StorageStatsSource.AppStorageStats stats =
+                    mStatsManager.getStatsForPackage(mUuid, app.packageName, myUser);
 
-            StorageStatsSource.AppStorageStats stats = mStatsManager.getStatsForUid(mUuid, app.uid);
-            // Note: This omits cache intentionally -- we are not attributing it to the apps.
-            long appSize = stats.getCodeBytes() + stats.getDataBytes();
+            long attributedAppSizeInBytes = stats.getDataBytes();
+            // This matches how the package manager calculates sizes -- by zeroing out code sizes of
+            // system apps which are not updated. My initial tests suggest that this results in the
+            // original code size being counted for updated system apps when they shouldn't, but
+            // I am not sure how to avoid this problem without specifically going in to find that
+            // code size.
+            if (!app.isSystemApp() || app.isUpdatedSystemApp()) {
+                attributedAppSizeInBytes += stats.getCodeBytes();
+            }
             switch (app.category) {
                 case CATEGORY_GAME:
-                    result.gamesSize += appSize;
+                    result.gamesSize += attributedAppSizeInBytes;
                     break;
                 case CATEGORY_AUDIO:
-                    result.musicAppsSize += appSize;
+                    result.musicAppsSize += attributedAppSizeInBytes;
                     break;
                 default:
-                    result.otherAppsSize += appSize;
+                    result.otherAppsSize += attributedAppSizeInBytes;
                     break;
             }
         }
 
-        result.externalStats = mStatsManager.getExternalStorageStats(mUuid, UserHandle.of(mUserId));
+        Log.d(TAG, "Loading external stats");
+        result.externalStats = mStatsManager.getExternalStorageStats(mUuid, UserHandle.of(userId));
+        Log.d(TAG, "Obtaining result completed");
         return result;
     }
 
     @Override
-    protected void onDiscardResult(AppsStorageResult result) {
+    protected void onDiscardResult(SparseArray<AppsStorageResult> result) {
     }
 
     public static class AppsStorageResult {
@@ -97,4 +119,12 @@
         public long otherAppsSize;
         public StorageStatsSource.ExternalStorageStats externalStats;
     }
+
+    /**
+     * ResultHandler defines a destination of data which can handle a result from
+     * {@link StorageAsyncLoader}.
+     */
+    public interface ResultHandler {
+        void handleResult(SparseArray<AppsStorageResult> result);
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceAlternate.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceAlternate.java
index 932a779..d5a36b9 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceAlternate.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceAlternate.java
@@ -18,10 +18,8 @@
 
 import android.content.Context;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
 import android.text.format.Formatter;
 import android.util.AttributeSet;
-import android.view.View;
 
 import com.android.settings.R;
 
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index 54a65da..7487b28 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -17,14 +17,11 @@
 package com.android.settings.deviceinfo.storage;
 
 import android.app.Fragment;
-import android.app.LoaderManager;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.Loader;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.os.UserManager;
 import android.os.storage.VolumeInfo;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
@@ -36,22 +33,21 @@
 import com.android.settings.Settings;
 import com.android.settings.Utils;
 import com.android.settings.applications.ManageApplications;
-import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.deviceinfo.StorageMeasurement;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * StorageItemPreferenceController handles the storage line items which summarize the storage
  * categorization breakdown.
  */
-public class StorageItemPreferenceController extends PreferenceController
-        implements LoaderManager.LoaderCallbacks<StorageAsyncLoader.AppsStorageResult> {
+public class StorageItemPreferenceController extends PreferenceController {
     private static final String TAG = "StorageItemPreference";
 
     private static final String IMAGE_MIME_TYPE = "image/*";
@@ -73,7 +69,7 @@
     private final  MetricsFeatureProvider mMetricsFeatureProvider;
     private final StorageVolumeProvider mSvp;
     private VolumeInfo mVolume;
-    private final int mUserId;
+    private int mUserId;
     private long mSystemSize;
 
     private StorageItemPreferenceAlternate mPhotoPreference;
@@ -92,8 +88,7 @@
         mVolume = volume;
         mSvp = svp;
         mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
-        UserManager um = mContext.getSystemService(UserManager.class);
-        mUserId = um.getUserHandle();
+        mUserId = UserHandle.myUserId();
     }
 
     @Override
@@ -110,6 +105,9 @@
         // TODO: Currently, this reflects the existing behavior for these toggles.
         //       After the intermediate views are built, swap them in.
         Intent intent = null;
+        if (preference.getKey() == null) {
+            return false;
+        }
         switch (preference.getKey()) {
             case PHOTO_KEY:
                 intent = getPhotosIntent();
@@ -157,6 +155,13 @@
         mVolume = volume;
     }
 
+    /**
+     * Sets the user id for which this preference controller is handling.
+     */
+    public void setUserId(int userId) {
+        mUserId = userId;
+    }
+
     @Override
     public void displayPreference(PreferenceScreen screen) {
         mPhotoPreference = (StorageItemPreferenceAlternate) screen.findPreference(PHOTO_KEY);
@@ -167,33 +172,21 @@
         mFilePreference = (StorageItemPreferenceAlternate) screen.findPreference(FILES_KEY);
     }
 
-    @Override
-    public Loader<StorageAsyncLoader.AppsStorageResult> onCreateLoader(int id,
-            Bundle args) {
-        return new StorageAsyncLoader(mContext, UserHandle.myUserId(), mVolume.fsUuid,
-                new StorageStatsSource(mContext),
-                new PackageManagerWrapperImpl(mContext.getPackageManager()));
-    }
-
-    @Override
-    public void onLoadFinished(Loader<StorageAsyncLoader.AppsStorageResult> loader,
-            StorageAsyncLoader.AppsStorageResult data) {
+    public void onLoadFinished(StorageAsyncLoader.AppsStorageResult data) {
         mPhotoPreference.setStorageSize(
                 data.externalStats.imageBytes + data.externalStats.videoBytes);
         mAudioPreference.setStorageSize(data.musicAppsSize + data.externalStats.audioBytes);
         mGamePreference.setStorageSize(data.gamesSize);
         mAppPreference.setStorageSize(data.otherAppsSize);
-        mSystemPreference.setStorageSize(mSystemSize);
+        if (mSystemPreference != null) {
+            mSystemPreference.setStorageSize(mSystemSize);
+        }
 
         long unattributedBytes = data.externalStats.totalBytes - data.externalStats.audioBytes
                 - data.externalStats.videoBytes - data.externalStats.imageBytes;
         mFilePreference.setStorageSize(unattributedBytes);
     }
 
-    @Override
-    public void onLoaderReset(Loader<StorageAsyncLoader.AppsStorageResult> loader) {
-    }
-
     /**
      * Sets the system size for the system size preference.
      * @param systemSize the size of the system in bytes
@@ -202,6 +195,20 @@
         mSystemSize = systemSize;
     }
 
+    /**
+     * Returns a list of keys used by this preference controller.
+     */
+    public static List<String> getUsedKeys() {
+        List<String> list = new ArrayList<>();
+        list.add(PHOTO_KEY);
+        list.add(AUDIO_KEY);
+        list.add(GAME_KEY);
+        list.add(OTHER_APPS_KEY);
+        list.add(SYSTEM_KEY);
+        list.add(FILES_KEY);
+        return list;
+    }
+
     private Intent getPhotosIntent() {
         Intent intent = new Intent();
         intent.setAction(android.content.Intent.ACTION_VIEW);
@@ -218,7 +225,7 @@
         args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription());
         args.putInt(ManageApplications.EXTRA_STORAGE_TYPE, ManageApplications.STORAGE_TYPE_MUSIC);
         return Utils.onBuildStartFragmentIntent(mContext,
-                ManageApplications.class.getName(), args, null, R.string.audio_storage_title, null,
+                ManageApplications.class.getName(), args, null, R.string.storage_music_audio, null,
                 false, mMetricsFeatureProvider.getMetricsCategory(mFragment));
     }
 
@@ -263,7 +270,7 @@
     private static long totalValues(StorageMeasurement.MeasurementDetails details, int userId,
             String... keys) {
         long total = 0;
-        HashMap<String, Long> map = details.mediaSize.get(userId);
+        Map<String, Long> map = details.mediaSize.get(userId);
         if (map != null) {
             for (String key : keys) {
                 if (map.containsKey(key)) {
diff --git a/src/com/android/settings/deviceinfo/storage/StorageStatsSource.java b/src/com/android/settings/deviceinfo/storage/StorageStatsSource.java
deleted file mode 100644
index 98038fd..0000000
--- a/src/com/android/settings/deviceinfo/storage/StorageStatsSource.java
+++ /dev/null
@@ -1,90 +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.deviceinfo.storage;
-
-import android.app.usage.StorageStats;
-import android.app.usage.StorageStatsManager;
-import android.content.Context;
-import android.os.UserHandle;
-
-/**
- * StorageStatsSource wraps the StorageStatsManager for testability purposes.
- */
-public class StorageStatsSource {
-    private StorageStatsManager mStorageStatsManager;
-
-    public StorageStatsSource(Context context) {
-        mStorageStatsManager = context.getSystemService(StorageStatsManager.class);
-    }
-
-    public ExternalStorageStats getExternalStorageStats(String volumeUuid, UserHandle user) {
-        return new ExternalStorageStats(
-                mStorageStatsManager.queryExternalStatsForUser(volumeUuid, user));
-    }
-
-    public AppStorageStats getStatsForUid(String volumeUuid, int uid) {
-        return new AppStorageStatsImpl(mStorageStatsManager.queryStatsForUid(volumeUuid, uid));
-    }
-
-    public static class ExternalStorageStats {
-        public long totalBytes;
-        public long audioBytes;
-        public long videoBytes;
-        public long imageBytes;
-
-        public ExternalStorageStats(long totalBytes, long audioBytes, long videoBytes,
-                long imageBytes) {
-            this.totalBytes = totalBytes;
-            this.audioBytes = audioBytes;
-            this.videoBytes = videoBytes;
-            this.imageBytes = imageBytes;
-        }
-
-        public ExternalStorageStats(android.app.usage.ExternalStorageStats stats) {
-            totalBytes = stats.getTotalBytes();
-            audioBytes = stats.getAudioBytes();
-            videoBytes = stats.getVideoBytes();
-            imageBytes = stats.getImageBytes();
-        }
-    }
-
-    public interface AppStorageStats {
-        long getCodeBytes();
-        long getDataBytes();
-        long getCacheBytes();
-    }
-
-    public static class AppStorageStatsImpl implements AppStorageStats {
-        private StorageStats mStats;
-
-        public AppStorageStatsImpl(StorageStats stats) {
-            mStats = stats;
-        }
-
-        public long getCodeBytes() {
-            return mStats.getCodeBytes();
-        }
-
-        public long getDataBytes() {
-            return mStats.getDataBytes();
-        }
-
-        public long getCacheBytes() {
-            return mStats.getCacheBytes();
-        }
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
new file mode 100644
index 0000000..5da9fec
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.storage;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.os.Bundle;
+import android.os.storage.VolumeInfo;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.SparseArray;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.util.Preconditions;
+import com.android.settings.Utils;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.deviceinfo.StorageProfileFragment;
+import com.android.settingslib.drawer.SettingsDrawerActivity;
+
+/**
+ * Defines a {@link PreferenceController} which handles a single profile of the primary user.
+ */
+public class UserProfileController extends PreferenceController implements
+        StorageAsyncLoader.ResultHandler {
+    private static final String PREFERENCE_KEY_BASE = "pref_profile_";
+    private StorageItemPreferenceAlternate mStoragePreference;
+    private UserInfo mUser;
+    private final int mPreferenceOrder;
+
+    public UserProfileController(Context context, UserInfo info, int preferenceOrder) {
+        super(context);
+        mUser = Preconditions.checkNotNull(info);
+        mPreferenceOrder = preferenceOrder;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREFERENCE_KEY_BASE + mUser.id;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mStoragePreference = new StorageItemPreferenceAlternate(mContext);
+        mStoragePreference.setOrder(mPreferenceOrder);
+        mStoragePreference.setKey(PREFERENCE_KEY_BASE + mUser.id);
+        mStoragePreference.setTitle(mUser.name);
+        screen.addPreference(mStoragePreference);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (preference != null && mStoragePreference == preference) {
+            Bundle args = new Bundle(2);
+            args.putInt(StorageProfileFragment.USER_ID_EXTRA, mUser.id);
+            args.putString(VolumeInfo.EXTRA_VOLUME_ID, VolumeInfo.ID_PRIVATE_INTERNAL);
+            Intent intent = Utils.onBuildStartFragmentIntent(mContext,
+                    StorageProfileFragment.class.getName(), args, null, 0,
+                    mUser.name, false, MetricsProto.MetricsEvent.DEVICEINFO_STORAGE);
+            intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
+            mContext.startActivity(intent);
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public void handleResult(SparseArray<StorageAsyncLoader.AppsStorageResult> stats) {
+        Preconditions.checkNotNull(stats);
+
+        int userId = mUser.id;
+        StorageAsyncLoader.AppsStorageResult result = stats.get(userId);
+        if (result != null) {
+            setSize(result.externalStats.totalBytes);
+        }
+    }
+
+    /**
+     * Sets the size for the preference using a byte count.
+     */
+    public void setSize(long size) {
+        if (mStoragePreference != null) {
+            mStoragePreference.setStorageSize(size);
+        }
+    }
+}
diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java
index da5b84a..e66e7ce 100644
--- a/src/com/android/settings/display/ThemePreferenceController.java
+++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -19,9 +19,11 @@
 import android.app.UiModeManager;
 import android.content.Context;
 import android.content.DialogInterface.OnClickListener;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 
+import android.text.TextUtils;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
@@ -59,17 +61,18 @@
     @Override
     public void updateState(Preference preference) {
         ListPreference pref = (ListPreference) preference;
-        String[] options = mUiModeManager.getAvailableThemes();
+        String[] options = getAvailableThemes();
         for (int i = 0; i < options.length; i++) {
             options[i] = nullToDefault(options[i]);
         }
         pref.setEntries(options);
         pref.setEntryValues(options);
-        String theme = mUiModeManager.getTheme();
-        if (theme == null) {
+        String theme = getCurrentTheme();
+        if (TextUtils.isEmpty(theme)) {
             theme = mContext.getString(R.string.default_theme);
+            pref.setSummary(theme);
         }
-        pref.setValue(nullToDefault(theme));
+        pref.setValue(theme);
     }
 
     @Override
@@ -92,12 +95,22 @@
 
     @Override
     public boolean isAvailable() {
-        String[] themes = mUiModeManager.getAvailableThemes();
+        String[] themes = getAvailableThemes();
         return themes != null && themes.length > 1;
     }
 
+    @VisibleForTesting
+    String getCurrentTheme() {
+        return mUiModeManager.getTheme();
+    }
+
+    @VisibleForTesting
+    String[] getAvailableThemes() {
+        return mUiModeManager.getAvailableThemes();
+    }
+
     private String nullToDefault(String input) {
-        if (input == null) {
+        if (TextUtils.isEmpty(input)) {
             return mContext.getString(R.string.default_theme);
         }
         return input;
diff --git a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
index ef03cfb..6b72573 100644
--- a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
@@ -26,12 +26,10 @@
 
 public abstract class AdminActionPreferenceControllerBase extends PreferenceController {
 
-    private final Context mContext;
     protected final EnterprisePrivacyFeatureProvider mFeatureProvider;
 
     public AdminActionPreferenceControllerBase(Context context) {
         super(context);
-        mContext = context;
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getEnterprisePrivacyFeatureProvider(context);
     }
diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
index 5be7884..014092f 100644
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
+++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
@@ -27,6 +27,13 @@
  */
 public interface DevicePolicyManagerWrapper {
     /**
+     * Calls {@code DevicePolicyManager.getMaximumFailedPasswordsForWipe()}.
+     *
+     * @see android.app.admin.DevicePolicyManager#getMaximumFailedPasswordsForWipe
+     */
+    int getMaximumFailedPasswordsForWipe(@Nullable ComponentName admin, int userHandle);
+
+    /**
      * Calls {@code DevicePolicyManager.getDeviceOwnerComponentOnAnyUser()}.
      *
      * @see android.app.admin.DevicePolicyManager#getDeviceOwnerComponentOnAnyUser
@@ -34,11 +41,25 @@
     ComponentName getDeviceOwnerComponentOnAnyUser();
 
     /**
+     * Calls {@code DevicePolicyManager.getDeviceOwnerUserId()}.
+     *
+     * @see android.app.admin.DevicePolicyManager#getDeviceOwnerUserId
+     */
+    int getDeviceOwnerUserId();
+
+    /**
+     * Calls {@code DevicePolicyManager.getProfileOwnerAsUser()}.
+     *
+     * @see android.app.admin.DevicePolicyManager#getProfileOwnerAsUser
+     */
+    @Nullable ComponentName getProfileOwnerAsUser(final int userId);
+
+    /**
      * Calls {@code DevicePolicyManager.getDeviceOwnerNameOnAnyUser()}.
      *
      * @see android.app.admin.DevicePolicyManager#getDeviceOwnerNameOnAnyUser
      */
-    public CharSequence getDeviceOwnerOrganizationName();
+    CharSequence getDeviceOwnerOrganizationName();
 
     /**
      * Calls {@code DevicePolicyManager.getPermissionGrantState()}.
@@ -53,19 +74,19 @@
      *
      * @see android.app.admin.DevicePolicyManager#getLastSecurityLogRetrievalTime
      */
-    public long getLastSecurityLogRetrievalTime();
+    long getLastSecurityLogRetrievalTime();
 
     /**
      * Calls {@code DevicePolicyManager.getLastBugReportRequestTime()}.
      *
      * @see android.app.admin.DevicePolicyManager#getLastBugReportRequestTime
      */
-    public long getLastBugReportRequestTime();
+    long getLastBugReportRequestTime();
 
     /**
      * Calls {@code DevicePolicyManager.getLastNetworkLogRetrievalTime()}.
      *
      * @see android.app.admin.DevicePolicyManager#getLastNetworkLogRetrievalTime
      */
-    public long getLastNetworkLogRetrievalTime();
+    long getLastNetworkLogRetrievalTime();
 }
diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
index 6e162a8..210faec 100644
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
+++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
@@ -28,11 +28,26 @@
     }
 
     @Override
+    public int getMaximumFailedPasswordsForWipe(@Nullable ComponentName admin, int userHandle) {
+        return mDpm.getMaximumFailedPasswordsForWipe(admin, userHandle);
+    }
+
+    @Override
     public ComponentName getDeviceOwnerComponentOnAnyUser() {
         return mDpm.getDeviceOwnerComponentOnAnyUser();
     }
 
     @Override
+    public int getDeviceOwnerUserId() {
+        return mDpm.getDeviceOwnerUserId();
+    }
+
+    @Override
+    public @Nullable ComponentName getProfileOwnerAsUser(final int userId) {
+        return mDpm.getProfileOwnerAsUser(userId);
+    }
+
+    @Override
     public CharSequence getDeviceOwnerOrganizationName() {
         return mDpm.getDeviceOwnerOrganizationName();
     }
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
index 91ad119..79b12e6 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
@@ -74,4 +74,16 @@
      * Returns whether the Device Owner set a recommended global HTTP proxy.
      */
     boolean isGlobalHttpProxySet();
+
+    /**
+     * Returns the number of failed login attempts that the Device Owner allows before the entire
+     * device is wiped, or zero if no such limit is set.
+     */
+    int getMaximumFailedPasswordsBeforeWipeInPrimaryUser();
+
+    /**
+     * Returns the number of failed login attempts that the Profile Owner allows before the current
+     * user's managed profile (if any) is wiped, or zero if no such limit is set.
+     */
+    int getMaximumFailedPasswordsBeforeWipeInManagedProfile();
 }
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index bb5412b..645a1f5 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.enterprise;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -70,12 +71,12 @@
                 return userInfo.id;
             }
         }
-        return -1;
+        return UserHandle.USER_NULL;
     }
 
     @Override
     public boolean isInCompMode() {
-        return hasDeviceOwner() && getManagedProfileUserId() != -1;
+        return hasDeviceOwner() && getManagedProfileUserId() != UserHandle.USER_NULL;
     }
 
     @Override
@@ -124,7 +125,7 @@
     @Override
     public boolean isAlwaysOnVpnSetInManagedProfile() {
         final int managedProfileUserId = getManagedProfileUserId();
-        return managedProfileUserId != -1 &&
+        return managedProfileUserId != UserHandle.USER_NULL &&
                 VpnUtils.isAlwaysOnVpnSet(mCm, managedProfileUserId);
     }
 
@@ -133,6 +134,28 @@
         return mCm.getGlobalProxy() != null;
     }
 
+    @Override
+    public int getMaximumFailedPasswordsBeforeWipeInPrimaryUser() {
+        final ComponentName deviceOwner = mDpm.getDeviceOwnerComponentOnAnyUser();
+        if (deviceOwner == null) {
+            return 0;
+        }
+        return mDpm.getMaximumFailedPasswordsForWipe(deviceOwner, mDpm.getDeviceOwnerUserId());
+    }
+
+    @Override
+    public int getMaximumFailedPasswordsBeforeWipeInManagedProfile() {
+        final int userId = getManagedProfileUserId();
+        if (userId == UserHandle.USER_NULL) {
+            return 0;
+        }
+        final ComponentName profileOwner = mDpm.getProfileOwnerAsUser(userId);
+        if (profileOwner == null) {
+            return 0;
+        }
+        return mDpm.getMaximumFailedPasswordsForWipe(profileOwner, userId);
+    }
+
     protected static class EnterprisePrivacySpan extends ClickableSpan {
         private final Context mContext;
 
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index 75d3b10..821b7ff 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -63,6 +63,8 @@
         controllers.add(new AlwaysOnVpnPrimaryUserPreferenceController(context));
         controllers.add(new AlwaysOnVpnManagedProfilePreferenceController(context));
         controllers.add(new GlobalHttpProxyPreferenceController(context));
+        controllers.add(new FailedPasswordWipePrimaryUserPreferenceController(context));
+        controllers.add(new FailedPasswordWipeManagedProfilePreferenceController(context));
         return controllers;
     }
 
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
new file mode 100644
index 0000000..2eac0a9
--- /dev/null
+++ b/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.settings.enterprise;
+
+import android.content.Context;
+
+import com.android.settings.R;
+
+public class FailedPasswordWipeManagedProfilePreferenceController
+        extends FailedPasswordWipePreferenceControllerBase {
+
+    private static final String KEY_FAILED_PASSWORD_WIPE_MANAGED_PROFILE
+            = "failed_password_wipe_managed_profile";
+
+    public FailedPasswordWipeManagedProfilePreferenceController(Context context) {
+        super(context, R.plurals.enterprise_privacy_failed_password_wipe_work);
+    }
+
+    @Override
+    protected int getMaximumFailedPasswordsBeforeWipe() {
+        return mFeatureProvider.getMaximumFailedPasswordsBeforeWipeInManagedProfile();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_FAILED_PASSWORD_WIPE_MANAGED_PROFILE;
+    }
+}
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
new file mode 100644
index 0000000..7cdd8da
--- /dev/null
+++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+
+public abstract class FailedPasswordWipePreferenceControllerBase extends PreferenceController {
+
+    private final int mStringResourceId;
+    protected final EnterprisePrivacyFeatureProvider mFeatureProvider;
+
+    public FailedPasswordWipePreferenceControllerBase(Context context, int stringResourceId) {
+        super(context);
+        mStringResourceId = stringResourceId;
+        mFeatureProvider = FeatureFactory.getFactory(context)
+                .getEnterprisePrivacyFeatureProvider(context);
+    }
+
+    protected abstract int getMaximumFailedPasswordsBeforeWipe();
+
+    @Override
+    public void updateState(Preference preference) {
+        final int failedPasswordsBeforeWipe = getMaximumFailedPasswordsBeforeWipe();
+        if (failedPasswordsBeforeWipe == 0) {
+            preference.setVisible(false);
+        } else {
+            preference.setVisible(true);
+            preference.setTitle(mContext.getResources().getQuantityString(
+                    mStringResourceId, failedPasswordsBeforeWipe, failedPasswordsBeforeWipe));
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+}
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePrimaryUserPreferenceController.java b/src/com/android/settings/enterprise/FailedPasswordWipePrimaryUserPreferenceController.java
new file mode 100644
index 0000000..91bdf9b
--- /dev/null
+++ b/src/com/android/settings/enterprise/FailedPasswordWipePrimaryUserPreferenceController.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.settings.enterprise;
+
+import android.content.Context;
+
+import com.android.settings.R;
+
+public class FailedPasswordWipePrimaryUserPreferenceController
+        extends FailedPasswordWipePreferenceControllerBase {
+
+    private static final String KEY_FAILED_PASSWORD_WIPE_PRIMARY_USER
+            = "failed_password_wipe_primary_user";
+
+    public FailedPasswordWipePrimaryUserPreferenceController(Context context) {
+        super(context, R.plurals.enterprise_privacy_failed_password_wipe_device);
+    }
+
+    @Override
+    protected int getMaximumFailedPasswordsBeforeWipe() {
+        return mFeatureProvider.getMaximumFailedPasswordsBeforeWipeInPrimaryUser();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_FAILED_PASSWORD_WIPE_PRIMARY_USER;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
index 1a349f7..a1fe849 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
@@ -60,7 +60,9 @@
         view.itemView.setClickable(true);
         view.setDividerAllowedAbove(true);
         ((TextView) view.findViewById(R.id.charge)).setText(mBatteryInfo.batteryPercentString);
-        ((TextView) view.findViewById(R.id.estimation)).setText(mBatteryInfo.remainingLabel);
+        ((TextView) view.findViewById(R.id.estimation)).setText(
+                mBatteryInfo.remainingLabel != null ?
+                        mBatteryInfo.remainingLabel : mBatteryInfo.statusLabel);
         UsageView usageView = (UsageView) view.findViewById(R.id.battery_usage);
         usageView.findViewById(R.id.label_group).setAlpha(.7f);
         mBatteryInfo.bindHistory(usageView);
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index b067edf..fe7ef6e 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -59,7 +59,7 @@
     }
 
     public void setPercent(double percentOfTotal) {
-        mProgress = Utils.formatPercentage((int) (percentOfTotal + 0.5));
+        mProgress = Utils.formatPercentage(percentOfTotal, true);
         notifyChanged();
     }
 
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
index 826ec09..fc96340 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -71,9 +71,11 @@
 
         mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_GRAPH);
         mUsageListGroup = (PreferenceGroup) findPreference(KEY_BATTERY_USAGE_LIST);
-        mPowerUsageFeatureProvider = FeatureFactory.getFactory(getContext())
-                .getPowerUsageFeatureProvider(getContext());
-        mPackageManager = getContext().getPackageManager();
+
+        final Context context = getContext();
+        mPowerUsageFeatureProvider = FeatureFactory.getFactory(context)
+                .getPowerUsageFeatureProvider(context);
+        mPackageManager = context.getPackageManager();
     }
 
     @Override
@@ -137,9 +139,9 @@
             return UsageType.USER;
         } else if (drainType == DrainType.CELL) {
             return UsageType.CELL;
-        } else if (uid == Process.SYSTEM_UID || uid == Process.ROOT_UID) {
+        } else if (mPowerUsageFeatureProvider.isTypeSystem(sipper)) {
             return UsageType.SYSTEM;
-        } else if (mPowerUsageFeatureProvider.isTypeService(sipper.mPackages)) {
+        } else if (mPowerUsageFeatureProvider.isTypeService(sipper)) {
             return UsageType.SERVICE;
         } else {
             return UsageType.APP;
diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java
index 3d27d22..0236a30 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageBase.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java
@@ -101,27 +101,6 @@
         }
     }
 
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        MenuItem refresh = menu.add(0, MENU_STATS_REFRESH, 0, R.string.menu_stats_refresh)
-                .setIcon(com.android.internal.R.drawable.ic_menu_refresh)
-                .setAlphabeticShortcut('r');
-        refresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
-                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-    }
-
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_STATS_REFRESH:
-                mStatsHelper.clearStats();
-                refreshStats();
-                mHandler.removeMessages(MSG_REFRESH_STATS);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
     protected void refreshStats() {
         mStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, mUm.getUserProfiles());
     }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 154a901..1598011 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -54,13 +54,13 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
-import com.android.settings.WirelessSettings;
 import com.android.settings.applications.AppHeaderController;
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.location.LocationSettings;
+import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.wifi.WifiSettings;
@@ -571,7 +571,7 @@
                         R.string.bluetooth_settings, null, null, 0);
                 break;
             case ACTION_WIRELESS_SETTINGS:
-                sa.startPreferencePanel(this, WirelessSettings.class.getName(), null,
+                sa.startPreferencePanel(this, NetworkDashboardFragment.class.getName(), null,
                         R.string.radio_controls_title, null, null, 0);
                 break;
             case ACTION_APP_DETAILS:
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index 4bcdc92..7cb6c00 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -17,33 +17,44 @@
 package com.android.settings.fuelgauge;
 
 import android.content.Intent;
+import com.android.internal.os.BatterySipper;
 
 /**
  * Feature Provider used in power usage
  */
 public interface PowerUsageFeatureProvider {
-  /**
-   * Check whether location setting is enabled
-   */
-  boolean isLocationSettingEnabled(String[] packages);
+    /**
+     * Check whether location setting is enabled
+     */
+    boolean isLocationSettingEnabled(String[] packages);
 
-  /**
-   * Check whether additional battery info feature is enabled.
-   */
-  boolean isAdditionalBatteryInfoEnabled();
+    /**
+     * Check whether additional battery info feature is enabled.
+     */
+    boolean isAdditionalBatteryInfoEnabled();
 
-  /**
-   * Gets an {@link Intent} to show additional battery info.
-   */
-  Intent getAdditionalBatteryInfoIntent();
+    /**
+     * Gets an {@link Intent} to show additional battery info.
+     */
+    Intent getAdditionalBatteryInfoIntent();
 
-  /**
-   * Check whether advanced ui is enabled
-   */
-  boolean isAdvancedUiEnabled();
+    /**
+     * Check whether advanced ui is enabled
+     */
+    boolean isAdvancedUiEnabled();
 
-  /**
-   * Check whether it is type service
-   */
-  boolean isTypeService(String[] packages);
+    /**
+     * Check whether it is type service
+     */
+    boolean isTypeService(BatterySipper sipper);
+
+    /**
+     * Check whether it is type system
+     */
+    boolean isTypeSystem(BatterySipper sipper);
+
+    /**
+     * Check whether the toggle for power accounting is enabled
+     */
+    boolean isPowerAccountingToggleEnabled();
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index 6442945..b8c40fd 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -16,9 +16,49 @@
 
 package com.android.settings.fuelgauge;
 
+import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Process;
+import com.android.internal.os.BatterySipper;
+import com.android.internal.util.ArrayUtils;
 
 public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider {
+
+    private static final String PACKAGE_CALENDAR_PROVIDER = "com.android.providers.calendar";
+    private static final String PACKAGE_MEDIA_PROVIDER = "com.android.providers.media";
+    private static final String[] PACKAGES_SYSTEM = {PACKAGE_MEDIA_PROVIDER,
+            PACKAGE_CALENDAR_PROVIDER};
+
+    protected PackageManager mPackageManager;
+
+    public PowerUsageFeatureProviderImpl(Context context) {
+        mPackageManager = context.getPackageManager();
+    }
+
+    @Override
+    public boolean isTypeService(BatterySipper sipper) {
+        return false;
+    }
+
+    @Override
+    public boolean isTypeSystem(BatterySipper sipper) {
+        final int uid = sipper.uidObj == null ? -1 : sipper.getUid();
+        sipper.mPackages = mPackageManager.getPackagesForUid(uid);
+        // Classify all the sippers to type system if the range of uid is 0...FIRST_APPLICATION_UID
+        if (uid >= Process.ROOT_UID && uid < Process.FIRST_APPLICATION_UID) {
+            return true;
+        } else if (sipper.mPackages != null) {
+            for (final String packageName : sipper.mPackages) {
+                if (ArrayUtils.contains(PACKAGES_SYSTEM, packageName)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     @Override
     public boolean isLocationSettingEnabled(String[] packages) {
         return false;
@@ -40,7 +80,7 @@
     }
 
     @Override
-    public boolean isTypeService(String[] packages) {
+    public boolean isPowerAccountingToggleEnabled() {
         return false;
     }
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 75787d5..55fcaf8 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.fuelgauge;
 
+import android.annotation.StringRes;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -52,6 +53,7 @@
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.applications.ManageApplications;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.display.AutoBrightnessPreferenceController;
 import com.android.settings.display.TimeoutPreferenceController;
@@ -71,31 +73,47 @@
  */
 public class PowerUsageSummary extends PowerUsageBase {
 
-    private static final boolean DEBUG = false;
-
-    private static final boolean USE_FAKE_DATA = false;
-
     static final String TAG = "PowerUsageSummary";
 
+    private static final boolean DEBUG = false;
+    private static final boolean USE_FAKE_DATA = false;
     private static final String KEY_APP_LIST = "app_list";
     private static final String KEY_BATTERY_HEADER = "battery_header";
 
-    private static final int MENU_STATS_TYPE = Menu.FIRST;
-    private static final int MENU_HIGH_POWER_APPS = Menu.FIRST + 3;
-    @VisibleForTesting
-    static final int MENU_ADDITIONAL_BATTERY_INFO = Menu.FIRST + 4;
-    private static final int MENU_HELP = Menu.FIRST + 5;
-
-    private LayoutPreference mBatteryLayoutPref;
-    private PreferenceGroup mAppListGroup;
-
-    private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
-
     private static final int MIN_POWER_THRESHOLD_MILLI_AMP = 5;
     private static final int MAX_ITEMS_TO_LIST = USE_FAKE_DATA ? 30 : 10;
     private static final int MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP = 10;
     private static final int SECONDS_IN_HOUR = 60 * 60;
 
+    private static final String KEY_SCREEN_USAGE = "screen_usage";
+    private static final String KEY_SCREEN_CONSUMPTION = "screen_consumption";
+    private static final String KEY_CELLULAR_NETWORK = "cellular_network";
+
+
+    private static final int MENU_STATS_TYPE = Menu.FIRST;
+    @VisibleForTesting
+    static final int MENU_HIGH_POWER_APPS = Menu.FIRST + 3;
+    @VisibleForTesting
+    static final int MENU_ADDITIONAL_BATTERY_INFO = Menu.FIRST + 4;
+    @VisibleForTesting
+    static final int MENU_TOGGLE_APPS = Menu.FIRST + 5;
+    private static final int MENU_HELP = Menu.FIRST + 6;
+
+    @VisibleForTesting
+    boolean mShowAllApps = false;
+    @VisibleForTesting
+    Preference mScreenUsagePref;
+    @VisibleForTesting
+    Preference mScreenConsumptionPref;
+    @VisibleForTesting
+    Preference mCellularNetworkPref;
+    @VisibleForTesting
+    PowerUsageFeatureProvider mPowerFeatureProvider;
+
+    private LayoutPreference mBatteryLayoutPref;
+    private PreferenceGroup mAppListGroup;
+    private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -103,6 +121,11 @@
 
         mBatteryLayoutPref = (LayoutPreference) findPreference(KEY_BATTERY_HEADER);
         mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
+        mScreenUsagePref = findPreference(KEY_SCREEN_USAGE);
+        mScreenConsumptionPref = findPreference(KEY_SCREEN_CONSUMPTION);
+        mCellularNetworkPref = findPreference(KEY_CELLULAR_NETWORK);
+
+        initFeatureProvider();
     }
 
     @Override
@@ -175,13 +198,15 @@
 
         menu.add(Menu.NONE, MENU_HIGH_POWER_APPS, Menu.NONE, R.string.high_power_apps);
 
-        PowerUsageFeatureProvider powerUsageFeatureProvider =
-                FeatureFactory.getFactory(getContext()).getPowerUsageFeatureProvider(getContext());
-        if (powerUsageFeatureProvider != null &&
-                powerUsageFeatureProvider.isAdditionalBatteryInfoEnabled()) {
+        if (mPowerFeatureProvider.isAdditionalBatteryInfoEnabled()) {
             menu.add(Menu.NONE, MENU_ADDITIONAL_BATTERY_INFO,
                     Menu.NONE, R.string.additional_battery_info);
         }
+        if (mPowerFeatureProvider.isPowerAccountingToggleEnabled()) {
+            menu.add(Menu.NONE, MENU_TOGGLE_APPS, Menu.NONE,
+                    mShowAllApps ? R.string.hide_extra_apps : R.string.show_all_apps);
+        }
+
         super.onCreateOptionsMenu(menu, inflater);
     }
 
@@ -193,6 +218,10 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         final SettingsActivity sa = (SettingsActivity) getActivity();
+        final Context context = getContext();
+        final MetricsFeatureProvider metricsFeatureProvider =
+                FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+
         switch (item.getItemId()) {
             case MENU_STATS_TYPE:
                 if (mStatsType == BatteryStats.STATS_SINCE_CHARGED) {
@@ -208,11 +237,22 @@
                         HighPowerApplicationsActivity.class.getName());
                 sa.startPreferencePanel(this, ManageApplications.class.getName(), args,
                         R.string.high_power_apps, null, null, 0);
+                metricsFeatureProvider.action(context,
+                        MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_OPTIMIZATION);
                 return true;
             case MENU_ADDITIONAL_BATTERY_INFO:
                 startActivity(FeatureFactory.getFactory(getContext())
                         .getPowerUsageFeatureProvider(getContext())
                         .getAdditionalBatteryInfoIntent());
+                metricsFeatureProvider.action(context,
+                        MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_USAGE_ALERTS);
+                return true;
+            case MENU_TOGGLE_APPS:
+                mShowAllApps = !mShowAllApps;
+                item.setTitle(mShowAllApps ? R.string.hide_extra_apps : R.string.show_all_apps);
+                metricsFeatureProvider.action(context,
+                        MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE, mShowAllApps);
+                refreshStats();
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -372,15 +412,18 @@
         context.getTheme().resolveAttribute(android.R.attr.colorControlNormal, value, true);
         final int colorControl = context.getColor(value.resourceId);
         final String usedTime = context.getString(R.string.battery_used_for);
+        final int dischargeAmount = USE_FAKE_DATA ? 5000
+                : stats != null ? stats.getDischargeAmount(mStatsType) : 0;
+
+        updateScreenPreference(dischargeAmount);
+        updateCellularPreference(dischargeAmount);
 
         if (averagePower >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP || USE_FAKE_DATA) {
             final List<BatterySipper> usageList = getCoalescedUsageList(
                     USE_FAKE_DATA ? getFakeStats() : mStatsHelper.getUsageList());
 
-            final double hiddenPowerMah = removeHiddenBatterySippers(usageList);
+            double hiddenPowerMah = mShowAllApps ? 0 : removeHiddenBatterySippers(usageList);
 
-            final int dischargeAmount = USE_FAKE_DATA ? 5000
-                    : stats != null ? stats.getDischargeAmount(mStatsType) : 0;
             final int numSippers = usageList.size();
             for (int i = 0; i < numSippers; i++) {
                 final BatterySipper sipper = usageList.get(i);
@@ -391,7 +434,7 @@
 
                 // With deduction in totalPower, percentOfTotal is higher because it adds the part
                 // used in screen, system, etc
-                final double percentOfTotal =
+                final double percentOfTotal = totalPower == 0 ? 0 :
                         ((sipper.totalPowerMah / totalPower) * dischargeAmount);
 
                 if (((int) (percentOfTotal + .5)) < 1) {
@@ -467,27 +510,76 @@
     }
 
     @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 int dischargeAmount) {
+        final BatterySipper sipper = findBatterySipperByType(
+                mStatsHelper.getUsageList(), DrainType.SCREEN);
+        final Context context = getContext();
+        final double totalPowerMah = sipper != null ? sipper.totalPowerMah : 0;
+        final long usageTimeMs = sipper != null ? sipper.usageTimeMs : 0;
+        final double percentOfTotal = calculatePercentage(totalPowerMah, dischargeAmount);
+
+        mScreenUsagePref.setSummary(getString(R.string.battery_used_for,
+                Utils.formatElapsedTime(context, usageTimeMs, false)));
+        mScreenConsumptionPref.setSummary(getString(R.string.battery_overall_usage,
+                Utils.formatPercentage(percentOfTotal, true)));
+    }
+
+    @VisibleForTesting
+    void updateCellularPreference(final int dischargeAmount) {
+        final BatterySipper sipper = findBatterySipperByType(
+                mStatsHelper.getUsageList(), DrainType.CELL);
+        final double totalPowerMah = sipper != null ? sipper.totalPowerMah : 0;
+        final double percentOfTotal = calculatePercentage(totalPowerMah, dischargeAmount);
+        mCellularNetworkPref.setSummary(getString(R.string.battery_overall_usage,
+                Utils.formatPercentage(percentOfTotal, true)));
+    }
+
+    @VisibleForTesting
     void updateHeaderPreference(BatteryInfo info) {
+        final Context context = getContext();
+        if (context == null) {
+            return;
+        }
         final BatteryMeterView batteryView = (BatteryMeterView) mBatteryLayoutPref
                 .findViewById(R.id.battery_header_icon);
         final TextView timeText = (TextView) mBatteryLayoutPref.findViewById(R.id.time);
         final TextView summary1 = (TextView) mBatteryLayoutPref.findViewById(R.id.summary1);
         final TextView summary2 = (TextView) mBatteryLayoutPref.findViewById(R.id.summary2);
-        final int visible = info.mBatteryLevel != 100 ? View.VISIBLE : View.INVISIBLE;
+        final int visible = info.remainingTimeUs != 0 ? View.VISIBLE : View.INVISIBLE;
+        final int summaryResId = info.mDischarging ?
+                R.string.estimated_time_left : R.string.estimated_charging_time_left;
 
         if (info.remainingTimeUs != 0) {
-            timeText.setText(Utils.formatElapsedTime(getContext(),
-                    info.remainingTimeUs / 1000, false));
+            timeText.setText(Utils.formatElapsedTime(context, info.remainingTimeUs / 1000, false));
         } else {
-            timeText.setText(info.remainingLabel != null ?
-                    info.remainingLabel : info.batteryPercentString);
+            timeText.setText(info.statusLabel);
         }
+
+        summary1.setText(summaryResId);
         summary1.setVisibility(visible);
         summary2.setVisibility(visible);
         batteryView.setBatteryInfo(info.mBatteryLevel);
     }
 
     @VisibleForTesting
+    double calculatePercentage(double powerUsage, double dischargeAmount) {
+        final double totalPower = mStatsHelper.getTotalPower();
+        return totalPower == 0 ? 0 :
+                ((powerUsage / totalPower) * dischargeAmount);
+    }
+
+    @VisibleForTesting
     void setUsageSummary(Preference preference, String usedTimePrefix, long usageTimeMs) {
         // Only show summary when usage time is longer than one minute
         if (usageTimeMs >= DateUtils.MINUTE_IN_MILLIS) {
@@ -499,12 +591,12 @@
     @VisibleForTesting
     boolean shouldHideSipper(BatterySipper sipper) {
         final DrainType drainType = sipper.drainType;
-        final int uid = sipper.getUid();
 
         return drainType == DrainType.IDLE || drainType == DrainType.CELL
-                || drainType == DrainType.SCREEN || uid == Process.ROOT_UID
-                || uid == Process.SYSTEM_UID
-                || (sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP;
+                || drainType == DrainType.SCREEN || drainType == DrainType.BLUETOOTH
+                || (sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP
+                || mPowerFeatureProvider.isTypeService(sipper)
+                || mPowerFeatureProvider.isTypeSystem(sipper);
     }
 
     @VisibleForTesting
@@ -540,6 +632,13 @@
         mBatteryLayoutPref = layoutPreference;
     }
 
+    @VisibleForTesting
+    void initFeatureProvider() {
+        final Context context = getContext();
+        mPowerFeatureProvider = FeatureFactory.getFactory(context)
+                .getPowerUsageFeatureProvider(context);
+    }
+
     private static List<BatterySipper> getFakeStats() {
         ArrayList<BatterySipper> stats = new ArrayList<>();
         float use = 5;
diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java
index f457320..1d82720 100644
--- a/src/com/android/settings/gestures/AssistGestureSettings.java
+++ b/src/com/android/settings/gestures/AssistGestureSettings.java
@@ -22,6 +22,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new AssistGesturePreferenceController(context, getLifecycle()));
+        controllers.add(new AssistGesturePreferenceController(context, lifecycle));
         return controllers;
     }
 
@@ -69,6 +75,11 @@
                     sir.xmlResId = R.xml.assist_gesture_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
 }
 
diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
index 9251f0b..b17341a 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
@@ -22,6 +22,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new DoubleTapPowerPreferenceController(context, getLifecycle()));
+        controllers.add(new DoubleTapPowerPreferenceController(context, lifecycle));
         return controllers;
     }
 
@@ -69,5 +75,10 @@
                     sir.xmlResId = R.xml.double_tap_power_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
 }
diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
index f374f9e..a215dae 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
@@ -24,6 +24,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -53,8 +54,13 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new DoubleTapScreenPreferenceController(context, getLifecycle(),
+        controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle,
                 new AmbientDisplayConfiguration(context), UserHandle.myUserId()));
         return controllers;
     }
@@ -72,5 +78,10 @@
                     sir.xmlResId = R.xml.double_tap_screen_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
 }
diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
index 5f5b873..bee9474 100644
--- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
+++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
@@ -22,6 +22,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new DoubleTwistPreferenceController(context, getLifecycle()));
+        controllers.add(new DoubleTwistPreferenceController(context, lifecycle));
         return controllers;
     }
 
@@ -69,5 +75,11 @@
                     sir.xmlResId = R.xml.double_twist_gesture_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
+
 }
diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java
deleted file mode 100644
index 8c038ff..0000000
--- a/src/com/android/settings/gestures/GestureSettings.java
+++ /dev/null
@@ -1,148 +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.gestures;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.SearchIndexableResource;
-import android.support.v7.preference.Preference;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Top level fragment for gesture settings.
- * This will create individual switch preference for each gesture and handle updates when each
- * preference is updated
- */
-public class GestureSettings extends DashboardFragment {
-
-    private static final String TAG = "GestureSettings";
-    private List<GesturePreference> mPreferences;
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.gesture_settings;
-    }
-
-    @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final AmbientDisplayConfiguration ambientConfig = new AmbientDisplayConfiguration(context);
-        final List<PreferenceController> controllers = new ArrayList<>();
-        final Lifecycle lifecycle = getLifecycle();
-        controllers.add(new AssistGesturePreferenceController(context, lifecycle));
-        controllers.add(new SwipeToNotificationPreferenceController(context, lifecycle));
-        controllers.add(new DoubleTapPowerPreferenceController(context, lifecycle));
-        controllers.add(new DoubleTwistPreferenceController(context, lifecycle));
-        controllers.add(new PickupGesturePreferenceController(
-                context, lifecycle, ambientConfig, UserHandle.myUserId()));
-        controllers.add(new DoubleTapScreenPreferenceController(
-                context, lifecycle, ambientConfig, UserHandle.myUserId()));
-        return controllers;
-    }
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        super.onCreatePreferences(savedInstanceState, rootKey);
-        mPreferences = new ArrayList();
-        addPreferenceToTrackingList(AssistGesturePreferenceController.class);
-        addPreferenceToTrackingList(SwipeToNotificationPreferenceController.class);
-        addPreferenceToTrackingList(DoubleTapScreenPreferenceController.class);
-        addPreferenceToTrackingList(DoubleTwistPreferenceController.class);
-        addPreferenceToTrackingList(PickupGesturePreferenceController.class);
-        addPreferenceToTrackingList(DoubleTapPowerPreferenceController.class);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        View view = super.onCreateView(inflater, container, savedInstanceState);
-        RecyclerView listview = getListView();
-        listview.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
-                    for (GesturePreference pref : mPreferences) {
-                        pref.setScrolling(true);
-                    }
-                } else if (newState == RecyclerView.SCROLL_STATE_IDLE) {
-                    for (GesturePreference pref : mPreferences) {
-                        pref.setScrolling(false);
-                    }
-                }
-            }
-
-            @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-            }
-        });
-        return view;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        for (GesturePreference preference : mPreferences) {
-            preference.onViewVisible();
-        }
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        for (GesturePreference preference : mPreferences) {
-            preference.onViewInvisible();
-        }
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    protected int getHelpResource() {
-        return R.string.help_url_gestures;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.SETTINGS_GESTURES;
-    }
-
-    private <T extends PreferenceController> void addPreferenceToTrackingList(Class<T> clazz) {
-        final PreferenceController controller = getPreferenceController(clazz);
-        final Preference preference = findPreference(controller.getPreferenceKey());
-        if (preference != null && preference instanceof GesturePreference) {
-            mPreferences.add((GesturePreference) preference);
-        }
-    }
-}
diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java
index 08e61fa..e4d12f2 100644
--- a/src/com/android/settings/gestures/PickupGestureSettings.java
+++ b/src/com/android/settings/gestures/PickupGestureSettings.java
@@ -24,6 +24,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -53,8 +54,13 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new PickupGesturePreferenceController(context, getLifecycle(),
+        controllers.add(new PickupGesturePreferenceController(context, lifecycle,
                 new AmbientDisplayConfiguration(context), UserHandle.myUserId()));
         return controllers;
     }
@@ -72,6 +78,11 @@
                     sir.xmlResId = R.xml.pick_up_gesture_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
 
 }
diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java
index 155412c..d948e55 100644
--- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java
+++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java
@@ -22,6 +22,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new SwipeToNotificationPreferenceController(context, getLifecycle()));
+        controllers.add(new SwipeToNotificationPreferenceController(context, lifecycle));
         return controllers;
     }
 
@@ -69,5 +75,10 @@
                     sir.xmlResId = R.xml.swipe_to_notification_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
 }
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
deleted file mode 100644
index 121af98..0000000
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.inputmethod;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.hardware.input.InputDeviceIdentifier;
-import android.speech.tts.TtsEngines;
-import android.support.v7.preference.Preference;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.Settings.KeyboardLayoutPickerActivity;
-import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.language.PhoneLanguagePreferenceController;
-import com.android.settings.language.TtsPreferenceController;
-import com.android.settings.language.UserDictionaryPreferenceController;
-import com.android.settings.localepicker.LocaleFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @deprecated New features should use {@code InputAndGestureSettings} and
- * {@code LanguageAndRegionSettings} instead.
- */
-@Deprecated
-public class InputMethodAndLanguageSettings extends DashboardFragment
-        implements KeyboardLayoutDialogFragment.OnSetupKeyboardLayoutsListener, Indexable {
-
-    private static final String TAG = "IMEAndLanguageSetting";
-
-    private Intent mIntentWaitingForResult;
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.INPUTMETHOD_LANGUAGE;
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.language_settings;
-    }
-
-    @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final GameControllerPreferenceController gameControllerPreferenceController =
-                new GameControllerPreferenceController(context);
-        getLifecycle().addObserver(gameControllerPreferenceController);
-
-        final List<PreferenceController> list = new ArrayList<>();
-        list.add(gameControllerPreferenceController);
-        list.add(new PhoneLanguagePreferenceController(context));
-        list.add(new SpellCheckerPreferenceController(context));
-        list.add(new UserDictionaryPreferenceController(context));
-        list.add(new TtsPreferenceController(context, new TtsEngines(context)));
-        return list;
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        // Input Method stuff
-        if (Utils.isMonkeyRunning()) {
-            return false;
-        }
-        return super.onPreferenceTreeClick(preference);
-    }
-
-    private void showKeyboardLayoutDialog(InputDeviceIdentifier inputDeviceIdentifier) {
-        KeyboardLayoutDialogFragment fragment = (KeyboardLayoutDialogFragment)
-                getFragmentManager().findFragmentByTag("keyboardLayout");
-        if (fragment == null) {
-            fragment = new KeyboardLayoutDialogFragment(inputDeviceIdentifier);
-            fragment.setTargetFragment(this, 0);
-            fragment.show(getActivity().getFragmentManager(), "keyboardLayout");
-        }
-    }
-
-    @Override
-    public void onSetupKeyboardLayouts(InputDeviceIdentifier inputDeviceIdentifier) {
-        final Intent intent = new Intent(Intent.ACTION_MAIN);
-        intent.setClass(getActivity(), KeyboardLayoutPickerActivity.class);
-        intent.putExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER,
-                inputDeviceIdentifier);
-        mIntentWaitingForResult = intent;
-        startActivityForResult(intent, 0);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (mIntentWaitingForResult != null) {
-            InputDeviceIdentifier inputDeviceIdentifier = mIntentWaitingForResult
-                    .getParcelableExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER);
-            mIntentWaitingForResult = null;
-            showKeyboardLayoutDialog(inputDeviceIdentifier);
-        }
-    }
-
-    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
-        private final SummaryLoader mSummaryLoader;
-        private LocaleFeatureProvider mLocaleFeatureProvider;
-
-        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
-            mSummaryLoader = summaryLoader;
-            mLocaleFeatureProvider = FeatureFactory.getFactory(context).getLocaleFeatureProvider();
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            if (listening) {
-                String localeNames = mLocaleFeatureProvider.getLocaleNames();
-                mSummaryLoader.setSummary(this, localeNames);
-            }
-        }
-    }
-
-    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
-            = new SummaryLoader.SummaryProviderFactory() {
-        @Override
-        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                SummaryLoader summaryLoader) {
-            return new SummaryProvider(activity, summaryLoader);
-        }
-    };
-
-    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-        @Override
-        public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-            List<SearchIndexableRaw> indexables = new ArrayList<>();
-
-            final String screenTitle = context.getString(R.string.language_keyboard_settings_title);
-
-            // Locale picker.
-            final PhoneLanguagePreferenceController mLanguagePrefController =
-                    new PhoneLanguagePreferenceController(context);
-            if (mLanguagePrefController.isAvailable()) {
-                String localeNames = FeatureFactory.getFactory(context).getLocaleFeatureProvider()
-                        .getLocaleNames();
-                SearchIndexableRaw indexable = new SearchIndexableRaw(context);
-                indexable.key = mLanguagePrefController.getPreferenceKey();
-                indexable.title = context.getString(R.string.phone_language);
-                indexable.summaryOn = localeNames;
-                indexable.summaryOff = localeNames;
-                indexable.screenTitle = screenTitle;
-                indexables.add(indexable);
-            }
-
-            // Spell checker.
-            SearchIndexableRaw indexable = new SearchIndexableRaw(context);
-            indexable.key = SpellCheckerPreferenceController.KEY_SPELL_CHECKERS;
-            indexable.title = context.getString(R.string.spellcheckers_settings_title);
-            indexable.screenTitle = screenTitle;
-            indexable.keywords = context.getString(R.string.keywords_spell_checker);
-            indexables.add(indexable);
-
-            // User dictionary.
-            if (UserDictionaryList.getUserDictionaryLocalesSet(context) != null) {
-                indexable = new SearchIndexableRaw(context);
-                indexable.key = "user_dict_settings";
-                indexable.title = context.getString(R.string.user_dict_settings_title);
-                indexable.screenTitle = screenTitle;
-                indexables.add(indexable);
-            }
-
-            // Keyboard settings.
-            indexable = new SearchIndexableRaw(context);
-            indexable.key = "keyboard_settings";
-            indexable.title = context.getString(R.string.keyboard_settings_category);
-            indexable.screenTitle = screenTitle;
-            indexable.keywords = context.getString(R.string.keywords_keyboard_and_ime);
-            indexables.add(indexable);
-
-            if (!PhysicalKeyboardFragment.getPhysicalFullKeyboards().isEmpty()) {
-                // Hard keyboard category.
-                indexable = new SearchIndexableRaw(context);
-                indexable.key = "builtin_keyboard_settings";
-                indexable.title = context.getString(R.string.builtin_keyboard_settings_title);
-                indexable.screenTitle = screenTitle;
-                indexables.add(indexable);
-            }
-
-            // Text-to-speech.
-            TtsEngines ttsEngines = new TtsEngines(context);
-            if (!ttsEngines.getEngines().isEmpty()) {
-                indexable = new SearchIndexableRaw(context);
-                indexable.key = "tts_settings";
-                indexable.title = context.getString(R.string.tts_settings_title);
-                indexable.screenTitle = screenTitle;
-                indexable.keywords = context.getString(R.string.keywords_text_to_speech_output);
-                indexables.add(indexable);
-            }
-
-            // Pointer settings.
-            indexable = new SearchIndexableRaw(context);
-            indexable.key = "pointer_settings_category";
-            indexable.title = context.getString(R.string.pointer_settings_category);
-            indexable.screenTitle = screenTitle;
-            indexables.add(indexable);
-
-            indexable = new SearchIndexableRaw(context);
-            indexable.key = "pointer_speed";
-            indexable.title = context.getString(R.string.pointer_speed);
-            indexable.screenTitle = screenTitle;
-            indexables.add(indexable);
-
-            // Game controllers.
-            if (!new GameControllerPreferenceController(context).isAvailable()) {
-                indexable = new SearchIndexableRaw(context);
-                indexable.key = GameControllerPreferenceController.PREF_KEY;
-                indexable.title = context.getString(R.string.vibrate_input_devices);
-                indexable.summaryOn = context.getString(R.string.vibrate_input_devices_summary);
-                indexable.summaryOff = context.getString(R.string.vibrate_input_devices_summary);
-                indexable.screenTitle = screenTitle;
-                indexables.add(indexable);
-            }
-
-            return indexables;
-        }
-    };
-}
diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java
new file mode 100644
index 0000000..766ee47
--- /dev/null
+++ b/src/com/android/settings/location/LocationPreferenceController.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Secure;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+
+public class LocationPreferenceController extends PreferenceController {
+
+    private static final String KEY_LOCATION = "location";
+    private Preference mPreference;
+
+    public LocationPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(KEY_LOCATION);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        preference.setSummary(getLocationSummary(mContext));
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_LOCATION;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    public void updateSummary() {
+        updateState(mPreference);
+    }
+
+    public static String getLocationSummary(Context context) {
+        int mode = Secure.getInt(context.getContentResolver(),
+            Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
+        if (mode != Secure.LOCATION_MODE_OFF) {
+            return context.getString(R.string.location_on_summary,
+                context.getString(getLocationString(mode)));
+        }
+        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;
+    }
+
+}
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 72d54b8..2185f50 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -364,23 +364,9 @@
         return R.string.help_url_location_access;
     }
 
-    private static int getLocationString(int mode) {
-        switch (mode) {
-            case android.provider.Settings.Secure.LOCATION_MODE_OFF:
-                return R.string.location_mode_location_off_title;
-            case android.provider.Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
-                return R.string.location_mode_sensors_only_title;
-            case android.provider.Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
-                return R.string.location_mode_battery_saving_title;
-            case android.provider.Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
-                return R.string.location_mode_high_accuracy_title;
-        }
-        return 0;
-    }
-
     @Override
     public void onModeChanged(int mode, boolean restricted) {
-        int modeDescription = getLocationString(mode);
+        int modeDescription = LocationPreferenceController.getLocationString(mode);
         if (modeDescription != 0) {
             mLocationMode.setSummary(modeDescription);
         }
@@ -489,15 +475,8 @@
         @Override
         public void setListening(boolean listening) {
             if (listening) {
-                int mode = Settings.Secure.getInt(mContext.getContentResolver(),
-                        Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
-                if (mode != Settings.Secure.LOCATION_MODE_OFF) {
-                    mSummaryLoader.setSummary(this, mContext.getString(R.string.location_on_summary,
-                            mContext.getString(getLocationString(mode))));
-                } else {
-                    mSummaryLoader.setSummary(this,
-                            mContext.getString(R.string.location_off_summary));
-                }
+                mSummaryLoader.setSummary(
+                    this, LocationPreferenceController.getLocationSummary(mContext));
             }
         }
     }
diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java
index 42b2bea..9d0878f8 100644
--- a/src/com/android/settings/network/MobilePlanPreferenceController.java
+++ b/src/com/android/settings/network/MobilePlanPreferenceController.java
@@ -29,7 +29,6 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.internal.telephony.TelephonyIntents;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
@@ -129,7 +128,7 @@
         NetworkInfo ni = mCm.getActiveNetworkInfo();
         if (mTm.hasIccCard() && (ni != null)) {
             // Check for carrier apps that can handle provisioning first
-            Intent provisioningIntent = new Intent(TelephonyIntents.ACTION_CARRIER_SETUP);
+            Intent provisioningIntent = new Intent(Intent.ACTION_CARRIER_SETUP);
             List<String> carrierPackages =
                     mTm.getCarrierPackageNamesForIntent(provisioningIntent);
             if (carrierPackages != null && !carrierPackages.isEmpty()) {
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index f52230b..6add786 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -95,7 +95,7 @@
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(airplaneModePreferenceController);
         controllers.add(mobileNetworkPreferenceController);
-        controllers.add(new TetherPreferenceController(context));
+        controllers.add(new TetherPreferenceController(context, lifecycle));
         controllers.add(vpnPreferenceController);
         controllers.add(new ProxyPreferenceController(context));
         controllers.add(mobilePlanPreferenceController);
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 236fa96..f23118a 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.os.UserHandle;
-import android.os.UserManager;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
@@ -29,15 +28,18 @@
 import com.android.settings.R;
 import com.android.settings.TetherSettings;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.core.lifecycle.LifecycleObserver;
+import com.android.settings.core.lifecycle.events.OnDestroy;
 
-import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
 import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
 import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
 
-public class TetherPreferenceController extends PreferenceController {
+public class TetherPreferenceController extends PreferenceController
+        implements LifecycleObserver, OnDestroy {
 
     private static final String KEY_TETHER_SETTINGS = "tether_settings";
 
@@ -45,7 +47,6 @@
     private final AtomicReference<BluetoothPan> mBluetoothPan;
     private final ConnectivityManager mConnectivityManager;
     private final BluetoothAdapter mBluetoothAdapter;
-    private final UserManager mUserManager;
 
     private final BluetoothProfile.ServiceListener mBtProfileServiceListener =
             new android.bluetooth.BluetoothProfile.ServiceListener() {
@@ -65,21 +66,22 @@
     TetherPreferenceController() {
         super(null);
         mAdminDisallowedTetherConfig = false;
-        mBluetoothPan = null;
+        mBluetoothPan = new AtomicReference<>();
         mConnectivityManager = null;
-        mBluetoothAdapter = null;
-        mUserManager = null;
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
     }
 
-    public TetherPreferenceController(Context context) {
+    public TetherPreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
         mBluetoothPan = new AtomicReference<>();
         mAdminDisallowedTetherConfig = checkIfRestrictionEnforced(
                 context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null;
         mConnectivityManager =
                 (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
         if (mBluetoothAdapter != null) {
             mBluetoothAdapter.getProfileProxy(context, mBtProfileServiceListener,
                     BluetoothProfile.PAN);
@@ -114,15 +116,16 @@
     }
 
     @Override
-    public void updateNonIndexableKeys(List<String> keys) {
-        if (!mUserManager.isAdminUser() || !mConnectivityManager.isTetheringSupported()) {
-            keys.add(KEY_TETHER_SETTINGS);
-        }
+    public String getPreferenceKey() {
+        return KEY_TETHER_SETTINGS;
     }
 
     @Override
-    public String getPreferenceKey() {
-        return KEY_TETHER_SETTINGS;
+    public void onDestroy() {
+        final BluetoothProfile profile = mBluetoothPan.getAndSet(null);
+        if (profile != null && mBluetoothAdapter != null) {
+            mBluetoothAdapter.closeProfileProxy(BluetoothProfile.PAN, profile);
+        }
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
diff --git a/src/com/android/settings/network/WifiCallingPreferenceController.java b/src/com/android/settings/network/WifiCallingPreferenceController.java
index b35d476..0e673fa 100644
--- a/src/com/android/settings/network/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/WifiCallingPreferenceController.java
@@ -17,7 +17,6 @@
 
 import android.content.Context;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.telephony.TelephonyManager;
 
 import com.android.ims.ImsManager;
@@ -35,13 +34,9 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        final Preference pref = screen.findPreference(KEY_WFC_SETTINGS);
-        if (pref != null) {
-            pref.setSummary(WifiCallingSettings.getWfcModeSummary(
-                    mContext, ImsManager.getWfcMode(mContext, mTm.isNetworkRoaming())));
-        }
+    public void updateState(Preference preference) {
+        preference.setSummary(WifiCallingSettings.getWfcModeSummary(
+                mContext, ImsManager.getWfcMode(mContext, mTm.isNetworkRoaming())));
     }
 
     @Override
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index 37a77f9..47de1a5 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
@@ -45,6 +46,9 @@
 
 public class PaymentSettings extends SettingsPreferenceFragment implements Indexable {
     public static final String TAG = "PaymentSettings";
+
+    static final String PAYMENT_KEY = "payment";
+
     private PaymentBackend mPaymentBackend;
 
     @Override
@@ -66,7 +70,7 @@
         if (appInfos != null && appInfos.size() > 0) {
             NfcPaymentPreference preference =
                     new NfcPaymentPreference(getPrefContext(), mPaymentBackend);
-            preference.setKey("payment");
+            preference.setKey(PAYMENT_KEY);
             screen.addPreference(preference);
             NfcForegroundPreference foreground = new NfcForegroundPreference(getPrefContext(),
                     mPaymentBackend);
@@ -148,11 +152,21 @@
 
                 // Add fragment title
                 SearchIndexableRaw data = new SearchIndexableRaw(context);
+                data.key = PAYMENT_KEY;
                 data.title = res.getString(R.string.nfc_payment_settings_title);
                 data.screenTitle = res.getString(R.string.nfc_payment_settings_title);
                 data.keywords = res.getString(R.string.keywords_payment_settings);
                 result.add(data);
                 return result;
             }
+
+            @Override
+            public List<String> getNonIndexableKeys(Context context) {
+                final PackageManager pm = context.getPackageManager();
+                if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) return null;
+                final List<String> nonVisibleKeys = new ArrayList<String>();
+                nonVisibleKeys.add(PAYMENT_KEY);
+                return nonVisibleKeys;
+            }
     };
 }
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index d0f6f2e..34745a7 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -161,12 +161,12 @@
         } else {
             for (NotificationChannelGroup group : mChannelGroupList) {
                 PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext());
-                if (group.getName() == null) {
+                if (group.getId() == null) {
                     groupCategory.setTitle(mChannelGroupList.size() > 1
                             ? R.string.notification_channels_other
                             : R.string.notification_channels);
                 } else {
-                    groupCategory.setTitle(group.getName());
+                    groupCategory.setTitle(getNotificationGroupLabel(group));
                 }
                 groupCategory.setKey(group.getId());
                 groupCategory.setOrderingAsAdded(true);
@@ -182,12 +182,13 @@
                             getPrefContext());
                     channelPref.setDisabledByAdmin(mSuspendedAppsAdmin);
                     channelPref.setKey(channel.getId());
-                    channelPref.setTitle(channel.getName());
+                    channelPref.setTitle(getNotificationChannelLabel(channel));
                     channelPref.setChecked(channel.getImportance() != IMPORTANCE_NONE);
+                    channelPref.setMultiLine(true);
 
                     if (channel.isDeleted()) {
-                        channelPref.setTitle(
-                                getString(R.string.deleted_channel_name, channel.getName()));
+                        channelPref.setTitle(getString(R.string.deleted_channel_name,
+                                getNotificationChannelLabel(channel)));
                         channelPref.setEnabled(false);
                     } else {
                         channelPref.setSummary(getImportanceSummary(channel.getImportance()));
@@ -274,8 +275,10 @@
             if (left.isDeleted() != right.isDeleted()) {
                 return Boolean.compare(left.isDeleted(), right.isDeleted());
             }
-            if (!Objects.equals(left.getName(), right.getName())) {
-                return sCollator.compare(left.getName().toString(), right.getName().toString());
+            CharSequence leftName = getNotificationChannelLabel(left);
+            CharSequence rightName = getNotificationChannelLabel(right);
+            if (!Objects.equals(leftName, rightName)) {
+                return sCollator.compare(leftName.toString(), rightName.toString());
             }
             return left.getId().compareTo(right.getId());
         }
@@ -293,10 +296,11 @@
                     } else if (right.getId() == null && left.getId() != null) {
                         return -1;
                     }
+                    CharSequence leftName = getNotificationGroupLabel(left);
+                    CharSequence rightName = getNotificationGroupLabel(right);
                     // sort rest of the groups by name
-                    if (!Objects.equals(left.getName(), right.getName())) {
-                        return sCollator.compare(left.getName().toString(),
-                                right.getName().toString());
+                    if (!Objects.equals(leftName, rightName)) {
+                        return sCollator.compare(leftName.toString(), rightName.toString());
                     }
                     return left.getId().compareTo(right.getId());
                 }
diff --git a/src/com/android/settings/notification/CastPreferenceController.java b/src/com/android/settings/notification/CastPreferenceController.java
index 7de5c48..0156dfd 100644
--- a/src/com/android/settings/notification/CastPreferenceController.java
+++ b/src/com/android/settings/notification/CastPreferenceController.java
@@ -17,11 +17,8 @@
 package com.android.settings.notification;
 
 import android.content.Context;
-import android.support.v7.preference.Preference;
 
-import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import java.util.List;
 
 public class CastPreferenceController extends PreferenceController {
 
@@ -41,11 +38,4 @@
         return true;
     }
 
-    @Override
-    public void updateNonIndexableKeys(List<String> keys) {
-        if (!Utils.isVoiceCapable(mContext)) {
-            keys.add(KEY_WIFI_DISPLAY);
-        }
-    }
-
 }
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index ea450f4..7be98c1 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -130,7 +130,7 @@
                     .getApplicationFeatureProvider(activity)
                     .newAppHeaderController(this /* fragment */, null /* appHeader */)
                     .setIcon(mAppRow.icon)
-                    .setLabel(mChannel.getName())
+                    .setLabel(getNotificationChannelLabel(mChannel))
                     .setSummary(mAppRow.label)
                     .setPackageName(mAppRow.pkg)
                     .setUid(mAppRow.uid)
diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
index 1154493..8f26ed8 100644
--- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
+++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
@@ -48,7 +48,7 @@
     EmergencyBroadcastPreferenceController(Context context, AccountRestrictionHelper helper) {
         super(context);
         mHelper = helper;
-        mUserManager = UserManager.get(context);
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         mPm = mContext.getPackageManager();
         // Enable link to CMAS app settings depending on the value in config.xml.
         mCellBroadcastAppLinkEnabled = isCellBroadcastAppLinkEnabled();
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 2a2185d..d201d60 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -155,8 +155,4 @@
         public boolean showBadge;
         public int userId;
     }
-
-    public static class ChannelRow extends AppRow {
-        public NotificationChannel channel;
-    }
 }
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index 80d249f..38de27e 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -25,6 +25,7 @@
 
 import android.app.Notification;
 import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
@@ -248,4 +249,25 @@
                 return getContext().getString(R.string.notification_importance_high);
         }
     }
+
+    protected CharSequence getNotificationGroupLabel(NotificationChannelGroup group) {
+        return getLabel(group.getName(), group.getNameResId());
+    }
+
+    protected CharSequence getNotificationChannelLabel(NotificationChannel channel) {
+        return getLabel(channel.getName(), channel.getNameResId());
+    }
+
+    private CharSequence getLabel(CharSequence name, int nameResId) {
+        if (!TextUtils.isEmpty(name)) {
+            return name;
+        }
+        try {
+            ApplicationInfo info = mPm.getApplicationInfoAsUser(mAppRow.pkg, 0, mAppRow.userId);
+            return mPm.getText(mAppRow.pkg, nameResId, info);
+        } catch (NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }
diff --git a/src/com/android/settings/notification/NotificationVolumePreferenceController.java b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
index e4759d7..40448a4 100644
--- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java
+++ b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
@@ -37,7 +37,7 @@
 
     @VisibleForTesting
     NotificationVolumePreferenceController(Context context,
-        VolumeSeekBarPreference.Callback callback, Lifecycle lifecycle, AudioHelper helper) {
+        Callback callback, Lifecycle lifecycle, AudioHelper helper) {
         super(context, callback, lifecycle);
         mHelper = helper;
     }
diff --git a/src/com/android/settings/notification/OtherSoundSettings.java b/src/com/android/settings/notification/OtherSoundSettings.java
deleted file mode 100644
index 5c409d3..0000000
--- a/src/com/android/settings/notification/OtherSoundSettings.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-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.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/* This class has been deprecated  Modifications to Other Sounds settings should be made in
-   {@link SoundSettings } instead. */
-@Deprecated
-public class OtherSoundSettings extends DashboardFragment {
-    private static final String TAG = "OtherSoundSettings";
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.NOTIFICATION_OTHER_SOUND;
-    }
-
-    @Override
-    protected int getHelpResource() {
-        return R.string.help_uri_other_sounds;
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.other_sound_settings;
-    }
-
-    @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
-        Lifecycle lifecycle = getLifecycle();
-        controllers.add(new DialPadTonePreferenceController(context, this, lifecycle));
-        controllers.add(new ScreenLockSoundPreferenceController(context, this, lifecycle));
-        controllers.add(new ChargingSoundPreferenceController(context, this, lifecycle));
-        controllers.add(new DockingSoundPreferenceController(context, this, lifecycle));
-        controllers.add(new TouchSoundPreferenceController(context, this, lifecycle));
-        controllers.add(new VibrateOnTouchPreferenceController(context, this, lifecycle));
-        controllers.add(new DockAudioMediaPreferenceController(context, this, lifecycle));
-        controllers.add(new BootSoundPreferenceController(context));
-        controllers.add(new EmergencyTonePreferenceController(context, this, lifecycle));
-        return controllers;
-    }
-
-    // === Indexing ===
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-
-        public List<SearchIndexableResource> getXmlResourcesToIndex(
-                Context context, boolean enabled) {
-            final SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = R.xml.other_sound_settings;
-            return Arrays.asList(sir);
-        }
-
-        public List<String> getNonIndexableKeys(Context context) {
-            final ArrayList<String> rt = new ArrayList<String>();
-            new DialPadTonePreferenceController(context, null /* SettingsPreferenceFragment */,
-                null /* Lifecycle */).updateNonIndexableKeys(rt);
-            new ScreenLockSoundPreferenceController(context, null /* SettingsPreferenceFragment */,
-                null /* Lifecycle */).updateNonIndexableKeys(rt);
-            new ChargingSoundPreferenceController(context, null /* SettingsPreferenceFragment */,
-                null /* Lifecycle */).updateNonIndexableKeys(rt);
-            new DockingSoundPreferenceController(context, null /* SettingsPreferenceFragment */,
-                null /* Lifecycle */).updateNonIndexableKeys(rt);
-            new TouchSoundPreferenceController(context, null /* SettingsPreferenceFragment */,
-                null /* Lifecycle */).updateNonIndexableKeys(rt);
-            new VibrateOnTouchPreferenceController(context, null /* SettingsPreferenceFragment */,
-                null /* Lifecycle */).updateNonIndexableKeys(rt);
-            new DockAudioMediaPreferenceController(context, null /* SettingsPreferenceFragment */,
-                null /* Lifecycle */).updateNonIndexableKeys(rt);
-            new BootSoundPreferenceController(context).updateNonIndexableKeys(rt);
-            new EmergencyTonePreferenceController(context, null /* SettingsPreferenceFragment */,
-                null /* Lifecycle */).updateNonIndexableKeys(rt);
-            return rt;
-        }
-    };
-}
diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java
index d126fc4..64d65bb 100644
--- a/src/com/android/settings/notification/SettingPrefController.java
+++ b/src/com/android/settings/notification/SettingPrefController.java
@@ -71,13 +71,6 @@
     }
 
     @Override
-    public void updateNonIndexableKeys(List<String> keys) {
-        if (!mPreference.isApplicable(mContext)) {
-            keys.add(mPreference.getKey());
-        }
-    }
-
-    @Override
     public void updateState(Preference preference) {
         mPreference.update(mContext);
     }
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index c7b0384..df60573 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -33,7 +33,6 @@
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 
 import java.util.ArrayList;
@@ -51,7 +50,6 @@
     private final VolumePreferenceCallback mVolumeCallback = new VolumePreferenceCallback();
     private final H mHandler = new H();
 
-    private WorkSoundPreferenceController mWorkSoundController;
     private RingtonePreference mRequestPreference;
 
     @Override
@@ -100,51 +98,12 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        return mDashboardFeatureProvider.isEnabled()
-                ? R.xml.ia_sound_settings : R.xml.sound_settings;
+        return R.xml.ia_sound_settings;
     }
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
-        Lifecycle lifecycle = getLifecycle();
-        if (!mDashboardFeatureProvider.isEnabled()) {
-            controllers.add(new CastPreferenceController(context));
-        }
-        controllers.add(new ZenModePreferenceController(context));
-        controllers.add(new EmergencyBroadcastPreferenceController(context));
-        controllers.add(new VibrateWhenRingPreferenceController(context));
-
-        // === Volumes ===
-        controllers.add(new AlarmVolumePreferenceController(context, mVolumeCallback, lifecycle));
-        controllers.add(new MediaVolumePreferenceController(context, mVolumeCallback, lifecycle));
-        controllers.add(
-                new NotificationVolumePreferenceController(context, mVolumeCallback, lifecycle));
-        controllers.add(new RingVolumePreferenceController(context, mVolumeCallback, lifecycle));
-
-        // === Phone & notification ringtone ===
-        controllers.add(new PhoneRingtonePreferenceController(context));
-        controllers.add(new AlarmRingtonePreferenceController(context));
-        controllers.add(new NotificationRingtonePreferenceController(context));
-
-        // === Work Sound Settings ===
-        mWorkSoundController = new WorkSoundPreferenceController(context, this, getLifecycle());
-        controllers.add(mWorkSoundController);
-
-        // === Other Sound Settings ===
-        if (mDashboardFeatureProvider.isEnabled()) {
-            controllers.add(new DialPadTonePreferenceController(context, this, lifecycle));
-            controllers.add(new ScreenLockSoundPreferenceController(context, this, lifecycle));
-            controllers.add(new ChargingSoundPreferenceController(context, this, lifecycle));
-            controllers.add(new DockingSoundPreferenceController(context, this, lifecycle));
-            controllers.add(new TouchSoundPreferenceController(context, this, lifecycle));
-            controllers.add(new VibrateOnTouchPreferenceController(context, this, lifecycle));
-            controllers.add(new DockAudioMediaPreferenceController(context, this, lifecycle));
-            controllers.add(new BootSoundPreferenceController(context));
-            controllers.add(new EmergencyTonePreferenceController(context, this, lifecycle));
-        }
-
-        return controllers;
+        return buildPreferenceControllers(context, this, mVolumeCallback, getLifecycle());
     }
 
     @Override
@@ -192,8 +151,6 @@
         }
     }
 
-    ;
-
     // === Callbacks ===
 
 
@@ -214,6 +171,43 @@
         }
     }
 
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            SoundSettings fragment, VolumeSeekBarPreference.Callback callback,
+            Lifecycle lifecycle) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new ZenModePreferenceController(context));
+        controllers.add(new EmergencyBroadcastPreferenceController(context));
+        controllers.add(new VibrateWhenRingPreferenceController(context));
+
+        // === Volumes ===
+        controllers.add(new AlarmVolumePreferenceController(context, callback, lifecycle));
+        controllers.add(new MediaVolumePreferenceController(context, callback, lifecycle));
+        controllers.add(
+                new NotificationVolumePreferenceController(context, callback, lifecycle));
+        controllers.add(new RingVolumePreferenceController(context, callback, lifecycle));
+
+        // === Phone & notification ringtone ===
+        controllers.add(new PhoneRingtonePreferenceController(context));
+        controllers.add(new AlarmRingtonePreferenceController(context));
+        controllers.add(new NotificationRingtonePreferenceController(context));
+
+        // === Work Sound Settings ===
+        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));
+
+        return controllers;
+    }
+
     // === Indexing ===
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
@@ -222,61 +216,24 @@
                 public List<SearchIndexableResource> getXmlResourcesToIndex(
                         Context context, boolean enabled) {
                     final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.sound_settings;
+                    sir.xmlResId = R.xml.ia_sound_settings;
                     return Arrays.asList(sir);
                 }
 
-                public List<String> getNonIndexableKeys(Context context) {
-                    final ArrayList<String> rt = new ArrayList<String>();
-                    new NotificationVolumePreferenceController(
-                            context, null /* Callback */,
-                            null /* Lifecycle */).updateNonIndexableKeys(rt);
-                    new RingVolumePreferenceController(
-                            context, null /* Callback */,
-                            null /* Lifecycle */).updateNonIndexableKeys(rt);
-                    new PhoneRingtonePreferenceController(context).updateNonIndexableKeys(rt);
-                    new VibrateWhenRingPreferenceController(context).updateNonIndexableKeys(rt);
-                    new EmergencyBroadcastPreferenceController(context).updateNonIndexableKeys(rt);
-                    if (FeatureFactory.getFactory(context).getDashboardFeatureProvider(context)
-                            .isEnabled()) {
-                        new DialPadTonePreferenceController(context,
-                                null /* SettingsPreferenceFragment */,
-                                null /* Lifecycle */).updateNonIndexableKeys(rt);
-                        new ScreenLockSoundPreferenceController(context,
-                                null /* SettingsPreferenceFragment */,
-                                null /* Lifecycle */).updateNonIndexableKeys(rt);
-                        new ChargingSoundPreferenceController(context,
-                                null /* SettingsPreferenceFragment */,
-                                null /* Lifecycle */).updateNonIndexableKeys(rt);
-                        new DockingSoundPreferenceController(context,
-                                null /* SettingsPreferenceFragment */,
-                                null /* Lifecycle */).updateNonIndexableKeys(rt);
-                        new TouchSoundPreferenceController(context, null /*
-                        SettingsPreferenceFragment */,
-                                null /* Lifecycle */).updateNonIndexableKeys(rt);
-                        new VibrateOnTouchPreferenceController(context,
-                                null /* SettingsPreferenceFragment */,
-                                null /* Lifecycle */).updateNonIndexableKeys(rt);
-                        new DockAudioMediaPreferenceController(context,
-                                null /* SettingsPreferenceFragment */,
-                                null /* Lifecycle */).updateNonIndexableKeys(rt);
-                        new BootSoundPreferenceController(context).updateNonIndexableKeys(rt);
-                        new EmergencyTonePreferenceController(context,
-                                null /* SettingsPreferenceFragment */,
-                                null /* Lifecycle */).updateNonIndexableKeys(rt);
-                    } else {
-                        new CastPreferenceController(context).updateNonIndexableKeys(rt);
-                    }
-
-                    return rt;
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* fragment */,
+                            null /* callback */, null /* lifecycle */);
                 }
             };
 
     // === Work Sound Settings ===
 
     void enableWorkSync() {
-        if (mWorkSoundController != null) {
-            mWorkSoundController.enableWorkSync();
+        final WorkSoundPreferenceController workSoundController =
+                getPreferenceController(WorkSoundPreferenceController.class);
+        if (workSoundController != null) {
+            workSoundController.enableWorkSync();
         }
     }
 }
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index 5ab1d29..8a51961 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -59,15 +59,18 @@
     }
 
     public VolumeSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs, defStyleAttr, 0);
+        super(context, attrs, defStyleAttr);
+        setLayoutResource(R.layout.preference_volume_slider);
     }
 
     public VolumeSeekBarPreference(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
+        super(context, attrs);
+        setLayoutResource(R.layout.preference_volume_slider);
     }
 
     public VolumeSeekBarPreference(Context context) {
-        this(context, null);
+        super(context);
+        setLayoutResource(R.layout.preference_volume_slider);
     }
 
     public void setStream(int stream) {
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index 11adddb..dcd2b51 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -24,13 +24,13 @@
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.search2.SearchFeatureProvider;
-import com.android.settings.suggestions.SuggestionFeatureProvider;
 
 /**
  * Abstract class for creating feature controllers. Allows OEM implementations to define their own
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index 56e554d..e72ee03 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -30,6 +30,8 @@
 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;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
@@ -43,8 +45,6 @@
 import com.android.settings.search2.SearchFeatureProviderImpl;
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.security.SecurityFeatureProviderImpl;
-import com.android.settings.suggestions.SuggestionFeatureProvider;
-import com.android.settings.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
 
 /**
@@ -80,7 +80,7 @@
     @Override
     public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
         if (mPowerUsageFeatureProvider == null) {
-            mPowerUsageFeatureProvider = new PowerUsageFeatureProviderImpl();
+            mPowerUsageFeatureProvider = new PowerUsageFeatureProviderImpl(context);
         }
         return mPowerUsageFeatureProvider;
     }
diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java
index bb518ba..38c8d40 100644
--- a/src/com/android/settings/search/BaseSearchIndexProvider.java
+++ b/src/com/android/settings/search/BaseSearchIndexProvider.java
@@ -18,8 +18,10 @@
 
 import android.content.Context;
 import android.provider.SearchIndexableResource;
+
 import com.android.settings.core.PreferenceController;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -28,7 +30,7 @@
  */
 public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider {
 
-    private static final List<String> EMPTY_LIST = Collections.<String>emptyList();
+    private static final List<String> EMPTY_LIST = Collections.emptyList();
 
     public BaseSearchIndexProvider() {
     }
@@ -45,7 +47,16 @@
 
     @Override
     public List<String> getNonIndexableKeys(Context context) {
-        return EMPTY_LIST;
+        final List<PreferenceController> controllers = getPreferenceControllers(context);
+        if (controllers != null && !controllers.isEmpty()) {
+            final List<String> nonIndexableKeys = new ArrayList<>();
+            for (PreferenceController controller : controllers) {
+                controller.updateNonIndexableKeys(nonIndexableKeys);
+            }
+            return nonIndexableKeys;
+        } else {
+            return EMPTY_LIST;
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
index 0cc2688..c91f381 100644
--- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java
+++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
@@ -49,9 +49,9 @@
 import com.android.internal.content.PackageMonitor;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
-import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.inputmethod.PhysicalKeyboardFragment;
 import com.android.settings.inputmethod.VirtualKeyboardFragment;
+import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.print.PrintSettingsFragment;
 
 import java.util.ArrayList;
@@ -423,7 +423,7 @@
             mContentResolver = context.getContentResolver();
             mInputMethodServices.clear();
             // Build index of {@link UserDictionary}.
-            buildIndex(InputMethodAndLanguageSettings.class, true /* rebuild */);
+            buildIndex(LanguageAndInputSettings.class, true /* rebuild */);
             // Build index of IMEs.
             buildIndex(VirtualKeyboardFragment.class, true /* rebuild */);
             buildIndex(AvailableVirtualKeyboardFragment.class, true /* rebuild */);
@@ -478,7 +478,7 @@
                 buildIndex(VirtualKeyboardFragment.class, true /* rebuild */);
                 buildIndex(AvailableVirtualKeyboardFragment.class, true /* rebuild */);
             } else if (UserDictionary.Words.CONTENT_URI.equals(uri)) {
-                buildIndex(InputMethodAndLanguageSettings.class, true /* rebuild */);
+                buildIndex(LanguageAndInputSettings.class, true /* rebuild */);
             }
         }
     }
diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index b79a7f4..b146a22 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -707,7 +707,7 @@
     }
 
     private String buildSearchMatchStringForColumns(String query, String[] columnNames) {
-        final String value = query + "*";
+        final String value = (query != null ? query.trim() : "") + "*";
         StringBuilder sb = new StringBuilder();
         final int count = columnNames.length;
         for (int n = 0; n < count; n++) {
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 4f660bf..e0fb876 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -26,9 +26,8 @@
 import com.android.settings.ScreenPinningSettings;
 import com.android.settings.SecuritySettings;
 import com.android.settings.WallpaperTypeSettings;
-import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
-import com.android.settings.accounts.AccountSettings;
+import com.android.settings.accounts.UserAndAccountDashboardFragment;
 import com.android.settings.applications.AdvancedAppSettings;
 import com.android.settings.applications.SpecialAccessSettings;
 import com.android.settings.bluetooth.BluetoothSettings;
@@ -41,12 +40,17 @@
 import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
-import com.android.settings.gestures.GestureSettings;
-import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
+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.PickupGestureSettings;
+import com.android.settings.gestures.SwipeToNotificationSettings;
+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.notification.ConfigureNotificationSettings;
-import com.android.settings.notification.OtherSoundSettings;
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.ZenModeAutomationSettings;
 import com.android.settings.notification.ZenModePrioritySettings;
@@ -118,8 +122,8 @@
         sRankMap.put(DataUsageSummary.class.getName(), RANK_DATA_USAGE);
         sRankMap.put(DataUsageMeteredSettings.class.getName(), RANK_DATA_USAGE);
 
-        // Other wireless settinfs
-        sRankMap.put(WirelessSettings.class.getName(), RANK_WIRELESS);
+        // Other wireless settings
+        sRankMap.put(NetworkDashboardFragment.class.getName(), RANK_WIRELESS);
 
         // Display
         sRankMap.put(DisplaySettings.class.getName(), RANK_DISPLAY);
@@ -133,7 +137,6 @@
 
         // Notifications
         sRankMap.put(ConfigureNotificationSettings.class.getName(), RANK_NOTIFICATIONS);
-        sRankMap.put(OtherSoundSettings.class.getName(), RANK_NOTIFICATIONS);
         sRankMap.put(ZenModeSettings.class.getName(), RANK_NOTIFICATIONS);
         sRankMap.put(ZenModePrioritySettings.class.getName(), RANK_NOTIFICATIONS);
         sRankMap.put(ZenModeAutomationSettings.class.getName(), RANK_NOTIFICATIONS);
@@ -154,7 +157,12 @@
         sRankMap.put(UserSettings.class.getName(), RANK_USERS);
 
         // Gestures
-        sRankMap.put(GestureSettings.class.getName(), RANK_GESTURE);
+        sRankMap.put(AssistGestureSettings.class.getName(), RANK_GESTURE);
+        sRankMap.put(DoubleTapPowerSettings.class.getName(), RANK_GESTURE);
+        sRankMap.put(DoubleTapScreenSettings.class.getName(), RANK_GESTURE);
+        sRankMap.put(DoubleTwistGestureSettings.class.getName(), RANK_GESTURE);
+        sRankMap.put(PickupGestureSettings.class.getName(), RANK_GESTURE);
+        sRankMap.put(SwipeToNotificationSettings.class.getName(), RANK_GESTURE);
 
         // Location
         sRankMap.put(LocationSettings.class.getName(), RANK_LOCATION);
@@ -166,10 +174,10 @@
         sRankMap.put(ScreenPinningSettings.class.getName(), RANK_SECURITY);
 
         // Accounts
-        sRankMap.put(AccountSettings.class.getName(), RANK_ACCOUNT);
+        sRankMap.put(UserAndAccountDashboardFragment.class.getName(), RANK_ACCOUNT);
 
         // IMEs
-        sRankMap.put(InputMethodAndLanguageSettings.class.getName(), RANK_IME);
+        sRankMap.put(LanguageAndInputSettings.class.getName(), RANK_IME);
 
         // Privacy
         sRankMap.put(PrivacySettings.class.getName(), RANK_PRIVACY);
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 700ab72..362a9c4 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -24,19 +24,20 @@
 import com.android.settings.DevelopmentSettings;
 import com.android.settings.DeviceInfoSettings;
 import com.android.settings.DisplaySettings;
+import com.android.settings.EncryptionAndCredential;
 import com.android.settings.LegalSettings;
 import com.android.settings.PrivacySettings;
 import com.android.settings.R;
 import com.android.settings.ScreenPinningSettings;
 import com.android.settings.SecuritySettings;
 import com.android.settings.WallpaperTypeSettings;
-import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
-import com.android.settings.accounts.AccountSettings;
 import com.android.settings.accounts.UserAndAccountDashboardFragment;
 import com.android.settings.applications.AdvancedAppSettings;
 import com.android.settings.applications.AppAndNotificationDashboardFragment;
 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.ConnectedDeviceDashboardFragment;
@@ -54,11 +55,9 @@
 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.InputMethodAndLanguageSettings;
 import com.android.settings.inputmethod.PhysicalKeyboardFragment;
 import com.android.settings.inputmethod.VirtualKeyboardFragment;
 import com.android.settings.language.LanguageAndInputSettings;
@@ -67,7 +66,6 @@
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.nfc.PaymentSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
-import com.android.settings.notification.OtherSoundSettings;
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeSettings;
@@ -111,7 +109,6 @@
         addIndex(SimSettings.class, NO_DATA_RES_ID, R.drawable.ic_sim_sd);
         addIndex(DataUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
         addIndex(DataUsageMeteredSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
-        addIndex(WirelessSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_more);
         addIndex(ScreenZoomSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
         addIndex(DisplaySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
         addIndex(WallpaperTypeSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
@@ -120,7 +117,6 @@
         addIndex(AppAndNotificationDashboardFragment.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_applications);
         addIndex(SoundSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_sound);
-        addIndex(OtherSoundSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_sound);
         addIndex(ZenModeSettings.class,
                 R.xml.zen_mode_settings, R.drawable.ic_settings_notifications);
         addIndex(ZenModePrioritySettings.class,
@@ -133,10 +129,10 @@
         addIndex(BatterySaverSettings.class,
                 R.xml.battery_saver_settings, R.drawable.ic_settings_battery);
         addIndex(AdvancedAppSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications);
+        addIndex(ManageAssist.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications);
         addIndex(SpecialAccessSettings.class,
                 R.xml.special_access, R.drawable.ic_settings_applications);
         addIndex(UserSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_multiuser);
-        addIndex(GestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
         addIndex(AssistGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
         addIndex(PickupGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
         addIndex(DoubleTapScreenSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
@@ -148,17 +144,16 @@
         addIndex(LocationSettings.class, R.xml.location_settings, R.drawable.ic_settings_location);
         addIndex(ScanningSettings.class, R.xml.location_scanning, R.drawable.ic_settings_location);
         addIndex(SecuritySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_security);
+        addIndex(EncryptionAndCredential.class, R.xml.encryption_and_credential,
+                R.drawable.ic_settings_security);
         addIndex(ScreenPinningSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_security);
-        addIndex(AccountSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_accounts);
         addIndex(UserAndAccountDashboardFragment.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_accounts);
-        addIndex(InputMethodAndLanguageSettings.class,
-                NO_DATA_RES_ID, R.drawable.ic_settings_language);
         addIndex(VirtualKeyboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
         addIndex(AvailableVirtualKeyboardFragment.class,
                 NO_DATA_RES_ID, R.drawable.ic_settings_language);
         addIndex(PhysicalKeyboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
-        addIndex(PrivacySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup);
+        addIndex(BackupSettingsActivity.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup);
         addIndex(BackupSettingsFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup);
         addIndex(DateTimeSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_date_time);
         addIndex(AccessibilitySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_accessibility);
diff --git a/src/com/android/settings/search2/CursorToSearchResultConverter.java b/src/com/android/settings/search2/CursorToSearchResultConverter.java
index bcb2e9d..880a65b 100644
--- a/src/com/android/settings/search2/CursorToSearchResultConverter.java
+++ b/src/com/android/settings/search2/CursorToSearchResultConverter.java
@@ -220,9 +220,8 @@
     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);
-        final List<String> breadcrumbs = siteMapManager.buildBreadCrumb(mContext, screenClass,
+        return siteMapManager == null ? null : siteMapManager.buildBreadCrumb(mContext, screenClass,
                 screenTitle);
-        return breadcrumbs;
     }
 
     /** Uses the breadcrumbs to determine the offset to the base rank.
diff --git a/src/com/android/settings/search2/DatabaseResultLoader.java b/src/com/android/settings/search2/DatabaseResultLoader.java
index 854b8dd..ad1e6a9 100644
--- a/src/com/android/settings/search2/DatabaseResultLoader.java
+++ b/src/com/android/settings/search2/DatabaseResultLoader.java
@@ -20,6 +20,7 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
+import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.overlay.FeatureFactory;
@@ -27,7 +28,6 @@
 import com.android.settings.utils.AsyncLoader;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns;
@@ -91,11 +91,13 @@
 
     /**
      * Base ranks defines the best possible rank based on what the query matches.
-     * If the query matches the title, the best rank it can be is 1
-     * If the query only matches the summary, the best rank it can be is 4
-     * If the query only matches keywords or entries, the best rank it can be is 7
+     * If the query matches the prefix of the first word in the title, the best rank it can be is 1
+     * If the query matches the prefix of the other words in the title, the best rank it can be is 3
+     * If the query only matches the summary, the best rank it can be is 7
+     * If the query only matches keywords or entries, the best rank it can be is 9
+     *
      */
-    private static final int[] BASE_RANKS = {1, 4, 7};
+    private static final int[] BASE_RANKS = {1, 3, 7, 9};
 
     private final String mQueryText;
     private final Context mContext;
@@ -121,33 +123,28 @@
             return null;
         }
 
-        final List<SearchResult> primaryResults;
+        final List<SearchResult> primaryFirstWordResults;
+        final List<SearchResult> primaryMidWordResults;
         final List<SearchResult> secondaryResults;
         final List<SearchResult> tertiaryResults;
 
-        primaryResults = query(MATCH_COLUMNS_PRIMARY, BASE_RANKS[0]);
-        secondaryResults = query(MATCH_COLUMNS_SECONDARY, BASE_RANKS[1]);
-        tertiaryResults = query(MATCH_COLUMNS_TERTIARY, BASE_RANKS[2]);
+        primaryFirstWordResults = firstWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[0]);
+        primaryMidWordResults = secondaryWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[1]);
+        secondaryResults = anyWordQuery(MATCH_COLUMNS_SECONDARY, BASE_RANKS[2]);
+        tertiaryResults = anyWordQuery(MATCH_COLUMNS_TERTIARY, BASE_RANKS[3]);
 
-        final List<SearchResult> results = new ArrayList<>(primaryResults.size()
+        final List<SearchResult> results = new ArrayList<>(
+                primaryFirstWordResults.size()
+                + primaryMidWordResults.size()
                 + secondaryResults.size()
                 + tertiaryResults.size());
 
-        results.addAll(primaryResults);
+        results.addAll(primaryFirstWordResults);
+        results.addAll(primaryMidWordResults);
         results.addAll(secondaryResults);
         results.addAll(tertiaryResults);
-        return results;
-    }
 
-    private List<SearchResult> query(String[] matchColumns, int baseRank) {
-        final String whereClause = buildWhereClause(matchColumns);
-        final String[] selection = buildQuerySelection(matchColumns.length * 2);
-
-        final SQLiteDatabase database = IndexDatabaseHelper.getInstance(mContext)
-                .getReadableDatabase();
-        final Cursor resultCursor = database.query(TABLE_PREFS_INDEX, SELECT_COLUMNS, whereClause,
-                selection, null, null, null);
-        return mConverter.convertCursor(mSiteMapManager, resultCursor, baseRank);
+        return removeDuplicates(results);
     }
 
     @Override
@@ -168,7 +165,94 @@
         return query.trim();
     }
 
-    private static String buildWhereClause(String[] matchColumns) {
+    /**
+     * 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 list of the matching results.
+     */
+    private List<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 list of the matching results.
+     */
+    private List<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 list of the matching results.
+     */
+    private List<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 list of the matching results.
+     */
+    private List<SearchResult> query(String whereClause, String[] selection, int baseRank) {
+        final SQLiteDatabase database = IndexDatabaseHelper.getInstance(mContext)
+                .getReadableDatabase();
+        final 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++) {
@@ -185,13 +269,27 @@
     }
 
     /**
+     * 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[] buildQuerySelection(int size) {
+    private String[] buildAnyWordSelection(int size) {
         String[] selection = new String[size];
         final String query = mQueryText + "%";
         final String subStringQuery = "% " + mQueryText + "%";
@@ -202,4 +300,55 @@
         }
         return selection;
     }
-}
+
+    /**
+     * Goes through the list of search results and verifies that none of the results are duplicates.
+     * A duplicate is quantified by a result with the same Title and the same non-empty Summary.
+     *
+     * The method walks through the results starting with the highest priority result. It removes
+     * the duplicates by doing the first rule that applies below:
+     * - If a result is inline, remove the intent result.
+     * - Remove the lower rank item.
+     * @param results A list of results with potential duplicates
+     * @return The list of results with duplicates removed.
+     */
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    List<SearchResult> removeDuplicates(List<SearchResult> results) {
+        SearchResult primaryResult, secondaryResult;
+
+        // We accept the O(n^2) solution because the number of results is small.
+        for (int i = results.size() - 1; i >= 0; i--) {
+            secondaryResult = results.get(i);
+
+            for (int j = i - 1; j >= 0; j--) {
+                primaryResult = results.get(j);
+                if (areDuplicateResults(primaryResult, secondaryResult)) {
+
+                    if (primaryResult.viewType != ResultPayload.PayloadType.INTENT) {
+                        // Case where both payloads are inline
+                        results.remove(i);
+                        break;
+                    } else if (secondaryResult.viewType != ResultPayload.PayloadType.INTENT) {
+                        // Case where only second result is inline
+                        results.remove(j);
+                        i--; // shift the top index to reflect the lower element being removed
+                    } else {
+                        // Case where both payloads are intent
+                        results.remove(i);
+                    }
+                }
+            }
+        }
+        return results;
+    }
+
+    /**
+     * @return True when the two {@link SearchResult SearchResults} have the same title, and the same
+     * non-empty summary.
+     */
+    private boolean areDuplicateResults(SearchResult primary, SearchResult secondary) {
+        return TextUtils.equals(primary.title, secondary.title)
+                && TextUtils.equals(primary.summary, secondary.summary)
+                && !TextUtils.isEmpty(primary.summary);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/search2/InstalledAppResultLoader.java b/src/com/android/settings/search2/InstalledAppResultLoader.java
index 80378d7..47e1f67 100644
--- a/src/com/android/settings/search2/InstalledAppResultLoader.java
+++ b/src/com/android/settings/search2/InstalledAppResultLoader.java
@@ -211,8 +211,8 @@
      */
     private int getRank(int wordDiff) {
         if (wordDiff < 6) {
-            return 3;
+            return 2;
         }
-        return 4;
+        return 3;
     }
 }
diff --git a/src/com/android/settings/search2/SearchResult.java b/src/com/android/settings/search2/SearchResult.java
index 37559aa..a82c47f 100644
--- a/src/com/android/settings/search2/SearchResult.java
+++ b/src/com/android/settings/search2/SearchResult.java
@@ -30,7 +30,7 @@
      * Defines the max rank for a search result to be considered as ranked. Results with ranks
      * higher than this have no guarantee for sorting order.
      */
-    public static final int MAX_RANK  = 9;
+    public static final int MAX_RANK  = 10;
 
     /**
      * The title of the result and main text displayed.
diff --git a/src/com/android/settings/security/SecurityFeatureProviderImpl.java b/src/com/android/settings/security/SecurityFeatureProviderImpl.java
index 72d0f81..2d782a6 100644
--- a/src/com/android/settings/security/SecurityFeatureProviderImpl.java
+++ b/src/com/android/settings/security/SecurityFeatureProviderImpl.java
@@ -22,9 +22,12 @@
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.os.Looper;
 import com.android.settings.trustagent.TrustAgentManager;
 import com.android.settings.trustagent.TrustAgentManagerImpl;
 import com.android.settingslib.drawer.DashboardCategory;
+import android.support.annotation.VisibleForTesting;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
@@ -35,6 +38,7 @@
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.drawer.TileUtils;
 
+import java.util.concurrent.Executors;
 import java.util.Map;
 
 /** Implementation for {@code SecurityFeatureProvider}. */
@@ -43,8 +47,22 @@
     private TrustAgentManager mTrustAgentManager;
 
     /** Update preferences with data from associated tiles. */
-    public void updatePreferences(Context context, PreferenceScreen preferenceScreen,
+    public void updatePreferences(final Context context, final PreferenceScreen preferenceScreen,
+            final DashboardCategory dashboardCategory) {
+        // Fetching the summary and icon from the provider introduces latency, so do this on a
+        // separate thread.
+        Executors.newSingleThreadExecutor().execute(new Runnable() {
+            @Override
+            public void run() {
+                updatePreferencesToRunOnWorkerThread(context, preferenceScreen, dashboardCategory);
+            }
+        });
+    }
+
+    @VisibleForTesting
+    void updatePreferencesToRunOnWorkerThread(Context context, PreferenceScreen preferenceScreen,
             DashboardCategory dashboardCategory) {
+
         if (preferenceScreen == null) {
             return;
         }
@@ -82,26 +100,41 @@
                         TileUtils.getIconFromUri(context, packageName, iconUri, providerMap);
                 if (icon != null) {
                     // Icon is only returned if the icon belongs to Settings or the target app.
-                    try {
-                        matchingPref.setIcon(context.getPackageManager()
-                                .getResourcesForApplication(icon.first /* package name */)
-                                        .getDrawable(icon.second /* res id */, context.getTheme()));
-                    } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) {
-                        // Intentionally ignored. If icon resources cannot be found, do not update.
-                    }
+                    // setIcon must be called on the UI thread.
+                    new Handler(Looper.getMainLooper()).post(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                matchingPref.setIcon(context.getPackageManager()
+                                        .getResourcesForApplication(icon.first /* package name */)
+                                                .getDrawable(icon.second /* res id */,
+                                                        context.getTheme()));
+                            } catch (PackageManager.NameNotFoundException
+                                    | Resources.NotFoundException e) {
+                                // Intentionally ignored. If icon resources cannot be found, do not
+                                // update.
+                            }
+                        }
+                    });
                 }
             }
             if (!TextUtils.isEmpty(summaryUri)) {
                 String summary = TileUtils.getTextFromUri(context, summaryUri, providerMap,
                         TileUtils.META_DATA_PREFERENCE_SUMMARY);
-                // Only update the summary if it has actually changed.
-                if (summary == null) {
-                    if (matchingPref.getSummary() != null) {
-                        matchingPref.setSummary(summary);
+                // setSummary must be called on UI thread.
+                new Handler(Looper.getMainLooper()).post(new Runnable() {
+                    @Override
+                    public void run() {
+                        // Only update the summary if it has actually changed.
+                        if (summary == null) {
+                            if (matchingPref.getSummary() != null) {
+                                matchingPref.setSummary(summary);
+                            }
+                        } else if (!summary.equals(matchingPref.getSummary())) {
+                            matchingPref.setSummary(summary);
+                        }
                     }
-                } else if (!summary.equals(matchingPref.getSummary())) {
-                    matchingPref.setSummary(summary);
-                }
+                });
             }
         }
     }
diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java
index 2898ce2..c4bf0da 100644
--- a/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/src/com/android/settings/system/SystemDashboardFragment.java
@@ -55,6 +55,10 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context);
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new SystemUpdatePreferenceController(context, UserManager.get(context)));
         controllers.add(new AdditionalSystemUpdatePreferenceController(context));
@@ -79,17 +83,8 @@
                 }
 
                 @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    if (!FeatureFactory.getFactory(context).getDashboardFeatureProvider(context)
-                            .isEnabled()) {
-                        return null;
-                    }
-                    final List<String> keys = new ArrayList<>();
-                    new SystemUpdatePreferenceController(context, UserManager.get(context))
-                            .updateNonIndexableKeys(keys);
-                    new AdditionalSystemUpdatePreferenceController(context)
-                            .updateNonIndexableKeys(keys);
-                    return keys;
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context);
                 }
             };
 }
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 000ccf5..c3a058a 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -27,7 +27,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
-import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -53,7 +52,6 @@
 import android.view.View.OnClickListener;
 import android.widget.SimpleAdapter;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.ChooseLockGeneric;
@@ -63,9 +61,6 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
-import com.android.settings.accounts.AddUserWhenLockedPreferenceController;
-import com.android.settings.accounts.EmergencyInfoPreferenceController;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -102,9 +97,6 @@
     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_EMERGENCY_INFO = "emergency_info";
-
-    private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENGY_INFO";
 
     private static final int MENU_REMOVE_USER = Menu.FIRST;
 
@@ -136,9 +128,6 @@
     private PreferenceGroup mUserListCategory;
     private UserPreference mMePreference;
     private DimmableIconPreference mAddUser;
-    private PreferenceGroup mLockScreenSettings;
-    private RestrictedSwitchPreference mAddUserWhenLocked;
-    private Preference mEmergencyInfoPreference;
     private int mRemovingUserId = -1;
     private int mAddedUserId = 0;
     private boolean mAddingUser;
@@ -151,8 +140,6 @@
 
     private EditUserInfoController mEditUserInfoController =
             new EditUserInfoController();
-    private EmergencyInfoPreferenceController mEnergencyInfoController;
-    private AddUserWhenLockedPreferenceController mAddUserWhenLockedController;
 
     // A place to cache the generated default avatar
     private Drawable mDefaultIconDrawable;
@@ -236,14 +223,6 @@
                 mAddUser.setTitle(R.string.user_add_user_menu);
             }
         }
-        if (showEmergencyInfoAndAddUsersWhenLock(context)) {
-            mLockScreenSettings = (PreferenceGroup) findPreference("lock_screen_settings");
-            mAddUserWhenLocked =
-                    (RestrictedSwitchPreference) findPreference("add_users_when_locked");
-            mEmergencyInfoPreference = findPreference(KEY_EMERGENCY_INFO);
-            mEnergencyInfoController = new EmergencyInfoPreferenceController(context);
-            mAddUserWhenLockedController = new AddUserWhenLockedPreferenceController(context);
-        }
         setHasOptionsMenu(true);
         IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
         filter.addAction(Intent.ACTION_USER_INFO_CHANGED);
@@ -658,20 +637,6 @@
         }
     }
 
-    @VisibleForTesting
-    boolean showEmergencyInfoAndAddUsersWhenLock(Context context) {
-        return !FeatureFactory.getFactory(context).getDashboardFeatureProvider(context).isEnabled();
-    }
-
-    private static boolean emergencyInfoActivityPresent(Context context) {
-        Intent intent = new Intent(ACTION_EDIT_EMERGENCY_INFO).setPackage("com.android.emergency");
-        List<ResolveInfo> infos = context.getPackageManager().queryIntentActivities(intent, 0);
-        if (infos == null || infos.isEmpty()) {
-            return false;
-        }
-        return true;
-    }
-
     private void removeUserNow() {
         if (mRemovingUserId == UserHandle.myUserId()) {
             removeThisUser();
@@ -903,20 +868,6 @@
             }
         }
 
-        if (showEmergencyInfoAndAddUsersWhenLock(context)) {
-            if (mAddUserWhenLockedController.isAvailable()) {
-                mLockScreenSettings.setOrder(Preference.DEFAULT_ORDER);
-                preferenceScreen.addPreference(mLockScreenSettings);
-                mAddUserWhenLockedController.updateState(mAddUserWhenLocked);
-                mAddUserWhenLocked.setOnPreferenceChangeListener(mAddUserWhenLockedController);
-            }
-
-            if (emergencyInfoActivityPresent(getContext())) {
-                mEmergencyInfoPreference.setOnPreferenceClickListener(this);
-                mEmergencyInfoPreference.setOrder(Preference.DEFAULT_ORDER);
-                preferenceScreen.addPreference(mEmergencyInfoPreference);
-            }
-        }
     }
 
     private int getMaxRealUsers() {
@@ -997,8 +948,6 @@
             } else {
                 onAddUserClicked(USER_TYPE_USER);
             }
-        } else if (mEnergencyInfoController != null) {
-            mEnergencyInfoController.handlePreferenceTreeClick(pref);
         }
         return false;
     }
@@ -1082,12 +1031,6 @@
                         data.screenTitle = res.getString(R.string.user_settings_title);
                         result.add(data);
                     }
-                    if (emergencyInfoActivityPresent(context)) {
-                        data = new SearchIndexableRaw(context);
-                        data.title = res.getString(R.string.emergency_info_title);
-                        data.screenTitle = res.getString(R.string.emergency_info_title);
-                        result.add(data);
-                    }
                     return result;
                 }
             };
diff --git a/src/com/android/settings/voice/VoiceInputListPreference.java b/src/com/android/settings/voice/VoiceInputListPreference.java
deleted file mode 100644
index ddb56d1..0000000
--- a/src/com/android/settings/voice/VoiceInputListPreference.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.android.settings.voice;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.provider.Settings;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListAdapter;
-
-import com.android.settings.AppListPreferenceWithSettings;
-import com.android.settings.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class VoiceInputListPreference extends AppListPreferenceWithSettings {
-
-    private VoiceInputHelper mHelper;
-
-    // The assist component name to restrict available voice inputs.
-    private ComponentName mAssistRestrict;
-
-    private final List<Integer> mAvailableIndexes = new ArrayList<>();
-
-    public VoiceInputListPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setDialogTitle(R.string.choose_voice_input_title);
-    }
-
-    @Override
-    protected ListAdapter createListAdapter() {
-        return new CustomAdapter(getContext(), getEntries());
-    }
-
-    @Override
-    protected boolean persistString(String value) {
-        for (int i = 0; i < mHelper.mAvailableInteractionInfos.size(); ++i) {
-            VoiceInputHelper.InteractionInfo info = mHelper.mAvailableInteractionInfos.get(i);
-            if (info.key.equals(value)) {
-                Settings.Secure.putString(getContext().getContentResolver(),
-                        Settings.Secure.VOICE_INTERACTION_SERVICE, value);
-                Settings.Secure.putString(getContext().getContentResolver(),
-                        Settings.Secure.VOICE_RECOGNITION_SERVICE,
-                        new ComponentName(info.service.packageName,
-                                info.serviceInfo.getRecognitionService())
-                                .flattenToShortString());
-                setSummary(getEntry());
-                setSettingsComponent(info.settings);
-                return true;
-            }
-        }
-
-        for (int i = 0; i < mHelper.mAvailableRecognizerInfos.size(); ++i) {
-            VoiceInputHelper.RecognizerInfo info = mHelper.mAvailableRecognizerInfos.get(i);
-            if (info.key.equals(value)) {
-                Settings.Secure.putString(getContext().getContentResolver(),
-                        Settings.Secure.VOICE_INTERACTION_SERVICE, "");
-                Settings.Secure.putString(getContext().getContentResolver(),
-                        Settings.Secure.VOICE_RECOGNITION_SERVICE, value);
-                setSummary(getEntry());
-                setSettingsComponent(info.settings);
-               return true;
-            }
-        }
-
-        setSettingsComponent(null);
-        return true;
-    }
-
-    @Override
-    public void setPackageNames(CharSequence[] packageNames, CharSequence defaultPackageName) {
-        // Skip since all entries are created from |mHelper|.
-    }
-
-    public void setAssistRestrict(ComponentName assistRestrict) {
-        mAssistRestrict = assistRestrict;
-    }
-
-    public void refreshVoiceInputs() {
-        mHelper = new VoiceInputHelper(getContext());
-        mHelper.buildUi();
-
-        final String assistKey =
-                mAssistRestrict == null ? "" : mAssistRestrict.flattenToShortString();
-
-        mAvailableIndexes.clear();
-        List<CharSequence> entries = new ArrayList<>();
-        List<CharSequence> values = new ArrayList<>();
-        for (int i = 0; i < mHelper.mAvailableInteractionInfos.size(); ++i) {
-            VoiceInputHelper.InteractionInfo info = mHelper.mAvailableInteractionInfos.get(i);
-            entries.add(info.appLabel);
-            values.add(info.key);
-
-            if (info.key.contentEquals(assistKey)) {
-                mAvailableIndexes.add(i);
-            }
-        }
-
-        final boolean assitIsService = !mAvailableIndexes.isEmpty();
-        final int serviceCount = entries.size();
-
-        for (int i = 0; i < mHelper.mAvailableRecognizerInfos.size(); ++i) {
-            VoiceInputHelper.RecognizerInfo info = mHelper.mAvailableRecognizerInfos.get(i);
-            entries.add(info.label);
-            values.add(info.key);
-            if (!assitIsService) {
-                mAvailableIndexes.add(serviceCount + i);
-            }
-        }
-        setEntries(entries.toArray(new CharSequence[entries.size()]));
-        setEntryValues(values.toArray(new CharSequence[values.size()]));
-
-        if (mHelper.mCurrentVoiceInteraction != null) {
-            setValue(mHelper.mCurrentVoiceInteraction.flattenToShortString());
-        } else if (mHelper.mCurrentRecognizer != null) {
-            setValue(mHelper.mCurrentRecognizer.flattenToShortString());
-        } else {
-            setValue(null);
-        }
-    }
-
-    public ComponentName getCurrentService() {
-        if (mHelper.mCurrentVoiceInteraction != null) {
-            return mHelper.mCurrentVoiceInteraction;
-        } else if (mHelper.mCurrentRecognizer != null) {
-            return mHelper.mCurrentRecognizer;
-        } else {
-            return null;
-        }
-    }
-
-    private class CustomAdapter extends ArrayAdapter<CharSequence> {
-
-        public CustomAdapter(Context context, CharSequence[] objects) {
-            super(context, com.android.internal.R.layout.select_dialog_singlechoice_material,
-                    android.R.id.text1, objects);
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false;
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return mAvailableIndexes.contains(position);
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            View view = super.getView(position, convertView, parent);
-            view.setEnabled(isEnabled(position));
-            return view;
-        }
-    }
-}
diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java
index 94c429b..ba3458a 100644
--- a/src/com/android/settings/widget/MasterSwitchPreference.java
+++ b/src/com/android/settings/widget/MasterSwitchPreference.java
@@ -22,6 +22,7 @@
 import android.util.AttributeSet;
 import android.widget.CompoundButton;
 import android.widget.Switch;
+import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -34,6 +35,7 @@
 
     private Switch mSwitch;
     private boolean mChecked;
+    private boolean mMultiLine;
 
     public MasterSwitchPreference(Context context, AttributeSet attrs,
             int defStyleAttr, int defStyleRes) {
@@ -74,6 +76,12 @@
                 }
             });
         }
+        if (mMultiLine) {
+            TextView textView = (TextView)holder.findViewById(android.R.id.title);
+            if (textView != null) {
+                textView.setSingleLine(false);
+            }
+        }
     }
 
     public boolean isChecked() {
@@ -97,6 +105,14 @@
         }
     }
 
+    public boolean isMultiLine() {
+        return mMultiLine;
+    }
+
+    public void setMultiLine(boolean multiLine) {
+        mMultiLine = multiLine;
+    }
+
     /**
      * If admin is not null, disables the switch.
      * Otherwise, keep it enabled.
diff --git a/src/com/android/settings/widget/PreferenceDividerDecoration.java b/src/com/android/settings/widget/PreferenceDividerDecoration.java
deleted file mode 100644
index 4466a3d..0000000
--- a/src/com/android/settings/widget/PreferenceDividerDecoration.java
+++ /dev/null
@@ -1,79 +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.widget;
-
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceGroupAdapter;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-public class PreferenceDividerDecoration extends RecyclerView.ItemDecoration {
-
-    private Drawable mDivider;
-    private int mDividerHeight;
-
-    public void setDivider(Drawable divider) {
-        if (divider != null) {
-            mDividerHeight = divider.getIntrinsicHeight();
-        } else {
-            mDividerHeight = 0;
-        }
-        mDivider = divider;
-    }
-
-    public void setDividerHeight(int dividerHeight) {
-        mDividerHeight = dividerHeight;
-    }
-
-    @Override
-    public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) {
-        if (mDivider == null) {
-            return;
-        }
-        final int childCount = parent.getChildCount();
-        final int width = parent.getWidth();
-        for (int childViewIndex = 0; childViewIndex < childCount; childViewIndex++) {
-            final View view = parent.getChildAt(childViewIndex);
-            if (shouldDrawDividerAbove(view, parent)) {
-                int top = (int) ViewCompat.getY(view);
-                mDivider.setBounds(0, top, width, top + mDividerHeight);
-                mDivider.draw(c);
-            }
-        }
-    }
-
-    private boolean shouldDrawDividerAbove(View view, RecyclerView parent) {
-        final RecyclerView.Adapter adapter = parent.getAdapter();
-        if (adapter == null || !(adapter instanceof PreferenceGroupAdapter)) {
-            return false;
-        }
-        final PreferenceGroupAdapter prefAdapter = (PreferenceGroupAdapter) adapter;
-        final int adapterPosition = parent.getChildAdapterPosition(view);
-        if (adapterPosition == RecyclerView.NO_POSITION) {
-            return false;
-        }
-        final Preference pref = prefAdapter.getItem(adapterPosition);
-        if (pref instanceof PreferenceCategory) {
-            return adapterPosition != 0;
-        }
-        return pref instanceof FooterPreference;
-    }
-}
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index 1ec4380..72da2e9 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -182,8 +182,8 @@
     public void onForget(WifiDialog dialog) {
         if (mSelectedAccessPoint != null) {
             mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, null);
-            getPreferenceScreen().removePreference((Preference) mSelectedAccessPoint.getTag());
             mSelectedAccessPoint = null;
+            initPreferences();
         }
     }
 
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index a903c09..d652efa 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -194,7 +194,6 @@
 
         mConnectedAccessPointPreferenceCategory =
                 (PreferenceCategory) findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
-        mConnectedAccessPointPreferenceCategory.setVisible(false); // initially hidden
 
         mAccessPointsPreferenceCategory =
                 (PreferenceCategory) findPreference(PREF_KEY_ACCESS_POINTS);
@@ -799,6 +798,7 @@
         if (pref == null) {
             pref = createLongPressActionPointPreference(connectedAp);
         }
+        pref.refresh();
         mConnectedAccessPointPreferenceCategory.addPreference(pref);
         mConnectedAccessPointPreferenceCategory.setVisible(true);
     }
@@ -954,6 +954,8 @@
                 Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
                 return;
             }
+        } else if (mSelectedAccessPoint.getConfig().isPasspoint()) {
+            mWifiManager.removePasspointConfiguration(mSelectedAccessPoint.getConfig().FQDN);
         } else {
             mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener);
         }
diff --git a/tests/app/src/com/android/settings/EncryptionInterstitialTest.java b/tests/app/src/com/android/settings/EncryptionInterstitialTest.java
new file mode 100644
index 0000000..6487818
--- /dev/null
+++ b/tests/app/src/com/android/settings/EncryptionInterstitialTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+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;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class EncryptionInterstitialTest {
+
+    private Instrumentation mInstrumentation;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = mInstrumentation.getTargetContext();
+    }
+
+    @Test
+    public void clickHeader_shouldNotCrash() {
+        mInstrumentation.startActivitySync(
+                new Intent().setClassName(mContext, EncryptionInterstitial.class.getName()));
+        onView(withId(R.id.encryption_interstitial_header));
+        // Nothing should happen
+    }
+}
diff --git a/tests/app/src/com/android/settings/dashboard/TabSelectionOnLaunchTest.java b/tests/app/src/com/android/settings/dashboard/TabSelectionOnLaunchTest.java
deleted file mode 100644
index 24c1ead..0000000
--- a/tests/app/src/com/android/settings/dashboard/TabSelectionOnLaunchTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.dashboard;
-
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import com.android.settings.Settings;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-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.isSelected;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.core.IsNot.not;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class TabSelectionOnLaunchTest {
-    @Rule
-    public ActivityTestRule<Settings> mActivityRule =
-            new ActivityTestRule<>(Settings.class, true, false);
-
-    private final int FLAG_RESTART = Intent.FLAG_ACTIVITY_CLEAR_TASK|Intent.FLAG_ACTIVITY_NEW_TASK;
-    private final String ARG_SELECT_SUPPORT_TAB = "SUPPORT";
-    private final String ARG_SELECT_FAKE_TAB = "NOT_SUPPORT";
-
-    @Test
-    /* cold start for settings app with correct flags and extra always selects support tab */
-    public void test_ColdStartWithCorrectArgsCorrectFlags_SupportSelected() {
-        launchSettingsWithFlags(ARG_SELECT_SUPPORT_TAB, FLAG_RESTART);
-        verifySupportSelected();
-    }
-
-    @Test
-    /* cold start with correct flags and wrong extra defaults to all tab */
-    public void test_ColdStartWithWrongExtra_DoesNotSelectSupport() {
-        launchSettingsWithFlags(ARG_SELECT_FAKE_TAB, FLAG_RESTART);
-        verifySupportNotSelected();
-    }
-
-    @Test
-    /* warm start from elsewhere in settings with wrong flags does not select support */
-    public void test_WarmStartSummarySelectedCorrectExtraWrongFlags_DoesNotSelectSupport() {
-        InstrumentationRegistry.getContext().
-                startActivity(new Intent(android.provider.Settings.ACTION_SETTINGS));
-        launchSettingsNoFlags(ARG_SELECT_SUPPORT_TAB);
-        verifySupportNotSelected();
-    }
-
-    @Test
-    /* warm start from elsewhere in settings with with wrong flags & extra does not select support*/
-    public void test_WarmStartSummarySelectedWrongExtraWrongFlags_DoesNotSelectSupport() {
-        InstrumentationRegistry.getContext().
-                startActivity(new Intent(android.provider.Settings.ACTION_SETTINGS));
-        launchSettingsNoFlags(ARG_SELECT_FAKE_TAB);
-        verifySupportNotSelected();
-    }
-
-    @Test
-    /* settings does not crash on null string */
-    public void test_DoesNotCrashOnNullExtra_DoesNotSelectSupport() {
-        launchSettingsWithFlags(null, FLAG_RESTART);
-        verifySupportNotSelected();
-    }
-
-    private void verifySupportNotSelected() {
-        onView(withText(mActivityRule.getActivity().getApplicationContext().
-                getString(com.android.settings.R.string.page_tab_title_support))).
-                check(matches(not(isSelected())));
-    }
-
-    private void verifySupportSelected() {
-        onView(withText(mActivityRule.getActivity().getApplicationContext().
-                getString(com.android.settings.R.string.page_tab_title_support))).
-                check(matches(isSelected()));
-    }
-
-    private void launchSettingsWithFlags(String extra, int flags) {
-        Intent intent = new Intent(android.provider.Settings.ACTION_SETTINGS);
-        intent.setFlags(flags);
-        intent.putExtra(DashboardContainerFragment.EXTRA_SELECT_SETTINGS_TAB, extra);
-        mActivityRule.launchActivity(intent);
-    }
-
-    private void launchSettingsNoFlags(String extra) {
-        Intent intent = new Intent(android.provider.Settings.ACTION_SETTINGS);
-        intent.putExtra(DashboardContainerFragment.EXTRA_SELECT_SETTINGS_TAB, extra);
-        mActivityRule.launchActivity(intent);
-    }
-}
\ No newline at end of file
diff --git a/tests/app/src/com/android/settings/gesture/GestureSettingsTest.java b/tests/app/src/com/android/settings/gesture/GestureSettingsTest.java
deleted file mode 100644
index 4f3a524..0000000
--- a/tests/app/src/com/android/settings/gesture/GestureSettingsTest.java
+++ /dev/null
@@ -1,195 +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.gesture;
-
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings.Secure;
-import android.support.test.filters.MediumTest;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiSelector;
-import android.support.test.uiautomator.UiScrollable;
-import android.test.InstrumentationTestCase;
-import android.util.Log;
-import android.widget.RelativeLayout;
-import android.widget.Switch;
-
-import com.android.settings.R;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import org.junit.Test;
-
-/**
- * Test for Gesture preferences.
- */
-@MediumTest
-public class GestureSettingsTest extends InstrumentationTestCase {
-
-    private static final String TAG = "GestureSettingsTest";
-
-    private UiDevice mDevice;
-    private Context mTargetContext;
-    private String mTargetPackage;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mTargetContext = getInstrumentation().getTargetContext();
-        mTargetPackage = mTargetContext.getPackageName();
-    }
-
-    @Test
-    public void testAmbientDisplaySwitchPreference() throws Exception {
-        launchSettings();
-        UiObject dozeSwitch = getDozeSwitch();
-        assertNotNull(dozeSwitch);
-        assertTrue(dozeSwitch.exists());
-        assertToggleStateMatchesSettingValue(dozeSwitch, Secure.DOZE_ENABLED, 1, 1);
-    }
-
-    @Test
-    public void testGestureSettingsExists() throws Exception {
-        launchMoves();
-        UiObject titleObj = mDevice.findObject(new UiSelector().text(
-                mTargetContext.getResources().getString(R.string.gesture_preference_title)));
-        assertNotNull(titleObj);
-        assertTrue(titleObj.exists());
-    }
-
-    @Test
-    public void testCameraDoubleTapToggle() throws Exception {
-        assertSwitchToggle(mTargetContext.getResources().getString(
-                R.string.double_tap_power_for_camera_title),
-                Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0, 0);
-    }
-
-    @Test
-    public void testCameraDoubleTwistToggle() throws Exception {
-        assertSwitchToggle(mTargetContext.getResources().getString(
-                R.string.double_twist_for_camera_mode_title),
-                Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1, 1);
-    }
-
-    @Test
-    public void testFingerprintSwipeToggle() throws Exception {
-        assertSwitchToggle(mTargetContext.getResources().getString(
-                R.string.fingerprint_swipe_for_notifications_title),
-                Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0, 1);
-    }
-
-    @Test
-    public void testDozeDoubleTapToggle() throws Exception {
-        assertSwitchToggle(mTargetContext.getResources().getString(
-                R.string.ambient_display_title),
-                Secure.DOZE_PULSE_ON_DOUBLE_TAP, 1, 1);
-    }
-
-    @Test
-    public void testDozePickupToggle() throws Exception {
-        assertSwitchToggle(mTargetContext.getResources().getString(
-                R.string.ambient_display_pickup_title),
-                Secure.DOZE_PULSE_ON_PICK_UP, 1, 1);
-    }
-
-    private void launchSettings() {
-        Intent settingsIntent = new Intent(Intent.ACTION_MAIN)
-                .addCategory(Intent.CATEGORY_LAUNCHER)
-                .setPackage(mTargetPackage)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getInstrumentation().getContext().startActivity(settingsIntent);
-    }
-
-    private void launchMoves() throws Exception  {
-        launchSettings();
-        UiScrollable settings = new UiScrollable(
-                new UiSelector().packageName(mTargetPackage).scrollable(true));
-        String titleMoves =
-                mTargetContext.getResources().getString(R.string.gesture_preference_title);
-        settings.scrollTextIntoView(titleMoves);
-        mDevice.findObject(new UiSelector().text(titleMoves)).click();
-    }
-
-    private void navigateToMovesSetting(String title) throws Exception {
-        launchMoves();
-        UiScrollable moves = new UiScrollable(
-                new UiSelector().packageName(mTargetPackage).scrollable(true));
-        moves.scrollTextIntoView(title);
-    }
-
-    private UiScrollable navigateToAmbientDisplay() throws Exception {
-        UiScrollable settings = new UiScrollable(
-                new UiSelector().packageName(mTargetPackage).scrollable(true));
-        String titleDisplay =
-                mTargetContext.getResources().getString(R.string.display_settings_title);
-        settings.scrollTextIntoView(titleDisplay);
-        mDevice.findObject(new UiSelector().text(titleDisplay)).click();
-        settings.scrollTextIntoView(mTargetContext.getResources().getString(R.string.doze_title));
-        return settings;
-    }
-
-    private UiObject getGestureSwitch(String title) throws Exception {
-        UiObject titleView = mDevice.findObject(new UiSelector().text(title));
-        UiObject gestureSwitch =
-            titleView.getFromParent(new UiSelector().className(Switch.class.getName()));
-        assertNotNull(gestureSwitch);
-        assertTrue(gestureSwitch.exists());
-        return gestureSwitch;
-    }
-
-    private UiObject getDozeSwitch() throws Exception {
-        UiScrollable settings = navigateToAmbientDisplay();
-        UiObject dozeSwitch = null;
-        UiSelector relativeLayoutSelector =
-                new UiSelector().className(RelativeLayout.class.getName());
-        String titleDoze = mTargetContext.getResources().getString(R.string.doze_title);
-        for (int i = 0; i <= settings.getChildCount(relativeLayoutSelector); i++) {
-            UiObject relativeLayout = settings.getChild(relativeLayoutSelector.instance(i));
-            if (relativeLayout.getChildCount() != 2) {
-                continue;
-            }
-            UiObject obj1 = relativeLayout.getChild(new UiSelector().index(0));
-            if (obj1.getText() == titleDoze) {
-                return relativeLayout.getFromParent(
-                        new UiSelector().className(Switch.class.getName()));
-            }
-        }
-        return null;
-    }
-
-    private void assertSwitchToggle(String title, String key, int defaultVal, int enabledVal)
-            throws Exception {
-        navigateToMovesSetting(title);
-        assertToggleStateMatchesSettingValue(getGestureSwitch(title), key, defaultVal, enabledVal);
-    }
-
-    private void assertToggleStateMatchesSettingValue (
-            UiObject testSwitch, String key, int defaultVal, int enabledVal) throws Exception {
-        // check initial state
-        int currentValue = Secure.getInt(mTargetContext.getContentResolver(), key, defaultVal);
-        boolean enabled = currentValue == enabledVal;
-        assertEquals(enabled, testSwitch.isChecked());
-        // toggle the preference
-        testSwitch.click();
-        assertEquals(!enabled, testSwitch.isChecked());
-        int newValue = currentValue == 1 ? 0 : 1;
-        assertEquals(newValue, Secure.getInt(mTargetContext.getContentResolver(), key, defaultVal));
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/users/UserSettingsTest.java b/tests/app/src/com/android/settings/users/UserSettingsTest.java
new file mode 100644
index 0000000..1a33917
--- /dev/null
+++ b/tests/app/src/com/android/settings/users/UserSettingsTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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.users;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.filters.SmallTest;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiSelector;
+import android.support.test.uiautomator.UiScrollable;
+import android.test.InstrumentationTestCase;
+
+import com.android.settings.R;
+
+import org.junit.Test;
+
+@SmallTest
+public class UserSettingsTest extends InstrumentationTestCase {
+
+    private static final String USER_AND_ACCOUNTS = "User & accounts";
+    private static final String USERS = "Users";
+    private static final String EMERGNENCY_INFO = "Emergency information";
+    private static final String ADD_USERS_WHEN_LOCKED = "Add users";
+
+    private UiDevice mDevice;
+    private Context mContext;
+    private String mTargetPackage;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mContext = getInstrumentation().getTargetContext();
+        mTargetPackage = mContext.getPackageName();
+    }
+
+    @Test
+    public void testEmergencyInfoNotExists() throws Exception {
+        launchUserSettings();
+        UiObject emergencyInfoPreference =
+            mDevice.findObject(new UiSelector().text(EMERGNENCY_INFO));
+        assertFalse(emergencyInfoPreference.exists());
+    }
+
+    @Test
+    public void testAddUsersWhenLockedNotExists() throws Exception {
+        launchUserSettings();
+        UiObject addUsersPreference =
+            mDevice.findObject(new UiSelector().text(ADD_USERS_WHEN_LOCKED));
+        assertFalse(addUsersPreference.exists());
+    }
+
+    private void launchSettings() {
+        Intent settingsIntent = new Intent(Intent.ACTION_MAIN)
+                .addCategory(Intent.CATEGORY_LAUNCHER)
+                .setPackage(mTargetPackage)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getInstrumentation().getContext().startActivity(settingsIntent);
+    }
+
+    private void launchUserSettings() throws Exception  {
+        launchSettings();
+        final UiScrollable settings = new UiScrollable(
+                new UiSelector().packageName(mTargetPackage).scrollable(true));
+        final String titleUsersAndAccounts = USER_AND_ACCOUNTS;
+        settings.scrollTextIntoView(titleUsersAndAccounts);
+        mDevice.findObject(new UiSelector().text(titleUsersAndAccounts)).click();
+        mDevice.findObject(new UiSelector().text(USERS)).click();
+    }
+
+}
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index 5e134bf..a63bd7f 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -3,5 +3,5 @@
 com.android.settings.notification.ZenModePrioritySettings
 com.android.settings.inputmethod.InputAndGestureSettings
 com.android.settings.accounts.AccountDetailDashboardFragment
-com.android.settings.gestures.GestureSettings
-com.android.settings.fuelgauge.PowerUsageDetail
\ No newline at end of file
+com.android.settings.fuelgauge.PowerUsageDetail
+com.android.settings.deviceinfo.StorageProfileFragment
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index 3e4a9a3..d7ea14c 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -8,7 +8,6 @@
 com.android.settings.notification.ZenModeEventRuleSettings
 com.android.settings.fuelgauge.InactiveApps
 com.android.settings.accessibility.CaptionPropertiesFragment
-com.android.settings.accounts.ManageAccountsSettings
 com.android.settings.accessibility.AccessibilitySettingsForSetupWizard
 com.android.settings.deviceinfo.ImeiInformation
 com.android.settings.datausage.DataUsageList
@@ -65,7 +64,7 @@
 com.android.settings.fuelgauge.PowerUsageSummary
 com.android.settings.applications.RunningServices
 com.android.settings.wifi.p2p.WifiP2pSettings
-com.android.settings.applications.ManageAssist
+com.android.settings.applications.assistant.ManageAssist
 com.android.settings.applications.ConfirmConvertToFbe
 com.android.settings.deviceinfo.PublicVolumeSettings
 com.android.settings.applications.InstalledAppDetails
diff --git a/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider b/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
new file mode 100644
index 0000000..8184d2c
--- /dev/null
+++ b/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
@@ -0,0 +1,5 @@
+com.android.settings.language.LanguageAndInputSettings
+com.android.settings.enterprise.EnterprisePrivacySettings
+com.android.settings.applications.AdvancedAppSettings
+com.android.settings.fuelgauge.PowerUsageSummary
+com.android.settings.inputmethod.InputMethodAndLanguageSettings
diff --git a/tests/robotests/src/com/android/ims/ImsManager.java b/tests/robotests/src/com/android/ims/ImsManager.java
new file mode 100644
index 0000000..a4d97b5
--- /dev/null
+++ b/tests/robotests/src/com/android/ims/ImsManager.java
@@ -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.
+ */
+
+package com.android.ims;
+
+import android.content.Context;
+
+/**
+ * Fake test class to com.android.ims.ImsManager
+ */
+public class ImsManager {
+
+    public static boolean wfcEnabledByPlatform;
+    public static boolean wfcProvisioned;
+
+    public static boolean isWfcEnabledByPlatform(Context context) {
+        return wfcEnabledByPlatform;
+    }
+
+    public static boolean isWfcProvisionedOnDevice(Context context) {
+        return wfcProvisioned;
+    }
+
+    public static int getWfcMode(Context context, boolean roaming) {
+        return 0;
+    }
+
+    public static boolean isWfcEnabledByUser(Context context) {
+        return false;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
index c3365b8..ea889a5 100644
--- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
@@ -18,33 +18,24 @@
 
 import android.content.Context;
 import android.os.UserManager;
-import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.android.settingslib.DeviceInfoUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
-import org.junit.runner.RunWith;
 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 static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DeviceInfoSettingsTest extends AndroidTestCase {
+public class DeviceInfoSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
@@ -53,71 +44,18 @@
     @Mock
     private UserManager mUserManager;
 
-    private FakeFeatureFactory mFeatureFactory;
     private DeviceInfoSettings mSettings;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
         mSettings = spy(new DeviceInfoSettings());
         doReturn(mScreen).when(mSettings).getPreferenceScreen();
     }
 
     @Test
-    public void testGetFormattedKernelVersion() throws Exception {
-        if ("Unavailable".equals(DeviceInfoUtils.getFormattedKernelVersion())) {
-            fail("formatKernelVersion can't cope with this device's /proc/version");
-        }
-    }
-
-    @Test
-    public void testFormatKernelVersion() throws Exception {
-        assertEquals("Unavailable", DeviceInfoUtils.formatKernelVersion(""));
-        assertEquals("2.6.38.8-gg784\n" +
-                        "root@hpao4.eem.corp.google.com #2\n" +
-                        "Fri Feb 24 03:31:23 PST 2012",
-                DeviceInfoUtils.formatKernelVersion("Linux version 2.6.38.8-gg784 " +
-                        "(root@hpao4.eem.corp.google.com) " +
-                        "(gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5) ) #2 SMP " +
-                        "Fri Feb 24 03:31:23 PST 2012"));
-        assertEquals("3.0.31-g6fb96c9\n" +
-                        "android-build@vpbs1.mtv.corp.google.com #1\n" +
-                        "Thu Jun 28 11:02:39 PDT 2012",
-                DeviceInfoUtils.formatKernelVersion("Linux version 3.0.31-g6fb96c9 " +
-                        "(android-build@vpbs1.mtv.corp.google.com) " +
-                        "(gcc version 4.6.x-google 20120106 (prerelease) (GCC) ) #1 " +
-                        "SMP PREEMPT Thu Jun 28 11:02:39 PDT 2012"));
-        assertEquals("2.6.38.8-a-b-jellybean+\n" +
-                        "x@y #1\n" +
-                        "Tue Aug 28 22:10:46 CDT 2012",
-                DeviceInfoUtils.formatKernelVersion("Linux version " +
-                        "2.6.38.8-a-b-jellybean+ (x@y) " +
-                        "(gcc version 4.4.3 (GCC) ) #1 PREEMPT Tue Aug 28 22:10:46 CDT 2012"));
-        assertEquals("3.18.31-g3ce5faa-dirty\n" +
-                        "x@y #5\n" +
-                        "Fri Oct 28 14:38:13 PDT 2016",
-                DeviceInfoUtils.formatKernelVersion("Linux version " +
-                        "3.18.31-g3ce5faa-dirty (x@y) (Android clang " +
-                        "version 3.8.275480 (based on LLVM 3.8.275480)) " +
-                        "#5 SMP PREEMPT Fri Oct 28 14:38:13 PDT 2016"));
-    }
-
-    @Test
-    public void testShowSystemUpdatesWhenIADisabled() throws Exception {
-        when(mFeatureFactory.dashboardFeatureProvider.isEnabled()).thenReturn(true);
-        mSettings.displaySystemUpdates(mContext);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void testHideSystemUpdatesWhenIAEnabled() throws Exception {
-        when(mFeatureFactory.dashboardFeatureProvider.isEnabled()).thenReturn(false);
-        mSettings.displaySystemUpdates(mContext);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
+    public void getPrefXml_shouldReturnDeviceInfoXml() {
+        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
new file mode 100644
index 0000000..9a5002e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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 EncryptionAndCredentialTest {
+
+    @Test
+    public void getMetricsCategory_shouldReturnEncryptionAndCredential() {
+        EncryptionAndCredential fragment = new EncryptionAndCredential();
+        assertThat(fragment.getMetricsCategory()).isEqualTo(MetricsEvent.ENCRYPTION_AND_CREDENTIAL);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
index 51c0d9b..03a8f94 100644
--- a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings;
 
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.IContentProvider;
 import android.content.pm.PackageManager;
@@ -26,6 +25,7 @@
 
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.drawer.TileUtils;
@@ -40,7 +40,6 @@
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -67,24 +66,6 @@
 
     private SecuritySettings.SummaryProvider mSummaryProvider;
 
-    @Implements(Settings.Secure.class)
-    public static class ShadowSecureSettings {
-
-        private static final Map<String, Object> mValueMap = new HashMap<>();
-
-        @Implementation
-        public static boolean putInt(ContentResolver resolver, String name, int value) {
-            mValueMap.put(name, value);
-            return true;
-        }
-
-        @Implementation
-        public static int getInt(ContentResolver resolver, String name, int defaultValue) {
-            Integer value = (Integer) mValueMap.get(name);
-            return value == null ? defaultValue : value;
-        }
-    }
-
     @Implements(com.android.settingslib.drawer.TileUtils.class)
     public static class ShadowTileUtils {
         @Implementation
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index 1661947..6a5b935 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -16,22 +16,60 @@
 
 package com.android.settings;
 
+import android.app.ActivityManager;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import com.android.settings.testutils.FakeFeatureFactory;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 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.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SettingsActivityTest {
 
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private FragmentManager mFragmentManager;
+    @Mock
+    private ActivityManager.TaskDescription mTaskDescription;
+    @Mock
+    private Bitmap mBitmap;
     private SettingsActivity mActivity;
 
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        final FakeFeatureFactory factory =
+                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        when(factory.dashboardFeatureProvider.isEnabled()).thenReturn(true);
+
+        mActivity = spy(new SettingsActivity());
+        doReturn(mBitmap).when(mActivity).getBitmapFromXmlResource(anyInt());
+    }
+
     @Test
     public void testQueryTextChange_shouldUpdate() {
         final String testQuery = "abc";
-        mActivity = new SettingsActivity();
 
         assertThat(mActivity.mSearchQuery).isNull();
         try {
@@ -42,4 +80,23 @@
 
         assertThat(mActivity.mSearchQuery).isEqualTo(testQuery);
     }
+
+    @Test
+    public void launchSettingFragment_nullExtraShowFragment_shouldNotCrash()
+            throws ClassNotFoundException {
+        mActivity = spy(new SettingsActivity());
+        when(mActivity.getFragmentManager()).thenReturn(mFragmentManager);
+        when(mFragmentManager.beginTransaction()).thenReturn(mock(FragmentTransaction.class));
+
+        doReturn(RuntimeEnvironment.application.getClassLoader()).when(mActivity).getClassLoader();
+
+        mActivity.launchSettingFragment(null, true, mock(Intent.class));
+    }
+
+    @Test
+    public void testSetTaskDescription_IconChanged() {
+        mActivity.setTaskDescription(mTaskDescription);
+
+        verify(mTaskDescription).setIcon(any());
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index 90a6e05..324e751 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -1,13 +1,25 @@
 package com.android.settings;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.Network;
 import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
 import android.text.format.DateUtils;
-import java.net.InetAddress;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -16,9 +28,7 @@
 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;
+import java.net.InetAddress;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -97,4 +107,13 @@
 
         assertThat(Utils.formatElapsedTime(mContext, testMillis, false)).isEqualTo(expectedTime);
     }
+
+    @Test
+    public void testInitializeVolumeDoesntBreakOnNullVolume() {
+        VolumeInfo info = new VolumeInfo("id", 0, new DiskInfo("id", 0), "");
+        StorageManager storageManager = mock(StorageManager.class, RETURNS_DEEP_STUBS);
+        when(storageManager.findVolumeById(anyString())).thenReturn(info);
+
+        Utils.maybeInitializeVolume(storageManager, new Bundle());
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
index e5c4a66..2b861e2 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
@@ -22,7 +22,6 @@
 import android.content.pm.UserInfo;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceManager;
@@ -30,6 +29,7 @@
 
 import com.android.settings.AccessiblePreferenceCategory;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchIndexableRaw;
@@ -70,7 +70,7 @@
     @Mock(answer = RETURNS_DEEP_STUBS)
     private UserManager mUserManager;
     @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceFragment mFragment;
+    private SettingsPreferenceFragment mFragment;
     @Mock(answer = RETURNS_DEEP_STUBS)
     private AccountManager mAccountManager;
     @Mock(answer = RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/accounts/ManageAccountsSettingsTest.java b/tests/robotests/src/com/android/settings/accounts/ManageAccountsSettingsTest.java
deleted file mode 100644
index 916e395..0000000
--- a/tests/robotests/src/com/android/settings/accounts/ManageAccountsSettingsTest.java
+++ /dev/null
@@ -1,135 +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.accounts.Account;
-import android.content.SyncInfo;
-import android.content.SyncStatusInfo;
-import android.os.UserHandle;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.ArraySet;
-
-import com.android.settings.SettingsRobolectricTestRunner;
-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.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ManageAccountsSettingsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private AccountPreference mAccountPref;
-    private Account mAccount;
-    private ArrayList<String> mAuthorities;
-    private TestFragment mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mAuthorities = new ArrayList<>();
-        mAuthorities.add("authority");
-        mAccount = new Account("name", "type");
-        when(mAccountPref.getAccount()).thenReturn(mAccount);
-        when(mAccountPref.getAuthorities()).thenReturn(mAuthorities);
-        mSettings = new TestFragment();
-    }
-
-    @Test
-    public void showSyncState_noAccountPrefs_shouldUpdateNothing() {
-        when(mAccountPref.getAuthorities()).thenReturn(null);
-        mSettings.showSyncState();
-        verify(mSettings.getPreferenceScreen(), never()).getPreference(anyInt());
-    }
-
-    @Test
-    public void showSyncState_syncInProgress_shouldUpdateInProgress() {
-        mSettings.mUserFacingSyncAuthorities.add(mAuthorities.get(0));
-        mSettings.mSyncInfos.add(new SyncInfo(0, mAccount, mAuthorities.get(0), 0));
-        mSettings.mSyncStatusInfo = new SyncStatusInfo(0);
-        when(mSettings.getPreferenceScreen().getPreferenceCount()).thenReturn(1);
-        when(mSettings.getPreferenceScreen().getPreference(0)).thenReturn(mAccountPref);
-
-        mSettings.showSyncState();
-
-        verify(mSettings.getPreferenceScreen()).getPreference(anyInt());
-        verify(mAccountPref).setSyncStatus(AccountPreference.SYNC_IN_PROGRESS, true);
-    }
-
-    @Test
-    public void showSyncState_noUserFacingSynclets_shouldUpdateToDisabled() {
-        mSettings.mSyncInfos.add(new SyncInfo(0, mAccount, mAuthorities.get(0), 0));
-        mSettings.mSyncStatusInfo = new SyncStatusInfo(0);
-        when(mSettings.getPreferenceScreen().getPreferenceCount()).thenReturn(1);
-        when(mSettings.getPreferenceScreen().getPreference(0)).thenReturn(mAccountPref);
-
-        mSettings.showSyncState();
-
-        verify(mSettings.getPreferenceScreen()).getPreference(anyInt());
-        verify(mAccountPref).setSyncStatus(AccountPreference.SYNC_DISABLED, true);
-    }
-
-    public static class TestFragment extends ManageAccountsSettings {
-
-        private PreferenceScreen mScreen;
-        private List<SyncInfo> mSyncInfos;
-        private SyncStatusInfo mSyncStatusInfo;
-
-        public TestFragment() {
-            mUserHandle = mock(UserHandle.class);
-            mScreen = mock(PreferenceScreen.class);
-            mUserFacingSyncAuthorities = new ArraySet<>();
-            mSyncInfos = new ArrayList<>();
-        }
-
-        @Override
-        public PreferenceScreen getPreferenceScreen() {
-            return mScreen;
-        }
-
-        @Override
-        protected boolean isSyncEnabled(int userId, Account account, String authority) {
-            return true;
-        }
-
-        @Override
-        protected List<SyncInfo> getCurrentSyncs(int userId) {
-            return mSyncInfos;
-        }
-
-        @Override
-        protected SyncStatusInfo getSyncStatusInfo(Account account, String authority, int userId) {
-            return mSyncStatusInfo;
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
index 458af5b..bd55fd0 100644
--- a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
@@ -36,8 +36,6 @@
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.InstantDataBuilder.Param;
-import com.android.settings.applications.instantapps.InstantAppDetails;
 import com.android.settingslib.applications.ApplicationsState;
 
 import org.junit.Before;
@@ -52,6 +50,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -234,6 +233,25 @@
     }
 
     @Test
+    public void bindButton_hasAppInfo_shouldHaveContentDescription() {
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.app_details, null /* root */);
+        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
+        when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info");
+
+        mController = new AppHeaderController(mContext, mFragment, appLinks);
+        mController.setPackageName("123")
+                .setUid(UserHandle.USER_SYSTEM)
+                .setButtonActions(
+                        AppHeaderController.ActionType.ACTION_APP_INFO,
+                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
+        mController.done();
+
+        assertThat(appLinks.findViewById(R.id.left_button).getContentDescription())
+                .isEqualTo("App Info");
+    }
+
+    @Test
     public void bindButton_hasAppNotifIntent_shouldShowButton() {
         final View appLinks = mLayoutInflater
                 .inflate(R.layout.app_details, null /* root */);
@@ -251,102 +269,27 @@
                 .isEqualTo(View.GONE);
     }
 
-    // Ensure that no instant app related information shows up when the AppHeaderController's
-    // InstantAppDetails are null.
+    // Ensure that the instant app label does not show up when we haven't told the controller the
+    // app is instant.
     @Test
-    public void instantApps_nullInstantAppDetails() {
+    public void instantApps_normalAppsDontGetLabel() {
         final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
         mController = new AppHeaderController(mContext, mFragment, appHeader);
-        mController.setInstantAppDetails(null);
         mController.done();
-        assertThat(appHeader.findViewById(R.id.instant_app_developer_title).getVisibility())
-                .isEqualTo(View.GONE);
-        assertThat(appHeader.findViewById(R.id.instant_app_maturity).getVisibility())
-                .isEqualTo(View.GONE);
-        assertThat(appHeader.findViewById(R.id.instant_app_monetization).getVisibility())
+        assertThat(appHeader.findViewById(R.id.install_type).getVisibility())
                 .isEqualTo(View.GONE);
     }
 
-    // Ensure that no instant app related information shows up when the AppHeaderController has
-    // a non-null InstantAppDetails, but each member of it is null.
+    // Test that the "instant apps" label is present in the header when we have an instant app.
     @Test
-    public void instantApps_detailsMembersNull() {
+    public void instantApps_expectedHeaderItem() {
         final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
         mController = new AppHeaderController(mContext, mFragment, appHeader);
-
-        InstantAppDetails details = InstantDataBuilder.build(mContext, EnumSet.noneOf(Param.class));
-        mController.setInstantAppDetails(details);
+        mController.setIsInstantApp(true);
         mController.done();
-        assertThat(appHeader.findViewById(R.id.instant_app_developer_title).getVisibility())
-                .isEqualTo(View.GONE);
-        assertThat(appHeader.findViewById(R.id.instant_app_maturity).getVisibility())
-                .isEqualTo(View.GONE);
-        assertThat(appHeader.findViewById(R.id.instant_app_monetization).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    // Helper to assert a TextView for a given id is visible and has a certain string value.
-    private void assertVisibleContent(View header, @IdRes int id, String expectedValue) {
-        TextView view = (TextView)header.findViewById(id);
-        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(view.getText()).isEqualTo(expectedValue);
-    }
-
-    // Helper to assert an ImageView for a given id is visible and has a certain Drawable value.
-    private void assertVisibleContent(View header, @IdRes int id, Drawable expectedValue) {
-        ImageView view = (ImageView)header.findViewById(id);
-        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(view.getDrawable()).isEqualTo(expectedValue);
-    }
-
-    // Test that expected items are present in the header when we have a complete InstantAppDetails.
-    @Test
-    public void instantApps_expectedHeaderItems() {
-        final View header = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-        mController = new AppHeaderController(mContext, mFragment, header);
-
-        InstantAppDetails details = InstantDataBuilder.build(mContext);
-        mController.setInstantAppDetails(details);
-        mController.done();
-
-        assertVisibleContent(header, R.id.instant_app_developer_title, details.developerTitle);
-        assertVisibleContent(header, R.id.instant_app_maturity_icon,
-                details.maturityRatingIcon);
-        assertVisibleContent(header, R.id.instant_app_maturity_text,
-                details.maturityRatingString);
-        assertVisibleContent(header, R.id.instant_app_monetization,
-                details.monetizationNotice);
-    }
-
-    // Test having each member of InstantAppDetails be null.
-    @Test
-    public void instantApps_expectedHeaderItemsWithSingleNullMembers() {
-        final EnumSet<Param> allParams = EnumSet.allOf(Param.class);
-        for (Param paramToRemove : allParams) {
-            EnumSet<Param> params = allParams.clone();
-            params.remove(paramToRemove);
-            final View header = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-            mController = new AppHeaderController(mContext, mFragment, header);
-            InstantAppDetails details = InstantDataBuilder.build(mContext, params);
-            mController.setInstantAppDetails(details);
-            mController.done();
-
-            if (params.contains(Param.DEVELOPER_TITLE)) {
-                assertVisibleContent(header, R.id.instant_app_developer_title,
-                        details.developerTitle);
-            }
-            if (params.contains(Param.MATURITY_RATING_ICON)) {
-                assertVisibleContent(header, R.id.instant_app_maturity_icon,
-                        details.maturityRatingIcon);
-            }
-            if (params.contains(Param.MATURITY_RATING_STRING)) {
-                assertVisibleContent(header, R.id.instant_app_maturity_text,
-                        details.maturityRatingString);
-            }
-            if (params.contains(Param.MONETIZATION_NOTICE)) {
-                assertVisibleContent(header, R.id.instant_app_monetization,
-                        details.monetizationNotice);
-            }
-        }
+        TextView label = (TextView)appHeader.findViewById(R.id.install_type);
+        assertThat(label.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(label.getText()).isEqualTo(
+                appHeader.getResources().getString(R.string.install_type_instant));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
index 4cc39fb..56d4a83 100644
--- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
@@ -28,6 +28,8 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -37,6 +39,7 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -88,7 +91,8 @@
             mScreen = mock(PreferenceScreen.class);
             mPackageInfo = new PackageInfo();
             mPackageInfo.applicationInfo = new ApplicationInfo();
-
+            ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                                             (InstantAppDataProvider) (info -> false));
             when(mManager.getContext())
                     .thenReturn(ShadowApplication.getInstance().getApplicationContext());
         }
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
new file mode 100644
index 0000000..3076080
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
@@ -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
+ */
+
+package com.android.settings.applications;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.AppOpsManager;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+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 AppStateInstallAppsBridgeTest {
+
+    @Test
+    public void testInstallAppsStateCanInstallApps() {
+        AppStateInstallAppsBridge.InstallAppsState appState = new AppStateInstallAppsBridge
+                .InstallAppsState();
+        assertThat(appState.canInstallApps()).isFalse();
+
+        appState.permissionGranted = true;
+        appState.permissionRequested = true;
+        assertThat(appState.canInstallApps()).isTrue();
+
+        appState.appOpMode = AppOpsManager.MODE_ERRORED;
+        assertThat(appState.canInstallApps()).isFalse();
+    }
+
+    @Test
+    public void testInstallAppsStateIsPotentialAppSource() {
+        AppStateInstallAppsBridge.InstallAppsState appState = new AppStateInstallAppsBridge
+                .InstallAppsState();
+        assertThat(appState.isPotentialAppSource()).isFalse();
+
+        appState.appOpMode = AppOpsManager.MODE_ERRORED;
+        assertThat(appState.isPotentialAppSource()).isTrue();
+
+        appState.permissionRequested = true;
+        appState.appOpMode = AppOpsManager.MODE_DEFAULT;
+        assertThat(appState.isPotentialAppSource()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/ExternalSourcesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/ExternalSourcesDetailsTest.java
new file mode 100644
index 0000000..5b2f8e0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/ExternalSourcesDetailsTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.applications.ApplicationsState;
+
+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 ExternalSourcesDetailsTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private AppStateInstallAppsBridge.InstallAppsState mInstallAppsStateAllowed;
+    @Mock
+    private AppStateInstallAppsBridge.InstallAppsState mInstallAppsStateBlocked;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mInstallAppsStateAllowed.canInstallApps()).thenReturn(true);
+        when(mInstallAppsStateBlocked.canInstallApps()).thenReturn(false);
+    }
+
+    @Test
+    public void testGetPreferenceSummary() {
+        ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.extraInfo = mInstallAppsStateBlocked;
+        ExternalSourcesDetails.getPreferenceSummary(mContext, appEntry);
+        verify(mContext).getString(R.string.external_source_untrusted);
+        appEntry.extraInfo = mInstallAppsStateAllowed;
+        ExternalSourcesDetails.getPreferenceSummary(mContext, appEntry);
+        verify(mContext).getString(R.string.external_source_trusted);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
new file mode 100644
index 0000000..0b1d1aa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.os.UserHandle;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
+
+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 FetchPackageStorageAsyncLoaderTest {
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private StorageStatsSource mSource;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void worksForValidPackageNameAndUid() {
+        AppStorageStats stats = mock(AppStorageStats.class);
+        when(stats.getCodeBytes()).thenReturn(1L);
+        when(stats.getDataBytes()).thenReturn(2L);
+        when(stats.getCacheBytes()).thenReturn(3L);
+        when(mSource.getStatsForPackage(anyString(), anyString(), any(UserHandle.class)))
+                .thenReturn(stats);
+        ApplicationInfo info = new ApplicationInfo();
+        info.packageName = "com.test.package";
+
+        FetchPackageStorageAsyncLoader task = new FetchPackageStorageAsyncLoader(
+                mContext, mSource, info, new UserHandle(0));
+        assertThat(task.loadInBackground()).isEqualTo(stats);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index dc37079..2a703ef 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
@@ -16,22 +16,44 @@
 
 package com.android.settings.applications;
 
+import android.app.admin.DevicePolicyManager;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.os.UserManager;
 
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
+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;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class InstalledAppDetailsTest {
 
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private UserManager mUserManager;
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
     @Test
     public void getInstallationStatus_notInstalled_shouldReturnUninstalled() {
         final InstalledAppDetails mAppDetail = new InstalledAppDetails();
@@ -60,4 +82,39 @@
         assertThat(mAppDetail.getInstallationStatus(info)).isEqualTo(R.string.disabled);
     }
 
+    @Test
+    public void shouldShowUninstallForAll_installForOneOtherUserOnly_shouldReturnTrue() {
+        when(mDevicePolicyManager.packageHasActiveAdmins(anyString())).thenReturn(false);
+        when(mUserManager.getUsers().size()).thenReturn(2);
+        final InstalledAppDetails mAppDetail = new InstalledAppDetails();
+        ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
+        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
+        final ApplicationInfo info = new ApplicationInfo();
+        info.enabled = true;
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = info;
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+
+        assertThat(mAppDetail.shouldShowUninstallForAll(appEntry)).isTrue();
+    }
+
+    @Test
+    public void shouldShowUninstallForAll_installForSelfOnly_shouldReturnFalse() {
+        when(mDevicePolicyManager.packageHasActiveAdmins(anyString())).thenReturn(false);
+        when(mUserManager.getUsers().size()).thenReturn(2);
+        final InstalledAppDetails mAppDetail = new InstalledAppDetails();
+        ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
+        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
+        final ApplicationInfo info = new ApplicationInfo();
+        info.flags = ApplicationInfo.FLAG_INSTALLED;
+        info.enabled = true;
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = info;
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+
+        assertThat(mAppDetail.shouldShowUninstallForAll(appEntry)).isFalse();
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/applications/InstantDataBuilder.java b/tests/robotests/src/com/android/settings/applications/InstantDataBuilder.java
deleted file mode 100644
index 81ebe06..0000000
--- a/tests/robotests/src/com/android/settings/applications/InstantDataBuilder.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package com.android.settings.applications;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-
-import com.android.settings.R;
-import com.android.settings.applications.instantapps.InstantAppDetails;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.EnumSet;
-
-/**
- * Utility class for generating fake InstantAppDetails data to use in tests.
- */
-public class InstantDataBuilder {
-    public enum Param {
-        MATURITY_RATING_ICON,
-        MATURITY_RATING_STRING,
-        MONETIZATION_NOTICE,
-        DEVELOPER_TITLE,
-        PRIVACY_POLICY,
-        DEVELOPER_WEBSITE,
-        DEVELOPER_EMAIL,
-        DEVELOPER_MAILING_ADDRESS
-    }
-
-    /**
-     * Creates an InstantAppDetails with any desired combination of null/non-null members.
-     *
-     * @param context An optional context, required only if MATURITY_RATING_ICON is a member of
-     * params
-     * @param params Specifies which elements of the returned InstantAppDetails should be non-null
-     * @return InstantAppDetails
-     */
-    public static InstantAppDetails build(@Nullable Context context, EnumSet<Param> params) {
-        Drawable ratingIcon = null;
-        String rating = null;
-        String monetizationNotice = null;
-        String developerTitle = null;
-        URL privacyPolicy = null;
-        URL developerWebsite = null;
-        String developerEmail = null;
-        String developerMailingAddress = null;
-
-        if (params.contains(Param.MATURITY_RATING_ICON)) {
-            ratingIcon = context.getDrawable(R.drawable.ic_android);
-        }
-        if (params.contains(Param.MATURITY_RATING_STRING)) {
-            rating = "everyone";
-        }
-        if (params.contains(Param.MONETIZATION_NOTICE)) {
-            monetizationNotice = "Uses in-app purchases";
-        }
-        if (params.contains(Param.DEVELOPER_TITLE)) {
-            developerTitle = "Instant Apps Inc.";
-        }
-        if (params.contains(Param.DEVELOPER_EMAIL)) {
-            developerEmail = "developer@instant-apps.com";
-        }
-        if (params.contains(Param.DEVELOPER_MAILING_ADDRESS)) {
-            developerMailingAddress = "1 Main Street, Somewhere, CA, 94043";
-        }
-
-        if (params.contains(Param.PRIVACY_POLICY)) {
-            try {
-                privacyPolicy = new URL("https://test.com/privacy");
-            } catch (MalformedURLException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        if (params.contains(Param.DEVELOPER_WEBSITE)) {
-            try {
-                developerWebsite = new URL("https://test.com");
-            } catch (MalformedURLException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        return InstantAppDetails.builder()
-                .maturityRatingIcon(ratingIcon)
-                .maturityRatingString(rating)
-                .monetizationNotice(monetizationNotice)
-                .developerTitle(developerTitle)
-                .privacyPolicy(privacyPolicy)
-                .developerWebsite(developerWebsite)
-                .developerEmail(developerEmail)
-                .developerMailingAddress(developerMailingAddress)
-                .build();
-    }
-
-    /**
-     * Convenience method to create an InstantAppDetails with all non-null members.
-     *
-     * @param context a required Context for loading a test maturity rating icon
-     * @return InstantAppDetails
-     */
-    public static InstantAppDetails build(Context context) {
-        return build(context, EnumSet.allOf(Param.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
index 8729d84..871b5a0 100644
--- a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
@@ -16,8 +16,12 @@
 
 package com.android.settings.applications;
 
+import android.app.Activity;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.os.Looper;
-import android.os.UserManager;
+import android.widget.TextView;
+import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
@@ -36,6 +40,8 @@
 import org.robolectric.util.ReflectionHelpers;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -55,7 +61,6 @@
 
     @Mock private ApplicationsState mState;
     @Mock private ApplicationsState.Session mSession;
-    @Mock private UserManager mUserManager;
 
     private Looper mBgLooper;
     private ManageApplications mFragment;
@@ -78,4 +83,21 @@
         SettingsRobolectricTestRunner.startSettingsFragment(
                 mFragment, Settings.ManageApplicationsActivity.class);
     }
+
+    @Test
+    public void updateDisableView_appDisabledUntilUsed_shouldSetDisabled() {
+        final TextView view = mock(TextView.class);
+        final ApplicationInfo info = new ApplicationInfo();
+        info.flags = ApplicationInfo.FLAG_INSTALLED;
+        info.enabled = true;
+        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
+        ManageApplications fragment = mock(ManageApplications.class);
+        when(fragment.getActivity()).thenReturn(mock(Activity.class));
+        final ManageApplications.ApplicationsAdapter adapter =
+            new ManageApplications.ApplicationsAdapter(mState, fragment, 0);
+
+        adapter.updateDisableView(view, info);
+
+        verify(view).setText(R.string.disabled);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
index 4af0707..9bc7482 100644
--- a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
@@ -32,8 +32,8 @@
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.deviceinfo.storage.StorageStatsSource;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
+import com.android.settingslib.applications.StorageStatsSource;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -99,9 +99,10 @@
         verify(mFragment).startActivity(argumentCaptor.capture());
         Intent intent = argumentCaptor.getValue();
 
-        assertThat(intent.getAction()).isEqualTo(DocumentsContract.ACTION_BROWSE);
+        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
         assertThat(intent.getData()).isEqualTo(DocumentsContract.buildRootUri(
                 "com.android.providers.media.documents",
                 "audio_root"));
+        assertThat(intent.getType()).isEqualTo(DocumentsContract.Root.MIME_TYPE_ITEM);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
new file mode 100644
index 0000000..da8473f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.TwoStatePreference;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.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;
+import org.robolectric.util.ReflectionHelpers;
+
+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.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AssistContextPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private TwoStatePreference mPreference;
+    @Mock
+    private AssistContextPreferenceController.SettingObserver mObserver;
+    private Context mContext;
+    private AssistContextPreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        mLifecycle = new Lifecycle();
+        mContext = RuntimeEnvironment.application;
+        mController = new AssistContextPreferenceController(mContext, mLifecycle);
+        ReflectionHelpers.setField(mController, "mSettingObserver", mObserver);
+    }
+
+    @Test
+    public void isAvailable_hasAssistant_shouldReturnTrue() {
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.ASSISTANT, "com.android.settings/assist");
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_hasNoAssistant_shouldReturnFalse() {
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.ASSISTANT, "");
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void onResume_shouldUpdatePreference() {
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.ASSISTANT, "com.android.settings/assist");
+        mController.displayPreference(mScreen);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1);
+
+        mLifecycle.onResume();
+        verify(mObserver).register(any(ContentResolver.class), eq(true));
+        verify(mPreference).setChecked(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
new file mode 100644
index 0000000..0b2378c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.TwoStatePreference;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
+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 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.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AssistFlashScreenPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mMockContext;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private TwoStatePreference mPreference;
+    @Mock
+    private AssistFlashScreenPreferenceController.SettingObserver mObserver;
+    private Context mContext;
+    private AssistFlashScreenPreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        mLifecycle = new Lifecycle();
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new AssistFlashScreenPreferenceController(mContext, mLifecycle));
+        mLifecycle.addObserver(mController);
+        ReflectionHelpers.setField(mController, "mSettingObserver", mObserver);
+    }
+
+    @Test
+    @Config(shadows = {ShadowSecureSettings.class})
+    public void isAvailable_hasAssistantAndAllowDisclosure_shouldReturnTrue() {
+        ReflectionHelpers.setField(mController, "mContext", mMockContext);
+        ShadowSecureSettings.putString(null, Settings.Secure.ASSISTANT,
+                "com.android.settings/assist");
+        doReturn(true).when(mController).allowDisablingAssistDisclosure();
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    @Config(shadows = {ShadowSecureSettings.class})
+    public void isAvailable_hasAssistantAndDisallowDisclosure_shouldReturnTrue() {
+        ReflectionHelpers.setField(mController, "mContext", mMockContext);
+        ShadowSecureSettings.putString(null, Settings.Secure.ASSISTANT,
+                "com.android.settings/assist");
+        doReturn(false).when(mController).allowDisablingAssistDisclosure();
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_hasNoAssistant_shouldReturnFalse() {
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.ASSISTANT, "");
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @Config(shadows = {ShadowSecureSettings.class})
+    public void onResume_shouldUpdatePreference() {
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.ASSISTANT, "com.android.settings/assist");
+        doReturn(true).when(mController).isAvailable();
+        doReturn(true).when(mController).isPreInstalledAssistant(any(ComponentName.class));
+        doReturn(true).when(mController).willShowFlash(any(ComponentName.class));
+
+        mController.displayPreference(mScreen);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_DISCLOSURE_ENABLED, 1);
+
+        mLifecycle.onResume();
+
+        verify(mObserver).register(any(ContentResolver.class), eq(true));
+        verify(mPreference).setChecked(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
new file mode 100644
index 0000000..abc030b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+
+import android.net.Uri;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AssistSettingObserverTest {
+
+    private AssistSettingObserver mObserver;
+
+    @Test
+    public void callConstructor_shouldNotCrash() {
+        mObserver = new AssistSettingObserver() {
+            @Override
+            protected List<Uri> getSettingUris() {
+                return null;
+            }
+
+            @Override
+            public void onSettingChange() {
+
+            }
+        };
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
new file mode 100644
index 0000000..544526a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DefaultAssistPickerTest {
+
+    private static final ComponentName TEST_ASSIST =
+            new ComponentName("com.android.settings", "assist");
+
+    private Context mContext;
+    private DefaultAssistPicker mPicker;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mPicker = spy(new DefaultAssistPicker());
+        mPicker.onAttach(mContext);
+        doReturn(mContext).when(mPicker).getContext();
+    }
+
+    @Test
+    public void setDefaultAppKey_shouldUpdateDefaultAssist() {
+        final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
+        assistants.add(new DefaultAssistPicker.Info(TEST_ASSIST));
+        ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
+        mPicker.setDefaultAppKey(TEST_ASSIST.flattenToString());
+
+        assertThat(Settings.Secure.getString(mContext.getContentResolver(),
+                Settings.Secure.ASSISTANT))
+                .isEqualTo(TEST_ASSIST.flattenToString());
+        assertThat(mPicker.getDefaultAppKey())
+                .isEqualTo(TEST_ASSIST.flattenToString());
+    }
+
+    @Test
+    public void setDefaultAppKey_noAvaialbleAssit_shouldClearDefaultAssist() {
+        final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
+        ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
+        mPicker.setDefaultAppKey(TEST_ASSIST.flattenToString());
+
+        assertThat(Settings.Secure.getString(mContext.getContentResolver(),
+                Settings.Secure.ASSISTANT))
+                .isEmpty();
+        assertThat(mPicker.getDefaultAppKey())
+                .isNull();
+    }
+
+    @Test
+    public void setDefaultAppKeyToNull_shouldClearDefaultAssist() {
+        final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
+        assistants.add(new DefaultAssistPicker.Info(TEST_ASSIST));
+        ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
+        mPicker.setDefaultAppKey(null);
+
+        assertThat(Settings.Secure.getString(mContext.getContentResolver(),
+                Settings.Secure.ASSISTANT))
+                .isEmpty();
+        assertThat(mPicker.getDefaultAppKey())
+                .isNull();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
new file mode 100644
index 0000000..1182762
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
+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 static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DefaultAssistPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    private DefaultAssistPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new DefaultAssistPreferenceController(mContext);
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    @Config(shadows = {ShadowSecureSettings.class})
+    public void getDefaultAppInfo_hasDefaultAssist_shouldReturnKey() {
+        final String flattenKey = "com.android.settings/assist";
+        ShadowSecureSettings.putString(null, Settings.Secure.ASSISTANT, flattenKey);
+        DefaultAppInfo appInfo = mController.getDefaultAppInfo();
+
+        assertThat(appInfo.getKey()).isEqualTo(flattenKey);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/applications/assist/GestureAssistPreferenceControllerTest.java
similarity index 65%
rename from tests/robotests/src/com/android/settings/users/UserSettingsTest.java
rename to tests/robotests/src/com/android/settings/applications/assist/GestureAssistPreferenceControllerTest.java
index 005ac19..624a01f 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/GestureAssistPreferenceControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,9 +11,10 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License
+ * limitations under the License.
  */
-package com.android.settings.users;
+
+package com.android.settings.applications.assist;
 
 import android.content.Context;
 
@@ -30,36 +31,34 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class UserSettingsTest {
+public class GestureAssistPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
-
     private FakeFeatureFactory mFeatureFactory;
-    private UserSettings mSetting;
+    private GestureAssistPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mSetting = new UserSettings();
+        mController = new GestureAssistPreferenceController(mContext);
     }
 
     @Test
-    public void testShowEmergencyInfoAndAddUsers_IAEnabled_shouldReturnFalse() {
-        when(mFeatureFactory.dashboardFeatureProvider.isEnabled()).thenReturn(true);
-        assertThat(mSetting.showEmergencyInfoAndAddUsersWhenLock(mContext)).isFalse();
-    }
+    public void isAvailable_shouldReturnFeatureProviderValue() {
+        when(mFeatureFactory.assistGestureFeatureProvider.isSupported(any(Context.class)))
+                .thenReturn(true);
+        assertThat(mController.isAvailable()).isTrue();
 
-    @Test
-    public void testShowEmergencyInfoAndAddUsers_IADisabled_shouldReturnTrue() {
-        when(mFeatureFactory.dashboardFeatureProvider.isEnabled()).thenReturn(false);
-        assertThat(mSetting.showEmergencyInfoAndAddUsersWhenLock(mContext)).isTrue();
+        when(mFeatureFactory.assistGestureFeatureProvider.isSupported(any(Context.class)))
+                .thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
     }
-
 }
diff --git a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
new file mode 100644
index 0000000..91d4b51
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.assist;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+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 ManageAssistTest {
+
+    private ManageAssist mSettings;
+
+    @Before
+    public void setUp() {
+        mSettings = new ManageAssist();
+    }
+
+    @Test
+    public void testGetMetricsCategory() {
+        assertThat(mSettings.getMetricsCategory())
+                .isEqualTo(MetricsProto.MetricsEvent.APPLICATIONS_MANAGE_ASSIST);
+    }
+
+    @Test
+    public void testGetCategoryKey() {
+        assertThat(mSettings.getCategoryKey()).isNull();
+    }
+
+    @Test
+    public void testGetPreferenceScreenResId() {
+        assertThat(mSettings.getPreferenceScreenResId())
+                .isEqualTo(R.xml.manage_assist);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
index 6c31927..57668c8 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
@@ -85,7 +85,7 @@
     public void initInfoWithComponent_shouldLoadInfo() {
         when(mComponentName.getPackageName()).thenReturn("com.android.settings");
 
-        mInfo = new DefaultAppInfo(0 /* uid */, mComponentName, null /*summary */);
+        mInfo = new DefaultAppInfo(0 /* uid */, mComponentName);
         mInfo.getKey();
 
         verify(mComponentName).flattenToString();
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
index 10cfba0..644a942 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
@@ -36,7 +36,9 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
@@ -68,7 +70,18 @@
     }
 
     @Test
-    public void isAlwaysAvailable() {
+    public void isAvailable_noBrowser_shouldReturnFalse() {
+        when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
+                .thenReturn(null);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_hasBrowser_shouldReturnTrue() {
+        final List<ResolveInfo> candidates = new ArrayList<>();
+        candidates.add(new ResolveInfo());
+        when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
+                .thenReturn(candidates);
         assertThat(mController.isAvailable()).isTrue();
     }
 
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
index d6dab55..ae67b04 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
@@ -20,8 +20,6 @@
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.isA;
 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.robolectric.Shadows.shadowOf;
 
@@ -29,16 +27,16 @@
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
-import android.app.backup.IBackupManager;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.IBinder;
+import android.os.UserHandle;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.search.SearchIndexableRaw;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,16 +47,20 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
 import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.util.ActivityController;
 import org.robolectric.shadows.ShadowActivity;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import java.util.List;
+
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class})
+        shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class,
+                BackupSettingsActivityTest.ShadowUserHandle.class})
 public class BackupSettingsActivityTest {
     private ActivityController<BackupSettingsActivity> mActivityController;
     private BackupSettingsActivity mActivity;
@@ -85,7 +87,6 @@
         mActivity = mActivityController.get();
         mPackageManager = (RobolectricPackageManager) mApplication.getPackageManager();
         doReturn(mComponent).when(mIntent).getComponent();
-
     }
 
     @Test
@@ -124,6 +125,41 @@
 
     }
 
+    @Test
+    public void getNonIndexableKeys_SystemUser() {
+        final List<SearchIndexableRaw> indexableRaws =
+                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(
+                        mApplication.getApplicationContext(), true);
+        final List<String> nonIndexableKeys =
+                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                        mApplication.getApplicationContext());
+
+        assertThat(indexableRaws).isNotNull();
+        assertThat(indexableRaws).isNotEmpty();
+        assertThat(nonIndexableKeys).isEmpty();
+    }
+
+    @Test
+    public void getNonIndexableKeys_NonSystemUser() {
+        ShadowUserHandle.setUid(1); // Non-SYSTEM user.
+
+        final List<SearchIndexableRaw> indexableRaws =
+                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(
+                        mApplication.getApplicationContext(), true);
+        final List<String> nonIndexableKeys =
+                BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                        mApplication.getApplicationContext());
+
+        assertThat(indexableRaws).isNotNull();
+        assertThat(indexableRaws).isNotEmpty();
+        assertThat(nonIndexableKeys).isNotEmpty();
+    }
+
+    @After
+    public void resetShadows() {
+        ShadowUserHandle.reset();
+    }
+
     @Implements(BackupSettingsHelper.class)
     public static class ShadowBackupSettingsHelper {
         @Implementation
@@ -136,4 +172,23 @@
             return mIsBackupProvidedByOEM;
         }
     }
+
+    @Implements(UserHandle.class)
+    public static class ShadowUserHandle {
+        private static int sUid = 0; // SYSTEM by default
+
+        public static void setUid(int uid) {
+            sUid = uid;
+        }
+
+        @Implementation
+        public static int myUserId() {
+            return sUid;
+        }
+
+        @Resetter
+        public static void reset() {
+            sUid = 0;
+        }
+    }
 }
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 41a2a71..eb6e392 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
@@ -15,35 +15,51 @@
  */
 package com.android.settings.core.instrumentation;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.util.Pair;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.overlay.FeatureFactory;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class MetricsFeatureProviderTest {
 
-    private ShadowApplication mApplication;
-    private Context mContext;
-
     @Mock
     private LogWriter mLogWriter;
+    private Context mContext;
+    private MetricsFeatureProvider mProvider;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mApplication = ShadowApplication.getInstance();
-        mContext = mApplication.getApplicationContext();
+        mContext = RuntimeEnvironment.application;
+        mProvider = new MetricsFeatureProvider();
+        List<LogWriter> writers = new ArrayList<>();
+        writers.add(mLogWriter);
+        ReflectionHelpers.setField(mProvider, "mLoggerWriters", writers);
     }
 
     @Test
@@ -55,4 +71,38 @@
 
         assertThat(feature1 == feature2).isTrue();
     }
+
+    @Test
+    public void logDashboardStartIntent_intentEmpty_shouldNotLog() {
+        mProvider.logDashboardStartIntent(mContext, null /* intent */,
+                MetricsEvent.SETTINGS_GESTURES);
+
+        verifyNoMoreInteractions(mLogWriter);
+    }
+
+    @Test
+    public void logDashboardStartIntent_intentHasNoComponent_shouldLog() {
+        final Intent intent = new Intent(Intent.ACTION_ASSIST);
+
+        mProvider.logDashboardStartIntent(mContext, intent, MetricsEvent.SETTINGS_GESTURES);
+
+        verify(mLogWriter).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(mLogWriter).action(
+                eq(mContext),
+                eq(MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
+                anyString(),
+                eq(Pair.create(MetricsEvent.FIELD_CONTEXT, MetricsEvent.SETTINGS_GESTURES)));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index e985179..b1144f0 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -18,9 +18,11 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.TypedArray;
+import android.content.res.Resources;
 import android.view.View;
+import android.widget.FrameLayout;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
@@ -35,12 +37,16 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+import org.mockito.Matchers;
 import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -48,8 +54,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DashboardAdapterTest {
-    @Mock
-    private Context mContext;
+
     @Mock
     private View mView;
     @Mock
@@ -57,18 +62,29 @@
     @Mock
     private MetricsFeatureProvider mMetricsFeatureProvider;
     @Mock
-    private TypedArray mTypedArray;
+    private Resources mResources;
+    @Mock
+    private DashboardData mDashboardData;
     @Captor
     private ArgumentCaptor<Integer> mActionCategoryCaptor = ArgumentCaptor.forClass(Integer.class);
     @Captor
     private ArgumentCaptor<String> mActionPackageCaptor = ArgumentCaptor.forClass(String.class);
     private DashboardAdapter mDashboardAdapter;
+    private DashboardAdapter.DashboardItemHolder mSuggestionHolder;
+    private DashboardData.SuggestionHeaderData mSuggestionHeaderData;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mDashboardAdapter = new DashboardAdapter(mContext, null, mMetricsFeatureProvider,
+        Context context = RuntimeEnvironment.application;
+        context = spy(context);
+        when(context.getResources()).thenReturn(mResources);
+        when(mResources
+                .getQuantityString(any(int.class), any(int.class), Matchers.<Object>anyVararg()))
+                .thenReturn("");
+        mDashboardAdapter = new DashboardAdapter(context, null, mMetricsFeatureProvider,
                 null, null);
+        mSuggestionHeaderData = new DashboardData.SuggestionHeaderData(true, 1, 0);
         when(mView.getTag()).thenReturn(mCondition);
     }
 
@@ -81,20 +97,29 @@
     }
 
     @Test
-    public void testSuggestionsLogs() {
-        when(mTypedArray.getColor(any(int.class), any(int.class))).thenReturn(0);
-        when(mContext.obtainStyledAttributes(any(int[].class))).thenReturn(mTypedArray);
-        List<Tile> suggestions = new ArrayList<Tile>();
-        suggestions.add(makeSuggestion("pkg1", "cls1"));
-        suggestions.add(makeSuggestion("pkg2", "cls2"));
-        suggestions.add(makeSuggestion("pkg3", "cls3"));
-        mDashboardAdapter.setCategoriesAndSuggestions(
-                new ArrayList<DashboardCategory>(), suggestions);
+    public void testSuggestionsLogs_NotExpanded() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        verify(mMetricsFeatureProvider, times(2)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg2"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_NotExpandedAndPaused() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
         mDashboardAdapter.onPause();
         verify(mMetricsFeatureProvider, times(4)).action(
-             any(Context.class), mActionCategoryCaptor.capture(), mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[] {"pkg1", "pkg2", "pkg1", "pkg2"};
-        Integer[] expectedActions = new Integer[] {
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg2", "pkg1", "pkg2"};
+        Integer[] expectedActions = new Integer[]{
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
@@ -103,6 +128,188 @@
         assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
     }
 
+    @Test
+    public void testSuggestionsLogs_Expanded() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        verify(mMetricsFeatureProvider, times(3)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg2", "pkg3"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedAndPaused() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        mDashboardAdapter.onPause();
+        verify(mMetricsFeatureProvider, times(6)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedAfterPause() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        mDashboardAdapter.onPause();
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        verify(mMetricsFeatureProvider, times(7)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{
+                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedAfterPauseAndPausedAgain() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        mDashboardAdapter.onPause();
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        mDashboardAdapter.onPause();
+        verify(mMetricsFeatureProvider, times(10)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{
+                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShown() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        verify(mMetricsFeatureProvider, times(1)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAndPaused() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        mDashboardAdapter.onPause();
+        verify(mMetricsFeatureProvider, times(2)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg1"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPause() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        mDashboardAdapter.onPause();
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        verify(mMetricsFeatureProvider, times(3)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg1", "pkg1"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    @Test
+    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPauseAndPausedAgain() {
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        mDashboardAdapter.onPause();
+        mDashboardAdapter.onBindSuggestionHeader(
+                mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        mDashboardAdapter.onPause();
+        verify(mMetricsFeatureProvider, times(4)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture());
+        String[] expectedPackages = new String[]{"pkg1", "pkg1", "pkg1", "pkg1"};
+        Integer[] expectedActions = new Integer[]{
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
+        };
+        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+    }
+
+    private List<Tile> makeSuggestions(String[] pkgNames) {
+        List<Tile> suggestions = new ArrayList<Tile>();
+        for (String pkgName : pkgNames) {
+            suggestions.add(makeSuggestion(pkgName, "cls"));
+        }
+        return suggestions;
+    }
+
     private Tile makeSuggestion(String pkgName, String className) {
         Tile suggestion = new Tile();
         suggestion.intent = new Intent("action");
@@ -110,4 +317,12 @@
         return suggestion;
     }
 
+    private void setUpSuggestions(List<Tile> suggestions) {
+        mDashboardAdapter.setCategoriesAndSuggestions(
+                new ArrayList<DashboardCategory>(), suggestions);
+        mSuggestionHolder = mDashboardAdapter.onCreateViewHolder(
+                new FrameLayout(RuntimeEnvironment.application),
+                mDashboardAdapter.getItemViewType(0));
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index 33eb29f..5902ec0 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -32,6 +32,7 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.CategoryManager;
 import com.android.settingslib.drawer.DashboardCategory;
@@ -56,14 +57,15 @@
 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.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 
 @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 DashboardFeatureProviderImplTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -131,8 +133,7 @@
 
     @Test
     public void bindPreference_noFragmentMetadata_shouldBindToProfileSelector() {
-        final Preference preference = new Preference(
-                ShadowApplication.getInstance().getApplicationContext());
+        final Preference preference = new Preference(RuntimeEnvironment.application);
         final Tile tile = new Tile();
         tile.metaData = new Bundle();
         tile.userHandle = new ArrayList<>();
@@ -141,7 +142,7 @@
         tile.intent = new Intent();
         tile.intent.setComponent(new ComponentName("pkg", "class"));
 
-        when(mActivity.getSystemService(Context.USER_SERVICE))
+        when(mActivity.getApplicationContext().getSystemService(Context.USER_SERVICE))
                 .thenReturn(mUserManager);
 
         mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
@@ -153,8 +154,7 @@
 
     @Test
     public void bindPreference_noFragmentMetadataSingleUser_shouldBindToDirectLaunchIntent() {
-        final Preference preference = new Preference(
-                ShadowApplication.getInstance().getApplicationContext());
+        final Preference preference = new Preference(RuntimeEnvironment.application);
         final Tile tile = new Tile();
         tile.metaData = new Bundle();
         tile.userHandle = new ArrayList<>();
@@ -168,10 +168,11 @@
         mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
                 preference, tile, "123", Preference.DEFAULT_ORDER);
         preference.getOnPreferenceClickListener().onPreferenceClick(null);
-        verify(mFeatureFactory.metricsFeatureProvider).action(
+
+        verify(mFeatureFactory.metricsFeatureProvider).logDashboardStartIntent(
                 any(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
-                eq(tile.intent.getComponent().flattenToString()));
+                any(Intent.class),
+                eq(MetricsProto.MetricsEvent.SETTINGS_GESTURES));
         verify(mActivity)
                 .startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
     }
@@ -195,18 +196,17 @@
         mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
                 preference, tile, "123", Preference.DEFAULT_ORDER);
         preference.getOnPreferenceClickListener().onPreferenceClick(null);
-        verify(mFeatureFactory.metricsFeatureProvider, never()).action(
+        verify(mFeatureFactory.metricsFeatureProvider).logDashboardStartIntent(
                 any(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
-                eq(tile.intent.getComponent().flattenToString()));
+                any(Intent.class),
+                anyInt());
         verify(mActivity)
                 .startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
     }
 
     @Test
     public void bindPreference_withNullKeyNullPriority_shouldGenerateKeyAndPriority() {
-        final Preference preference = new Preference(
-                ShadowApplication.getInstance().getApplicationContext());
+        final Preference preference = new Preference(RuntimeEnvironment.application);
         final Tile tile = new Tile();
         tile.intent = new Intent();
         tile.intent.setComponent(new ComponentName("pkg", "class"));
@@ -219,8 +219,7 @@
 
     @Test
     public void bindPreference_withNullKeyTileKey_shouldUseTileKey() {
-        final Preference preference = new Preference(
-                ShadowApplication.getInstance().getApplicationContext());
+        final Preference preference = new Preference(RuntimeEnvironment.application);
         final Tile tile = new Tile();
         tile.key = "key";
         tile.intent = new Intent();
@@ -234,8 +233,7 @@
     @Test
     public void bindPreference_withBaseOrder_shouldOffsetPriority() {
         final int baseOrder = 100;
-        final Preference preference = new Preference(
-                ShadowApplication.getInstance().getApplicationContext());
+        final Preference preference = new Preference(RuntimeEnvironment.application);
         final Tile tile = new Tile();
         tile.metaData = new Bundle();
         tile.priority = 10;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
new file mode 100644
index 0000000..6b22f7b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Fragment;
+import android.content.Context;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settings.search.Indexable;
+import com.android.settings.search2.DatabaseIndexingUtils;
+
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+public class DashboardFragmentSearchIndexProviderInspector {
+
+    public static boolean isSharingPreferenceControllers(Class clazz) {
+        final Context context = RuntimeEnvironment.application;
+        final Fragment fragment;
+        try {
+            fragment = Fragment.instantiate(context, clazz.getName());
+        } catch (Throwable e) {
+            // Can't do much with exception, assume the test passed.
+            return true;
+        }
+        if (!(fragment instanceof DashboardFragment)) {
+            return true;
+        }
+
+        final Indexable.SearchIndexProvider provider =
+                DatabaseIndexingUtils.getSearchIndexProvider(clazz);
+        if (provider == null) {
+            return true;
+        }
+        final List<PreferenceController> controllersFromSearchIndexProvider;
+        final List<PreferenceController> controllersFromFragment;
+        try {
+            controllersFromSearchIndexProvider = provider.getPreferenceControllers(context);
+        } catch (Throwable e) {
+            // Can't do much with exception, assume the test passed.
+            return true;
+        }
+        try {
+            controllersFromFragment =
+                    ((DashboardFragment) fragment).getPreferenceControllers(context);
+        } catch (Throwable e) {
+            // Can't do much with exception, assume the test passed.
+            return true;
+        }
+
+        if (controllersFromFragment == controllersFromSearchIndexProvider) {
+            return true;
+        } else if (controllersFromFragment != null && controllersFromSearchIndexProvider != null) {
+            return controllersFromFragment.size() == controllersFromSearchIndexProvider.size();
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
index 62866c9..b3f9fe0 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
@@ -34,6 +34,7 @@
 import org.robolectric.util.ReflectionHelpers;
 
 import static org.mockito.Matchers.anyList;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -41,6 +42,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DashboardSummaryTest {
@@ -93,11 +95,19 @@
     }
 
     @Test
-    public void onCategoryChanged_updateCategoryOnly() {
+    public void onCategoryChanged_noRebuildOnFirstCall() {
         doReturn(mock(Activity.class)).when(mSummary).getActivity();
-        when(mDashboardFeatureProvider.isEnabled()).thenReturn(true);
-
+        doNothing().when(mSummary).rebuildUI();
         mSummary.onCategoriesChanged();
-        verify(mAdapter).setCategory(anyList());
+        verify(mSummary, never()).rebuildUI();
+    }
+
+    @Test
+    public void onCategoryChanged_rebuildOnSecondCall() {
+        doReturn(mock(Activity.class)).when(mSummary).getActivity();
+        doNothing().when(mSummary).rebuildUI();
+        mSummary.onCategoriesChanged();
+        mSummary.onCategoriesChanged();
+        verify(mSummary).rebuildUI();
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/suggestions/EventStoreTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/suggestions/EventStoreTest.java
rename to tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
index 9db11b8..4b9e440 100644
--- a/tests/robotests/src/com/android/settings/suggestions/EventStoreTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
diff --git a/tests/robotests/src/com/android/settings/suggestions/SuggestionFeaturizerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/suggestions/SuggestionFeaturizerTest.java
rename to tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
index 3c5bd4f..cb4ce71 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SuggestionFeaturizerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import java.util.Arrays;
 import java.util.Map;
diff --git a/tests/robotests/src/com/android/settings/suggestions/SuggestionRankerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/suggestions/SuggestionRankerTest.java
rename to tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
index 086161b..056d959 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SuggestionRankerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
new file mode 100644
index 0000000..5167c68
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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.shadows.ShadowApplication;
+import org.robolectric.shadows.ShadowToast;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class TelephonyMonitorPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private TelephonyMonitorPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        SettingsShadowSystemProperties.clear();
+        mController = new TelephonyMonitorPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void isAvailable_trueShowFlagWithUserdebugBuild_shouldReturnTrue() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
+                .thenReturn(true);
+        SettingsShadowSystemProperties.set(
+                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void isAvailable_trueShowFlagWithEngBuild_shouldReturnTrue() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
+                .thenReturn(true);
+        SettingsShadowSystemProperties.set(
+                TelephonyMonitorPreferenceController.BUILD_TYPE, "eng");
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void isAvailable_trueShowFlagWithUserBuild_shouldReturnFalse() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
+                .thenReturn(true);
+        SettingsShadowSystemProperties.set(
+                TelephonyMonitorPreferenceController.BUILD_TYPE, "user");
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void isAvailable_falseShowFlagWithUserdebugBuild_shouldReturnFalse() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
+                .thenReturn(false);
+        SettingsShadowSystemProperties.set(
+                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void isAvailable_falseShowFlagWithEngBuild_shouldReturnFalse() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
+                .thenReturn(false);
+        SettingsShadowSystemProperties.set(
+                TelephonyMonitorPreferenceController.BUILD_TYPE, "eng");
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void isAvailable_falseShowFlagWithUserBuild_shouldReturnFalse() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
+                .thenReturn(false);
+        SettingsShadowSystemProperties.set(
+                TelephonyMonitorPreferenceController.BUILD_TYPE, "user");
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void displayPreference_telephonyMonitorEnabled_shouldCheckedPreference() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
+                .thenReturn(true);
+        SettingsShadowSystemProperties.set(
+                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR, "true");
+        SettingsShadowSystemProperties.set(
+                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void displayPreference_telephonyMonitorDisabled_shouldUncheckedPreference() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
+                .thenReturn(true);
+        SettingsShadowSystemProperties.set(
+                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR, "false");
+        SettingsShadowSystemProperties.set(
+                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void handlePreferenceTreeClick_preferenceChecked_shouldEnableTelephonyMonitor() {
+        when(mPreference.isChecked()).thenReturn(true);
+
+        when(mContext.getResources().getString(R.string.telephony_monitor_toast))
+                .thenReturn("To apply telephony monitor change, reboot device");
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(SystemProperties.getBoolean(
+                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR, false)).isTrue();
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableTelephonyMonitor() {
+        when(mPreference.isChecked()).thenReturn(false);
+
+        when(mContext.getResources().getString(R.string.telephony_monitor_toast))
+                .thenReturn("To apply telephony monitor change, reboot device");
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(SystemProperties.getBoolean(
+                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR, false)).isFalse();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
new file mode 100644
index 0000000..b54fc53
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.os.SystemProperties;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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.shadows.ShadowSystemProperties;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BasebandVersionPreferenceControllerTest {
+
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private ConnectivityManager mCm;
+    @Mock
+    private Preference mPreference;
+
+    private BasebandVersionPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new BasebandVersionPreferenceController(mContext);
+        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(mCm);
+    }
+
+    @Test
+    public void isAvailable_wifiOnly_shouldReturnFalse() {
+        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_hasMobile_shouldReturnTrue() {
+        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true);
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void updateState_shouldLoadFromSysProperty() {
+        SettingsShadowSystemProperties.set("gsm.version.baseband", "test");
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary("test");
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
index 81372cc..5455b13 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -25,9 +25,12 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.DevelopmentSettings;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,14 +38,19 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -61,16 +69,22 @@
     @Mock
     private UserManager mUserManager;
 
+    private Lifecycle mLifecycle;
+    private FakeFeatureFactory mFactory;
     private Preference mPreference;
     private BuildNumberPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        mController = new BuildNumberPreferenceController(mContext, mActivity, mFragment);
+        FakeFeatureFactory.setupForTest(mContext);
+        mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mLifecycle = new Lifecycle();
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        mController = new BuildNumberPreferenceController(
+                mContext, mActivity, mFragment, mLifecycle);
 
-        mPreference = new Preference(ShadowApplication.getInstance().getApplicationContext());
+        mPreference = new Preference(RuntimeEnvironment.application);
         mPreference.setKey(mController.getPreferenceKey());
     }
 
@@ -97,27 +111,39 @@
     @Test
     public void handlePrefTreeClick_deviceNotProvisioned_doNothing() {
         when(mUserManager.isAdminUser()).thenReturn(true);
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
+        final Context context = RuntimeEnvironment.application;
         Settings.Global.putInt(context.getContentResolver(),
                 Settings.Global.DEVICE_PROVISIONED, 0);
 
-        mController = new BuildNumberPreferenceController(context, mActivity, mFragment);
+        mController = new BuildNumberPreferenceController(
+                context, mActivity, mFragment, mLifecycle);
+        ReflectionHelpers.setField(mController, "mContext", context);
+        ReflectionHelpers.setField(mController, "mUm", mUserManager);
 
         assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
+        verify(mFactory.metricsFeatureProvider).action(
+                any(Context.class),
+                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF));
     }
 
     @Test
-    public void handlePrefTreeClick_userHasRestrction_doNothing() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
+    public void handlePrefTreeClick_userHasRestriction_doNothing() {
+        final Context context = spy(RuntimeEnvironment.application);
         Settings.Global.putInt(context.getContentResolver(),
                 Settings.Global.DEVICE_PROVISIONED, 1);
+
+        when(mUserManager.isAdminUser()).thenReturn(true);
         when(mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES))
                 .thenReturn(true);
 
-        mController = new BuildNumberPreferenceController(context, mActivity, mFragment);
+        mController = new BuildNumberPreferenceController(
+                mContext, mActivity, mFragment, mLifecycle);
+        ReflectionHelpers.setField(mController, "mContext", context);
 
         assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
+        verify(mFactory.metricsFeatureProvider).action(
+                any(Context.class),
+                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF));
     }
 
     @Test
@@ -148,7 +174,8 @@
     public void onActivityResult_confirmPasswordRequestCompleted_enableDevPref() {
         final Context context = ShadowApplication.getInstance().getApplicationContext();
 
-        mController = new BuildNumberPreferenceController(context, mActivity, mFragment);
+        mController = new BuildNumberPreferenceController(
+                context, mActivity, mFragment, mLifecycle);
 
         final boolean activityResultHandled = mController.onActivityResult(
                 BuildNumberPreferenceController.REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF,
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
new file mode 100644
index 0000000..06d81de
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+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.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DeviceModelPreferenceControllerTest {
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private DeviceModelPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new DeviceModelPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+                .thenReturn(mPreference);
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void displayPref_shouldSetSummary() {
+        mController.displayPreference(mPreferenceScreen);
+
+        verify(mPreference).setSummary(anyString());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
new file mode 100644
index 0000000..7b2b198
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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 static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class FccEquipmentIdPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private FccEquipmentIdPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new FccEquipmentIdPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+                .thenReturn(mPreference);
+    }
+
+    @Test
+    public void isAvailable_configEmpty_shouldReturnFalse() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @Config(shadows = SettingsShadowSystemProperties.class)
+    public void isAvailable_configNonEmpty_shouldReturnTrue() {
+        SettingsShadowSystemProperties.set("ro.ril.fccid", "fcc_equipment");
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
new file mode 100644
index 0000000..1cbd147
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.Fragment;
+import android.content.Context;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+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.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class FeedbackPreferenceControllerTest {
+    @Mock
+    private Fragment mFragment;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    private FeedbackPreferenceController mController;
+
+    public FeedbackPreferenceControllerTest() {
+    }
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        this.mController = new FeedbackPreferenceController(this.mFragment, this.mContext);
+    }
+
+    @Test
+    public void isAvailable_noReporterPackage_shouldReturnFalse() {
+        when(this.mContext.getResources().getString(anyInt())).thenReturn("");
+        assertThat(Boolean.valueOf(this.mController.isAvailable())).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
new file mode 100644
index 0000000..732ba22
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class FirmwareVersionPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private UserManager mUserManager;
+    private FirmwareVersionPreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mLifecycle = new Lifecycle();
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(null);
+        mController = new FirmwareVersionPreferenceController(mContext, mLifecycle);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+                .thenReturn(mPreference);
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
new file mode 100644
index 0000000..8d47135
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+
+import com.android.settings.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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class KernelVersionPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    private KernelVersionPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new KernelVersionPreferenceController(mContext);
+    }
+
+    @Test
+    public void alwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
new file mode 100644
index 0000000..1196833
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+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.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ManualPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    private ManualPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new ManualPreferenceController(mContext);
+    }
+
+    @Test
+    public void isAvailable_configTurnedOff_shouldReturnFalse() {
+        when(mContext.getResources().getBoolean(anyInt()))
+                .thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_configTurnedOn_shouldReturnTrue() {
+        when(mContext.getResources().getBoolean(anyInt()))
+                .thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
new file mode 100644
index 0000000..87e8e1b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+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.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class RegulatoryInfoPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PackageManager mPackageManager;
+    private RegulatoryInfoPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        mController = new RegulatoryInfoPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+                .thenReturn(mPreference);
+    }
+
+    @Test
+    public void isAvailable_hasIntent_returnTrue() {
+        final List<ResolveInfo> activities = new ArrayList<>();
+        activities.add(new ResolveInfo());
+        when(mPackageManager.queryIntentActivities(any(Intent.class), eq(0)))
+                .thenReturn(activities);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_hasNoIntent_returnFalse() {
+        final List<ResolveInfo> activities = new ArrayList<>();
+        when(mPackageManager.queryIntentActivities(any(Intent.class), eq(0)))
+                .thenReturn(activities);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
index f16304e..e2a46de 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
@@ -79,11 +79,4 @@
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
     }
-
-    @Test
-    public void testInitializeVolumeDoesntBreakOnNullVolume() {
-        VolumeInfo info = new VolumeInfo("id", 0, new DiskInfo("id", 0), "");
-        when(mStorageManager.findVolumeById(anyString())).thenReturn(info);
-        mFragment.initializeVolume(mStorageManager, new Bundle());
-    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
new file mode 100644
index 0000000..7222f53
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.storage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.SparseArray;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.UserManagerWrapper;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.applications.StorageStatsSource;
+
+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.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SecondaryUserControllerTest {
+    private static final String TEST_NAME = "Fred";
+    private static final String TARGET_PREFERENCE_GROUP_KEY = "pref_secondary_users";
+    @Mock
+    private UserManagerWrapper mUserManager;
+
+    private Context mContext;
+    private SecondaryUserController mController;
+    private UserInfo mPrimaryUser;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mPrimaryUser = new UserInfo();
+        mController = new SecondaryUserController(mContext, mPrimaryUser);
+    }
+
+    @Test
+    public void controllerAddsSecondaryUser() throws Exception {
+        mPrimaryUser.name = TEST_NAME;
+        PreferenceScreen screen = mock(PreferenceScreen.class);
+        PreferenceGroup group = mock(PreferenceGroup.class);
+        when(screen.findPreference(anyString())).thenReturn(group);
+        when(group.getKey()).thenReturn(TARGET_PREFERENCE_GROUP_KEY);
+        mController.displayPreference(screen);
+
+        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
+        verify(group).addPreference(argumentCaptor.capture());
+        Preference preference = argumentCaptor.getValue();
+        assertThat(preference.getTitle()).isEqualTo(TEST_NAME);
+    }
+
+    @Test
+    public void controllerUpdatesSummaryOfNewPreference() throws Exception {
+        mPrimaryUser.name = TEST_NAME;
+        PreferenceScreen screen = mock(PreferenceScreen.class);
+        PreferenceGroup group = mock(PreferenceGroup.class);
+        when(screen.findPreference(anyString())).thenReturn(group);
+        when(group.getKey()).thenReturn(TARGET_PREFERENCE_GROUP_KEY);
+        mController.displayPreference(screen);
+        mController.setSize(10L);
+        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
+
+        verify(group).addPreference(argumentCaptor.capture());
+
+        Preference preference = argumentCaptor.getValue();
+        assertThat(preference.getSummary()).isEqualTo("10.00B");
+    }
+
+    @Test
+    public void noSecondaryUserAddedIfNoneExist() throws Exception {
+        ArrayList<UserInfo> userInfos = new ArrayList<>();
+        userInfos.add(mPrimaryUser);
+        when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
+        when(mUserManager.getUsers()).thenReturn(userInfos);
+        List<PreferenceController> controllers =
+                SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
+
+        assertThat(controllers).hasSize(1);
+        // We should have the NoSecondaryUserController.
+        assertThat(controllers.get(0) instanceof SecondaryUserController).isFalse();
+    }
+
+    @Test
+    public void secondaryUserAddedIfHasDistinctId() throws Exception {
+        ArrayList<UserInfo> userInfos = new ArrayList<>();
+        UserInfo secondaryUser = new UserInfo();
+        secondaryUser.id = 10;
+        secondaryUser.profileGroupId = 101010; // this just has to be something not 0
+        userInfos.add(mPrimaryUser);
+        userInfos.add(secondaryUser);
+        when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
+        when(mUserManager.getUsers()).thenReturn(userInfos);
+        List<PreferenceController> controllers =
+                SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
+
+        assertThat(controllers).hasSize(1);
+        assertThat(controllers.get(0) instanceof SecondaryUserController).isTrue();
+    }
+
+    @Test
+    public void profilesOfPrimaryUserAreNotIgnored() throws Exception {
+        ArrayList<UserInfo> userInfos = new ArrayList<>();
+        UserInfo secondaryUser = new UserInfo();
+        secondaryUser.id = mPrimaryUser.id;
+        userInfos.add(mPrimaryUser);
+        userInfos.add(secondaryUser);
+        when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
+        when(mUserManager.getUsers()).thenReturn(userInfos);
+
+        List<PreferenceController> controllers =
+                SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
+
+        assertThat(controllers).hasSize(2);
+        assertThat(controllers.get(0) instanceof UserProfileController).isTrue();
+        assertThat(controllers.get(1) instanceof SecondaryUserController).isFalse();
+    }
+
+    @Test
+    public void controllerUpdatesPreferenceOnAcceptingResult() throws Exception {
+        mPrimaryUser.name = TEST_NAME;
+        mPrimaryUser.id = 10;
+        PreferenceScreen screen = mock(PreferenceScreen.class);
+        PreferenceGroup group = mock(PreferenceGroup.class);
+        when(screen.findPreference(anyString())).thenReturn(group);
+        when(group.getKey()).thenReturn(TARGET_PREFERENCE_GROUP_KEY);
+        mController.displayPreference(screen);
+        StorageAsyncLoader.AppsStorageResult userResult =
+                new StorageAsyncLoader.AppsStorageResult();
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
+        userResult.externalStats = new StorageStatsSource.ExternalStorageStats(99, 33, 33, 33);
+        result.put(10, userResult);
+
+        mController.handleResult(result);
+        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
+        verify(group).addPreference(argumentCaptor.capture());
+        Preference preference = argumentCaptor.getValue();
+
+        assertThat(preference.getSummary()).isEqualTo("99.00B");
+    }
+}
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 d9e1f6d..4622850 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -44,6 +44,7 @@
 import com.android.settings.applications.ManageApplications;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
 import org.junit.Before;
@@ -223,7 +224,7 @@
 
         result.gamesSize = KILOBYTE * 8;
         result.otherAppsSize = KILOBYTE * 9;
-        mController.onLoadFinished(null, result);
+        mController.onLoadFinished(result);
 
         assertThat(audio.getSummary().toString()).isEqualTo("14.00KB"); // 4KB apps + 10KB files
         assertThat(image.getSummary().toString()).isEqualTo("35.00KB"); // 15KB video + 20KB images
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
new file mode 100644
index 0000000..2cd4f76
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.storage;
+
+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.content.Context;
+import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.SparseArray;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.SubSettings;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.UserManagerWrapper;
+import com.android.settings.deviceinfo.StorageProfileFragment;
+import com.android.settingslib.applications.StorageStatsSource;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class UserProfileControllerTest {
+    private static final String TEST_NAME = "Fred";
+
+    @Mock
+    private UserManagerWrapper mUserManager;
+
+    private Context mContext;
+    private UserProfileController mController;
+    private UserInfo mPrimaryProfile;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        mPrimaryProfile = new UserInfo();
+        mController = new UserProfileController(mContext, mPrimaryProfile, 0);
+    }
+
+    @Test
+    public void controllerAddsPrimaryProfilePreference() throws Exception {
+        mPrimaryProfile.name = TEST_NAME;
+        mPrimaryProfile.id = 10;
+        PreferenceScreen screen = mock(PreferenceScreen.class);
+        mController.displayPreference(screen);
+
+        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
+        verify(screen).addPreference(argumentCaptor.capture());
+        Preference preference = argumentCaptor.getValue();
+
+        assertThat(preference.getTitle()).isEqualTo(TEST_NAME);
+        assertThat(preference.getKey()).isEqualTo("pref_profile_10");
+    }
+
+    @Test
+    public void tappingProfilePreferenceSendsToStorageProfileFragment() throws Exception {
+        mPrimaryProfile.name = TEST_NAME;
+        mPrimaryProfile.id = 10;
+        PreferenceScreen screen = mock(PreferenceScreen.class);
+        mController.displayPreference(screen);
+
+        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
+        verify(screen).addPreference(argumentCaptor.capture());
+        Preference preference = argumentCaptor.getValue();
+        assertThat(mController.handlePreferenceTreeClick(preference)).isTrue();
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(mContext).startActivity(intentCaptor.capture());
+
+        Intent intent = intentCaptor.getValue();
+        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
+        assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
+                StorageProfileFragment.class.getName());
+    }
+
+    @Test
+    public void acceptingResultUpdatesPreferenceSize() throws Exception {
+        mPrimaryProfile.name = TEST_NAME;
+        mPrimaryProfile.id = 10;
+        PreferenceScreen screen = mock(PreferenceScreen.class);
+        mController.displayPreference(screen);
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
+        StorageAsyncLoader.AppsStorageResult userResult =
+                new StorageAsyncLoader.AppsStorageResult();
+        userResult.externalStats = new StorageStatsSource.ExternalStorageStats(99, 33, 33, 33);
+        result.put(10, userResult);
+
+        mController.handleResult(result);
+        final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
+        verify(screen).addPreference(argumentCaptor.capture());
+        Preference preference = argumentCaptor.getValue();
+
+        assertThat(preference.getSummary()).isEqualTo("99.00B");
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
new file mode 100644
index 0000000..fe3e7fd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import com.android.settings.R;
+import com.android.settings.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;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ThemePreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private Context mContext;
+
+    private ThemePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = spy(new ThemePreferenceController(mContext));
+    }
+
+    @Test
+    public void updateState_nullTheme_shouldSetSummaryToDefault() {
+        final String[] themes = {"Theme1", "Theme2"};
+        doReturn(null).when(mController).getCurrentTheme();
+        doReturn(themes).when(mController).getAvailableThemes();
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(mContext.getString(R.string.default_theme));
+    }
+
+    @Test
+    public void updateState_themeSet_shouldSetPreferenceValue() {
+        final String[] themes = {"Theme1", "Theme2"};
+        doReturn("Theme1").when(mController).getCurrentTheme();
+        doReturn(themes).when(mController).getAvailableThemes();
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue("Theme1");
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
index 66233f5..6442242 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.enterprise;
 
+import android.content.Context;
+
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
@@ -53,7 +55,7 @@
     private class AdminActionPreferenceControllerBaseTestable extends
             AdminActionPreferenceControllerBase {
         AdminActionPreferenceControllerBaseTestable() {
-            super(mContext);
+            super(AdminActionPreferenceControllerBaseTest.this.mContext);
         }
 
         @Override
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java
index c8cb69c..59043ed 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java
@@ -54,7 +54,7 @@
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
     }
 
-    protected abstract void setDate(Date date);
+    public abstract void setDate(Date date);
 
     @Test
     public void testUpdateState() {
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
index 610692d..68ded37 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
@@ -80,7 +80,7 @@
     @Test
     public void testUpdateState() {
         final Preference preference = new Preference(mContext, null, 0, 0);
-        preference.setVisible(true);
+        preference.setVisible(false);
 
         setNumberOfPackagesWithAdminGrantedPermissions(20);
         when(mContext.getResources().getQuantityString(mStringResourceId, 20, 20))
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index 7724db8..9b955e4 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -55,8 +55,8 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class EnterprisePrivacyFeatureProviderImplTest {
 
-    private final ComponentName DEVICE_OWNER = new ComponentName("dummy", "component");
-    private final String DEVICE_OWNER_ORGANIZATION = new String("ACME");
+    private final ComponentName OWNER = new ComponentName("dummy", "component");
+    private final String OWNER_ORGANIZATION = new String("ACME");
     private final Date TIMESTAMP = new Date(2011, 11, 11);
     private final int MY_USER_ID = UserHandle.myUserId();
     private final int MANAGED_PROFILE_USER_ID = MY_USER_ID + 1;
@@ -91,13 +91,13 @@
         when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
         assertThat(mProvider.hasDeviceOwner()).isFalse();
 
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(DEVICE_OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
         assertThat(mProvider.hasDeviceOwner()).isTrue();
     }
 
     @Test
     public void testIsInCompMode() {
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(DEVICE_OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
         assertThat(mProvider.isInCompMode()).isFalse();
 
         mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
@@ -116,18 +116,17 @@
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more),
                 new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(context), 0);
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(DEVICE_OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
         when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(null);
         assertThat(mProvider.getDeviceOwnerDisclosure(context)).isEqualTo(disclosure);
 
         disclosure = new SpannableStringBuilder();
         disclosure.append(mResources.getString(R.string.do_disclosure_with_name,
-                DEVICE_OWNER_ORGANIZATION));
+                OWNER_ORGANIZATION));
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more),
                 new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(context), 0);
-        when(mDevicePolicyManager.getDeviceOwnerOrganizationName())
-                .thenReturn(DEVICE_OWNER_ORGANIZATION);
+        when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(OWNER_ORGANIZATION);
         assertThat(mProvider.getDeviceOwnerDisclosure(context)).isEqualTo(disclosure);
     }
 
@@ -193,4 +192,29 @@
                 ProxyInfo.buildDirectProxy("localhost", 123));
         assertThat(mProvider.isGlobalHttpProxySet()).isTrue();
     }
+
+    @Test
+    public void testGetMaximumFailedPasswordsForWipeInPrimaryUser() {
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
+        when(mDevicePolicyManager.getDeviceOwnerUserId()).thenReturn(UserHandle.USER_NULL);
+        assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInPrimaryUser()).isEqualTo(0);
+
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerUserId()).thenReturn(UserHandle.USER_SYSTEM);
+        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(OWNER, UserHandle.USER_SYSTEM))
+                .thenReturn(10);
+        assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInPrimaryUser()).isEqualTo(10);
+    }
+
+    @Test
+    public void testGetMaximumFailedPasswordsForWipeInManagedProfile() {
+        when(mDevicePolicyManager.getProfileOwnerAsUser(MANAGED_PROFILE_USER_ID)).thenReturn(OWNER);
+        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(OWNER, MANAGED_PROFILE_USER_ID))
+                .thenReturn(10);
+
+        assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInManagedProfile()).isEqualTo(0);
+
+        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInManagedProfile()).isEqualTo(10);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
index 2559769..6c062ae 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
@@ -73,7 +73,7 @@
         final List<PreferenceController> controllers = mSettings.getPreferenceControllers(
                 ShadowApplication.getInstance().getApplicationContext());
         assertThat(controllers).isNotNull();
-        assertThat(controllers.size()).isEqualTo(12);
+        assertThat(controllers.size()).isEqualTo(14);
         assertThat(controllers.get(0)).isInstanceOf(InstalledPackagesPreferenceController.class);
         assertThat(controllers.get(1)).isInstanceOf(NetworkLogsPreferenceController.class);
         assertThat(controllers.get(2)).isInstanceOf(BugReportsPreferenceController.class);
@@ -93,5 +93,7 @@
         assertThat(controllers.get(10)).isInstanceOf(
                 AlwaysOnVpnManagedProfilePreferenceController.class);
         assertThat(controllers.get(11)).isInstanceOf(GlobalHttpProxyPreferenceController.class);
+        assertThat(controllers.get(12)).isInstanceOf(FailedPasswordWipePrimaryUserPreferenceController.class);
+        assertThat(controllers.get(13)).isInstanceOf(FailedPasswordWipeManagedProfilePreferenceController.class);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
new file mode 100644
index 0000000..29952a7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests for {@link FailedPasswordWipeManagedProfilePreferenceController}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class FailedPasswordWipeManagedProfilePreferenceControllerTest extends
+        FailedPasswordWipePreferenceControllerTestBase {
+
+    private int mMaximumFailedPasswordsBeforeWipe = 0;
+
+    public FailedPasswordWipeManagedProfilePreferenceControllerTest() {
+        super("failed_password_wipe_managed_profile",
+                R.plurals.enterprise_privacy_failed_password_wipe_work);
+    }
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        mController = new FailedPasswordWipeManagedProfilePreferenceController(mContext);
+    }
+
+    @Override
+    public void setMaximumFailedPasswordsBeforeWipe(int maximum) {
+        when(mFeatureFactory.enterprisePrivacyFeatureProvider
+                .getMaximumFailedPasswordsBeforeWipeInManagedProfile()).thenReturn(maximum);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
new file mode 100644
index 0000000..97d0d6d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+/**
+ * Tests for {@link FailedPasswordWipePreferenceControllerBase}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class FailedPasswordWipePreferenceControllerBaseTest extends
+        FailedPasswordWipePreferenceControllerTestBase {
+
+    private int mMaximumFailedPasswordsBeforeWipe = 0;
+
+    public FailedPasswordWipePreferenceControllerBaseTest() {
+        super(null, 123 /* stringResourceId */);
+    }
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        mController = new FailedPasswordWipePreferenceControllerBaseTestable();
+    }
+
+    @Override
+    public void setMaximumFailedPasswordsBeforeWipe(int maximum) {
+        mMaximumFailedPasswordsBeforeWipe = maximum;
+    }
+
+    private class FailedPasswordWipePreferenceControllerBaseTestable extends
+            FailedPasswordWipePreferenceControllerBase {
+        FailedPasswordWipePreferenceControllerBaseTestable() {
+            super(FailedPasswordWipePreferenceControllerBaseTest.this.mContext, mStringResourceId);
+        }
+
+        @Override
+        protected int getMaximumFailedPasswordsBeforeWipe() {
+            return mMaximumFailedPasswordsBeforeWipe;
+        }
+
+        @Override
+        public String getPreferenceKey() {
+            return null;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
new file mode 100644
index 0000000..5a74fa5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.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.enterprise;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
+/**
+ * Common base for testing subclasses of {@link FailedPasswordWipePreferenceControllerBase}.
+ */
+public abstract class FailedPasswordWipePreferenceControllerTestBase {
+
+    protected final String mKey;
+    protected final int mStringResourceId;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    protected Context mContext;
+    protected FakeFeatureFactory mFeatureFactory;
+
+    protected FailedPasswordWipePreferenceControllerBase mController;
+
+    public FailedPasswordWipePreferenceControllerTestBase(String key, int stringResourceId) {
+        mKey = key;
+        mStringResourceId = stringResourceId;
+    }
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+    }
+
+    public abstract void setMaximumFailedPasswordsBeforeWipe(int maximum);
+
+    @Test
+    public void testUpdateState() {
+        final Preference preference = new Preference(mContext, null, 0, 0);
+        preference.setVisible(false);
+
+        setMaximumFailedPasswordsBeforeWipe(10);
+        when(mContext.getResources().getQuantityString(mStringResourceId, 10, 10))
+                .thenReturn("10 attempts");
+        mController.updateState(preference);
+        assertThat(preference.getTitle()).isEqualTo("10 attempts");
+        assertThat(preference.isVisible()).isTrue();
+
+        setMaximumFailedPasswordsBeforeWipe(0);
+        mController.updateState(preference);
+        assertThat(preference.isVisible()).isFalse();
+    }
+
+    @Test
+    public void testIsAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void testHandlePreferenceTreeClick() {
+        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
+                .isFalse();
+    }
+
+    @Test
+    public void testGetPreferenceKey() {
+        assertThat(mController.getPreferenceKey()).isEqualTo(mKey);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePrimaryUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePrimaryUserPreferenceControllerTest.java
new file mode 100644
index 0000000..ea6d977
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePrimaryUserPreferenceControllerTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests for {@link FailedPasswordWipePrimaryUserPreferenceController}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class FailedPasswordWipePrimaryUserPreferenceControllerTest extends
+        FailedPasswordWipePreferenceControllerTestBase {
+
+    private int mMaximumFailedPasswordsBeforeWipe = 0;
+
+    public FailedPasswordWipePrimaryUserPreferenceControllerTest() {
+        super("failed_password_wipe_primary_user",
+                R.plurals.enterprise_privacy_failed_password_wipe_device);
+    }
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        mController = new FailedPasswordWipePrimaryUserPreferenceController(mContext);
+    }
+
+    @Override
+    public void setMaximumFailedPasswordsBeforeWipe(int maximum) {
+        when(mFeatureFactory.enterprisePrivacyFeatureProvider
+                .getMaximumFailedPasswordsBeforeWipeInPrimaryUser()).thenReturn(maximum);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
index e47aac9..ed7e48b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.pm.PackageManager;
@@ -70,13 +85,10 @@
     @Test
     public void testExtractUsageType_TypeSystem_ReturnSystem() {
         mBatterySipper.drainType = DrainType.APP;
-        final int uids[] = {Process.SYSTEM_UID, Process.ROOT_UID};
+        when(mPowerUsageFeatureProvider.isTypeSystem(any())).thenReturn(true);
 
-        for (int uid : uids) {
-            when(mBatterySipper.getUid()).thenReturn(uid);
-            assertThat(mPowerUsageAdvanced.extractUsageType(mBatterySipper))
-                    .isEqualTo(UsageType.SYSTEM);
-        }
+        assertThat(mPowerUsageAdvanced.extractUsageType(mBatterySipper))
+                .isEqualTo(UsageType.SYSTEM);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
new file mode 100644
index 0000000..d467221
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Process;
+import com.android.internal.os.BatterySipper;
+import com.android.settings.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;
+
+import static org.mockito.Mockito.when;
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PowerUsageFeatureProviderImplTest {
+    private static final int UID_OTHER = Process.FIRST_APPLICATION_UID + 2;
+    private static final int UID_CALENDAR = Process.FIRST_APPLICATION_UID + 3;
+    private static final int UID_MEDIA = Process.FIRST_APPLICATION_UID + 4;
+    private static final String[] PACKAGES_CALENDAR = {"com.android.providers.calendar"};
+    private static final String[] PACKAGES_MEDIA = {"com.android.providers.media"};
+    @Mock
+    private Context mContext;
+    @Mock
+    private BatterySipper mBatterySipper;
+    @Mock
+    private PackageManager mPackageManager;
+    private PowerUsageFeatureProviderImpl mPowerFeatureProvider;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mPowerFeatureProvider = new PowerUsageFeatureProviderImpl(mContext);
+        when(mPackageManager.getPackagesForUid(UID_CALENDAR)).thenReturn(PACKAGES_CALENDAR);
+        when(mPackageManager.getPackagesForUid(UID_MEDIA)).thenReturn(PACKAGES_MEDIA);
+        mPowerFeatureProvider.mPackageManager = mPackageManager;
+        mBatterySipper.uidObj = new FakeUid(UID_OTHER);
+    }
+
+    @Test
+    public void testIsTypeSystem_UidRoot_ReturnTrue() {
+        mBatterySipper.drainType = BatterySipper.DrainType.APP;
+        when(mBatterySipper.getUid()).thenReturn(Process.ROOT_UID);
+
+        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
+    }
+
+    @Test
+    public void testIsTypeSystem_UidSystem_ReturnTrue() {
+        mBatterySipper.drainType = BatterySipper.DrainType.APP;
+        when(mBatterySipper.getUid()).thenReturn(Process.SYSTEM_UID);
+
+        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
+    }
+
+    @Test
+    public void testIsTypeSystem_UidMedia_ReturnTrue() {
+        mBatterySipper.drainType = BatterySipper.DrainType.APP;
+        when(mBatterySipper.getUid()).thenReturn(Process.MEDIA_UID);
+
+        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
+    }
+
+    @Test
+    public void testIsTypeSystem_AppCalendar_ReturnTrue() {
+        mBatterySipper.drainType = BatterySipper.DrainType.APP;
+        when(mBatterySipper.getUid()).thenReturn(UID_CALENDAR);
+
+        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
+    }
+
+    @Test
+    public void testIsTypeSystem_AppMedia_ReturnTrue() {
+        mBatterySipper.drainType = BatterySipper.DrainType.APP;
+        when(mBatterySipper.getUid()).thenReturn(UID_MEDIA);
+
+        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isTrue();
+    }
+
+    @Test
+    public void testIsTypeSystem_UidOther_ReturnFalse() {
+        mBatterySipper.drainType = BatterySipper.DrainType.APP;
+        when(mBatterySipper.getUid()).thenReturn(UID_OTHER);
+
+        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isFalse();
+    }
+
+    @Test
+    public void testIsTypeSystem_UidObjNull_ReturnFalse() {
+        mBatterySipper.drainType = BatterySipper.DrainType.APP;
+        mBatterySipper.uidObj = null;
+
+        assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index f828238..a7772bb 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -15,9 +15,12 @@
  */
 package com.android.settings.fuelgauge;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.os.PowerManager;
 import android.os.Process;
+import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.view.Menu;
@@ -25,10 +28,15 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.os.BatteryStatsImpl;
 import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.Utils;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.BatteryInfo;
@@ -36,19 +44,25 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
+import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static com.android.settings.fuelgauge.PowerUsageBase.MENU_STATS_REFRESH;
 import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADDITIONAL_BATTERY_INFO;
+import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_HIGH_POWER_APPS;
+import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_TOGGLE_APPS;
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
+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;
@@ -58,18 +72,21 @@
  * Unit tests for {@link PowerUsageSummary}.
  */
 // TODO: Improve this test class so that it starts up the real activity and fragment.
-@RunWith(RobolectricTestRunner.class)
+@RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class PowerUsageSummaryTest {
     private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
     private static final String TIME_LEFT = "2h30min";
     private static final int UID = 123;
     private static final int POWER_MAH = 100;
-    private static final int BATTERY_LEVEL_FULL = 100;
-    private static final int BATTERY_LEVEL_HALF = 50;
+    private static final long REMAINING_TIME_US = 100000;
+    private static final int DISCHARGE_AMOUNT = 100;
+    private static final long USAGE_TIME_MS = 10000;
+    private static final double TOTAL_POWER = 200;
     private static final double BATTERY_SCREEN_USAGE = 300;
     private static final double BATTERY_SYSTEM_USAGE = 600;
     private static final double PRECISION = 0.001;
+    private static final double POWER_USAGE_PERCENTAGE = 50;
     private static final Intent ADDITIONAL_BATTERY_INFO_INTENT =
             new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
 
@@ -78,10 +95,12 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Menu mMenu;
     @Mock
-    private MenuItem mRefreshMenu;
-    @Mock
     private MenuItem mAdditionalBatteryInfoMenu;
     @Mock
+    private MenuItem mToggleAppsMenu;
+    @Mock
+    private MenuItem mHighPowerMenu;
+    @Mock
     private MenuInflater mMenuInflater;
     @Mock
     private BatterySipper mNormalBatterySipper;
@@ -90,6 +109,8 @@
     @Mock
     private BatterySipper mSystemBatterySipper;
     @Mock
+    private BatterySipper mCellBatterySipper;
+    @Mock
     private PowerGaugePreference mPreference;
     @Mock
     private LayoutPreference mBatteryLayoutPref;
@@ -103,48 +124,78 @@
     private TextView mSummary2;
     @Mock
     private BatteryInfo mBatteryInfo;
+    @Mock
+    private Preference mScreenUsagePref;
+    @Mock
+    private Preference mScreenConsumptionPref;
+    @Mock
+    private Preference mCellularNetworkPref;
+    @Mock
+    private BatteryStatsHelper mBatteryHelper;
+    @Mock
+    private PowerManager mPowerManager;
+    @Mock
+    private SettingsActivity mSettingsActivity;
 
+    private List<BatterySipper> mUsageList;
+    private Context mRealContext;
     private TestFragment mFragment;
     private FakeFeatureFactory mFeatureFactory;
-    private PowerUsageSummary mPowerUsageSummary;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
+        mRealContext = RuntimeEnvironment.application;
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        when(mContext.getSystemService(Context.POWER_SERVICE)).thenReturn(mPowerManager);
 
-        mFragment = new TestFragment(mContext);
-
-        when(mMenu.add(Menu.NONE, MENU_STATS_REFRESH, Menu.NONE,
-                R.string.menu_stats_refresh)
-                .setIcon(com.android.internal.R.drawable.ic_menu_refresh)
-                .setAlphabeticShortcut('r'))
-                .thenReturn(mRefreshMenu);
+        mFragment = spy(new TestFragment(mContext));
+        mFragment.initFeatureProvider();
+        
+        when(mFragment.getActivity()).thenReturn(mSettingsActivity);
         when(mAdditionalBatteryInfoMenu.getItemId())
                 .thenReturn(MENU_ADDITIONAL_BATTERY_INFO);
+        when(mToggleAppsMenu.getItemId()).thenReturn(MENU_TOGGLE_APPS);
+        when(mHighPowerMenu.getItemId()).thenReturn(MENU_HIGH_POWER_APPS);
         when(mFeatureFactory.powerUsageFeatureProvider.getAdditionalBatteryInfoIntent())
                 .thenReturn(ADDITIONAL_BATTERY_INFO_INTENT);
+        when(mBatteryHelper.getTotalPower()).thenReturn(TOTAL_POWER);
 
-        mPowerUsageSummary = spy(new PowerUsageSummary());
-
-        when(mPowerUsageSummary.getContext()).thenReturn(mContext);
         when(mNormalBatterySipper.getPackages()).thenReturn(PACKAGE_NAMES);
         when(mNormalBatterySipper.getUid()).thenReturn(UID);
         mNormalBatterySipper.totalPowerMah = POWER_MAH;
+        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
+
+        mCellBatterySipper.drainType = BatterySipper.DrainType.CELL;
+        mCellBatterySipper.totalPowerMah = POWER_MAH;
+
         when(mBatteryLayoutPref.findViewById(R.id.summary1)).thenReturn(mSummary1);
         when(mBatteryLayoutPref.findViewById(R.id.summary2)).thenReturn(mSummary2);
         when(mBatteryLayoutPref.findViewById(R.id.time)).thenReturn(mTimeText);
         when(mBatteryLayoutPref.findViewById(R.id.battery_header_icon))
                 .thenReturn(mBatteryMeterView);
-        mPowerUsageSummary.setBatteryLayoutPreference(mBatteryLayoutPref);
+        mFragment.setBatteryLayoutPreference(mBatteryLayoutPref);
 
         mScreenBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
         mScreenBatterySipper.totalPowerMah = BATTERY_SCREEN_USAGE;
+        mScreenBatterySipper.usageTimeMs = USAGE_TIME_MS;
+
         mSystemBatterySipper.drainType = BatterySipper.DrainType.APP;
         mSystemBatterySipper.totalPowerMah = BATTERY_SYSTEM_USAGE;
         when(mSystemBatterySipper.getUid()).thenReturn(Process.SYSTEM_UID);
+
+        mUsageList = new ArrayList<>();
+        mUsageList.add(mNormalBatterySipper);
+        mUsageList.add(mScreenBatterySipper);
+        mUsageList.add(mCellBatterySipper);
+
+        mFragment.mStatsHelper = mBatteryHelper;
+        when(mBatteryHelper.getUsageList()).thenReturn(mUsageList);
+        mFragment.mScreenUsagePref = mScreenUsagePref;
+        mFragment.mScreenConsumptionPref = mScreenConsumptionPref;
+        mFragment.mCellularNetworkPref = mCellularNetworkPref;
     }
 
     @Test
@@ -175,11 +226,53 @@
     }
 
     @Test
+    public void testOptionsMenu_MenuHighPower_MetricEventInvoked() {
+        mFragment.onOptionsItemSelected(mHighPowerMenu);
+
+        verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
+                MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_OPTIMIZATION);
+    }
+
+    @Test
+    public void testOptionsMenu_MenuAdditionalBattery_MetricEventInvoked() {
+        mFragment.onOptionsItemSelected(mAdditionalBatteryInfoMenu);
+
+        verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
+                MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_USAGE_ALERTS);
+    }
+
+    @Test
+    public void testOptionsMenu_MenuAppToggle_MetricEventInvoked() {
+        mFragment.onOptionsItemSelected(mToggleAppsMenu);
+        mFragment.mShowAllApps = false;
+
+        verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
+                MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE, true);
+    }
+
+    @Test
+    public void testOptionsMenu_ToggleAppsEnabled() {
+        when(mFeatureFactory.powerUsageFeatureProvider.isPowerAccountingToggleEnabled())
+                .thenReturn(true);
+        mFragment.mShowAllApps = false;
+
+        mFragment.onCreateOptionsMenu(mMenu, mMenuInflater);
+
+        verify(mMenu).add(Menu.NONE, MENU_TOGGLE_APPS, Menu.NONE, R.string.show_all_apps);
+    }
+
+    @Test
+    public void testOptionsMenu_ClickToggleAppsMenu_DataChanged() {
+        testToggleAllApps(true);
+        testToggleAllApps(false);
+    }
+
+    @Test
     public void testExtractKeyFromSipper_TypeAPPUidObjectNull_ReturnPackageNames() {
         mNormalBatterySipper.uidObj = null;
         mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
 
-        final String key = mPowerUsageSummary.extractKeyFromSipper(mNormalBatterySipper);
+        final String key = mFragment.extractKeyFromSipper(mNormalBatterySipper);
         assertThat(key).isEqualTo(TextUtils.concat(mNormalBatterySipper.getPackages()).toString());
     }
 
@@ -188,7 +281,7 @@
         mNormalBatterySipper.uidObj = null;
         mNormalBatterySipper.drainType = BatterySipper.DrainType.BLUETOOTH;
 
-        final String key = mPowerUsageSummary.extractKeyFromSipper(mNormalBatterySipper);
+        final String key = mFragment.extractKeyFromSipper(mNormalBatterySipper);
         assertThat(key).isEqualTo(mNormalBatterySipper.drainType.toString());
     }
 
@@ -197,7 +290,7 @@
         mNormalBatterySipper.uidObj = new BatteryStatsImpl.Uid(new BatteryStatsImpl(), UID);
         mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
 
-        final String key = mPowerUsageSummary.extractKeyFromSipper(mNormalBatterySipper);
+        final String key = mFragment.extractKeyFromSipper(mNormalBatterySipper);
         assertThat(key).isEqualTo(Integer.toString(mNormalBatterySipper.getUid()));
     }
 
@@ -207,8 +300,10 @@
         sippers.add(mNormalBatterySipper);
         sippers.add(mScreenBatterySipper);
         sippers.add(mSystemBatterySipper);
+        when(mFeatureFactory.powerUsageFeatureProvider.isTypeSystem(mSystemBatterySipper))
+                .thenReturn(true);
 
-        final double totalUsage = mPowerUsageSummary.removeHiddenBatterySippers(sippers);
+        final double totalUsage = mFragment.removeHiddenBatterySippers(sippers);
         assertThat(sippers).containsExactly(mNormalBatterySipper);
         assertThat(totalUsage).isWithin(PRECISION).of(BATTERY_SCREEN_USAGE + BATTERY_SYSTEM_USAGE);
     }
@@ -216,47 +311,58 @@
     @Test
     public void testShouldHideSipper_TypeIdle_ReturnTrue() {
         mNormalBatterySipper.drainType = BatterySipper.DrainType.IDLE;
-        assertThat(mPowerUsageSummary.shouldHideSipper(mNormalBatterySipper)).isTrue();
+        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
     }
 
     @Test
     public void testShouldHideSipper_TypeCell_ReturnTrue() {
         mNormalBatterySipper.drainType = BatterySipper.DrainType.CELL;
-        assertThat(mPowerUsageSummary.shouldHideSipper(mNormalBatterySipper)).isTrue();
+        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
     }
 
     @Test
     public void testShouldHideSipper_TypeScreen_ReturnTrue() {
         mNormalBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
-        assertThat(mPowerUsageSummary.shouldHideSipper(mNormalBatterySipper)).isTrue();
+        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
     }
 
     @Test
-    public void testShouldHideSipper_UidRoot_ReturnTrue() {
+    public void testShouldHideSipper_TypeBluetooth_ReturnTrue() {
+        mNormalBatterySipper.drainType = BatterySipper.DrainType.BLUETOOTH;
+        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
+    }
+
+    @Test
+    public void testShouldHideSipper_TypeSystem_ReturnTrue() {
         mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
         when(mNormalBatterySipper.getUid()).thenReturn(Process.ROOT_UID);
-        assertThat(mPowerUsageSummary.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_UidSystem_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mNormalBatterySipper.getUid()).thenReturn(Process.SYSTEM_UID);
-        assertThat(mPowerUsageSummary.shouldHideSipper(mNormalBatterySipper)).isTrue();
+        when(mFeatureFactory.powerUsageFeatureProvider.isTypeSystem(Matchers.<BatterySipper>any()))
+                .thenReturn(true);
+        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
     }
 
     @Test
     public void testShouldHideSipper_UidNormal_ReturnFalse() {
         mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
         when(mNormalBatterySipper.getUid()).thenReturn(UID);
-        assertThat(mPowerUsageSummary.shouldHideSipper(mNormalBatterySipper)).isFalse();
+        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isFalse();
+    }
+
+    @Test
+    public void testShouldHideSipper_TypeService_ReturnTrue() {
+        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
+        when(mNormalBatterySipper.getUid()).thenReturn(UID);
+        when(mFeatureFactory.powerUsageFeatureProvider.isTypeService(Matchers.<BatterySipper>any()))
+                .thenReturn(true);
+
+        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
     }
 
     @Test
     public void testSetUsageSummary_TimeLessThanOneMinute_DoNotSetSummary() {
         final long usageTimeMs = 59 * DateUtils.SECOND_IN_MILLIS;
 
-        mPowerUsageSummary.setUsageSummary(mPreference, "", usageTimeMs);
+        mFragment.setUsageSummary(mPreference, "", usageTimeMs);
         verify(mPreference, never()).setSummary(anyString());
     }
 
@@ -264,30 +370,124 @@
     public void testSetUsageSummary_TimeMoreThanOneMinute_SetSummary() {
         final long usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
 
-        mPowerUsageSummary.setUsageSummary(mPreference, "", usageTimeMs);
+        mFragment.setUsageSummary(mPreference, "", usageTimeMs);
         verify(mPreference).setSummary(anyString());
     }
 
     @Test
-    public void testUpdatePreference_BatteryFull_DoNotShowSummary() {
-        mBatteryInfo.mBatteryLevel = BATTERY_LEVEL_FULL;
+    public void testUpdatePreference_NoEstimatedTime_DoNotShowSummary() {
+        mBatteryInfo.remainingTimeUs = 0;
         mBatteryInfo.remainingLabel = TIME_LEFT;
-        mPowerUsageSummary.updateHeaderPreference(mBatteryInfo);
+        mFragment.updateHeaderPreference(mBatteryInfo);
 
         verify(mSummary1).setVisibility(View.INVISIBLE);
         verify(mSummary2).setVisibility(View.INVISIBLE);
-        verify(mTimeText).setText(mBatteryInfo.remainingLabel);
     }
 
     @Test
-    public void testUpdatePreference_BatteryNotFull_ShowSummary() {
-        mBatteryInfo.mBatteryLevel = BATTERY_LEVEL_HALF;
+    public void testUpdatePreference_HasEstimatedTime_ShowSummary() {
+        mBatteryInfo.remainingTimeUs = REMAINING_TIME_US;
         mBatteryInfo.remainingLabel = TIME_LEFT;
-        mPowerUsageSummary.updateHeaderPreference(mBatteryInfo);
+        mFragment.updateHeaderPreference(mBatteryInfo);
 
         verify(mSummary1).setVisibility(View.VISIBLE);
         verify(mSummary2).setVisibility(View.VISIBLE);
-        verify(mTimeText).setText(mBatteryInfo.remainingLabel);
+    }
+
+    @Test
+    public void testUpdatePreference_Charging_ShowChargingTimeLeft() {
+        mBatteryInfo.remainingTimeUs = REMAINING_TIME_US;
+        mBatteryInfo.mDischarging = false;
+
+        mFragment.updateHeaderPreference(mBatteryInfo);
+        verify(mSummary1).setText(R.string.estimated_charging_time_left);
+    }
+
+    @Test
+    public void testUpdatePreference_NotCharging_ShowTimeLeft() {
+        mBatteryInfo.remainingTimeUs = REMAINING_TIME_US;
+        mBatteryInfo.mDischarging = true;
+
+        mFragment.updateHeaderPreference(mBatteryInfo);
+        verify(mSummary1).setText(R.string.estimated_time_left);
+    }
+
+    @Test
+    public void testUpdateHeaderPreference_AsyncUpdate_ShouldNotCrash() {
+        when(mFragment.getContext()).thenReturn(null);
+        mBatteryInfo.remainingTimeUs = REMAINING_TIME_US;
+
+        //Should not crash
+        mFragment.updateHeaderPreference(mBatteryInfo);
+    }
+
+    private void testToggleAllApps(final boolean isShowApps) {
+        mFragment.mShowAllApps = isShowApps;
+
+        mFragment.onOptionsItemSelected(mToggleAppsMenu);
+        assertThat(mFragment.mShowAllApps).isEqualTo(!isShowApps);
+    }
+
+    @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 testUpdateCellularPreference_ShowCorrectSummary() {
+        final double percent = POWER_MAH / TOTAL_POWER * DISCHARGE_AMOUNT;
+        final String expectedSummary = mRealContext.getString(R.string.battery_overall_usage,
+                Utils.formatPercentage((int) percent));
+        doReturn(expectedSummary).when(mFragment)
+                .getString(eq(R.string.battery_overall_usage), anyInt());
+        mFragment.updateCellularPreference(DISCHARGE_AMOUNT);
+
+        verify(mCellularNetworkPref).setSummary(expectedSummary);
+    }
+
+    @Test
+    public void testUpdateScreenPreference_ShowCorrectSummary() {
+        final String expectedUsedTime = mRealContext.getString(R.string.battery_used_for,
+                Utils.formatElapsedTime(mRealContext, USAGE_TIME_MS, false));
+        final double percent = BATTERY_SCREEN_USAGE / TOTAL_POWER * DISCHARGE_AMOUNT;
+        final String expectedOverallUsage = mRealContext.getString(R.string.battery_overall_usage,
+                Utils.formatPercentage((int) percent));
+        doReturn(expectedUsedTime).when(mFragment).getString(
+                eq(R.string.battery_used_for), anyInt());
+        doReturn(expectedOverallUsage).when(mFragment).getString(
+                eq(R.string.battery_overall_usage), anyInt());
+
+        mFragment.updateScreenPreference(DISCHARGE_AMOUNT);
+
+        verify(mScreenUsagePref).setSummary(expectedUsedTime);
+        verify(mScreenConsumptionPref).setSummary(expectedOverallUsage);
+    }
+
+    @Test
+    public void testUpdatePreference_UsageListEmpty_ShouldNotCrash() {
+        when(mBatteryHelper.getUsageList()).thenReturn(new ArrayList<BatterySipper>());
+        doReturn("").when(mFragment).getString(anyInt(), Matchers.anyObject());
+
+        // Should not crash when update
+        mFragment.updateScreenPreference(DISCHARGE_AMOUNT);
+        mFragment.updateCellularPreference(DISCHARGE_AMOUNT);
+    }
+
+    @Test
+    public void testCalculatePercentage() {
+        final double percent = mFragment.calculatePercentage(POWER_MAH, DISCHARGE_AMOUNT);
+        assertThat(percent).isWithin(PRECISION).of(POWER_USAGE_PERCENTAGE);
     }
 
     public static class TestFragment extends PowerUsageSummary {
@@ -310,5 +510,10 @@
             mStartActivityCalled = true;
             mStartActivityIntent = intent;
         }
+
+        @Override
+        protected void refreshStats() {
+            // Leave it empty for toggle apps menu test
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
new file mode 100644
index 0000000..2e00169
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Secure;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LocationPreferenceControllerTest {
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private LocationPreferenceController mController;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new LocationPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+    }
+
+    @Test
+    public void isAvailable_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_shouldSetSummary() {
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(anyString());
+    }
+
+    @Test
+    public void updateSummary_shouldSetSummary() {
+        mController.displayPreference(mScreen);
+        mController.updateSummary();
+
+        verify(mPreference).setSummary(anyString());
+    }
+
+    @Test
+    public void getLocationSummary_locationOff_shouldSetSummaryOff() {
+        Secure.putInt(mContext.getContentResolver(),
+            Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
+
+        assertThat(mController.getLocationSummary(mContext)).isEqualTo(
+            mContext.getString(R.string.location_off_summary));
+    }
+
+    @Test
+    public void getLocationSummary_sensorsOnly_shouldSetSummarySensorsOnly() {
+        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)));
+    }
+
+    @Test
+    public void getLocationSummary_highAccuracy_shouldSetSummarHighAccuracy() {
+        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)));
+    }
+
+    @Test
+    public void getLocationSummary_batterySaving_shouldSetSummaryBatterySaving() {
+        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);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index 3d6a233..6f751eb 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -18,9 +18,10 @@
 
 
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothPan;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.os.UserManager;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
@@ -35,6 +36,9 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -51,8 +55,6 @@
     @Mock
     private BluetoothAdapter mBluetoothAdapter;
     @Mock
-    private UserManager mUserManager;
-    @Mock
     private Preference mPreference;
 
     private TetherPreferenceController mController;
@@ -64,7 +66,18 @@
         ReflectionHelpers.setField(mController, "mContext", mContext);
         ReflectionHelpers.setField(mController, "mConnectivityManager", mConnectivityManager);
         ReflectionHelpers.setField(mController, "mBluetoothAdapter", mBluetoothAdapter);
-        ReflectionHelpers.setField(mController, "mUserManager", mUserManager);
+    }
+
+    @Test
+    public void goThroughLifecycle_shouldDestoryBluetoothProfile() {
+        final BluetoothPan pan = mock(BluetoothPan.class);
+        final AtomicReference<BluetoothPan> panRef =
+                ReflectionHelpers.getField(mController, "mBluetoothPan");
+        panRef.set(pan);
+
+        mController.onDestroy();
+
+        verify(mBluetoothAdapter).closeProfileProxy(BluetoothProfile.PAN, pan);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
new file mode 100644
index 0000000..c31ab40
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.telephony.CarrierConfigManager;
+import android.telephony.TelephonyManager;
+
+import com.android.ims.ImsManager;
+import com.android.settings.SettingsRobolectricTestRunner;
+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.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiCallingPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private Preference mPreference;
+    private WifiCallingPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE))
+                .thenReturn(mCarrierConfigManager);
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE))
+                .thenReturn(mTelephonyManager);
+        mController = new WifiCallingPreferenceController(mContext);
+    }
+
+    @Test
+    public void isAvailable_platformEnabledAndProvisioned_shouldReturnTrue() {
+        ImsManager.wfcEnabledByPlatform = true;
+        ImsManager.wfcProvisioned = true;
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_shouldUpdatePreferenceSummary() {
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(anyInt());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
new file mode 100644
index 0000000..7e898fb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context;
+
+import android.content.pm.PackageManager;
+import android.content.pm.PackageParser;
+import com.android.settings.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;
+
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PaymentSettingsTest {
+    @Mock
+    Context mContext;
+
+    @Mock
+    private PackageManager mManager;
+
+    private PaymentSettings mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFragment = new PaymentSettings();
+        when(mContext.getPackageManager()).thenReturn(mManager);
+    }
+
+    @Test
+    public void testNonIndexableKey_NoNFC_KeyAdded() {
+        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
+
+        List<String> niks = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+        assertThat(niks).contains(mFragment.PAYMENT_KEY);
+    }
+
+    @Test
+    public void testNonIndexableKey_NFC_NoKeyAdded() {
+        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
+
+        List<String> niks = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+        assertThat(niks).isNull();
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
index 5fe4c42..fc9867e 100644
--- a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
@@ -22,9 +22,6 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,8 +30,10 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -61,8 +60,7 @@
     }
 
     @Test
-    public void updateNonIndexableKeys_voiceCapable_shouldNotUpdate() {
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
+    public void updateNonIndexableKeys_shouldNotUpdate() {
         final List<String> keys = new ArrayList<>();
 
         mController.updateNonIndexableKeys(keys);
@@ -70,14 +68,4 @@
         assertThat(keys).isEmpty();
     }
 
-    @Test
-    public void updateNonIndexableKeys_voiceIncapable_shouldUpdate() {
-        when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-        final List<String> keys = new ArrayList<>();
-
-        mController.updateNonIndexableKeys(keys);
-
-        assertThat(keys).isNotEmpty();
-    }
-
 }
diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
index b36b19b..25581b9 100644
--- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
@@ -53,7 +53,7 @@
     @Mock
     private PreferenceScreen mScreen;
     @Mock
-    private OtherSoundSettings mSetting;
+    private SoundSettings mSetting;
     @Mock
     private Activity mActivity;
     @Mock
diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
new file mode 100644
index 0000000..818f8a2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceController;
+
+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.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BaseSearchIndexProviderTest {
+
+    private static final String TEST_PREF_KEY = "test_pref_key";
+
+    @Mock
+    private Context mContext;
+    private BaseSearchIndexProvider mIndexProvider;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mIndexProvider = spy(BaseSearchIndexProvider.class);
+    }
+
+    @Test
+    public void getNonIndexableKeys_noPreferenceController_shouldReturnEmptyList() {
+        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEqualTo(Collections.EMPTY_LIST);
+    }
+
+    @Test
+    public void getNonIndexableKeys_preferenceIsAvailable_shouldReturnEmptyList() {
+        List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new PreferenceController(mContext) {
+            @Override
+            public boolean isAvailable() {
+                return true;
+            }
+
+            @Override
+            public String getPreferenceKey() {
+                return TEST_PREF_KEY;
+            }
+        });
+        doReturn(controllers).when(mIndexProvider).getPreferenceControllers(mContext);
+
+        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEqualTo(Collections.EMPTY_LIST);
+    }
+
+    @Test
+    public void getNonIndexableKeys_preferenceIsNotAvailable_shouldReturnKey() {
+        List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new PreferenceController(mContext) {
+            @Override
+            public boolean isAvailable() {
+                return false;
+            }
+
+            @Override
+            public String getPreferenceKey() {
+                return TEST_PREF_KEY;
+            }
+        });
+        doReturn(controllers).when(mIndexProvider).getPreferenceControllers(mContext);
+
+        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).contains(TEST_PREF_KEY);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
index 5ebc4b9..0bd651a 100644
--- a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
+++ b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
@@ -58,9 +58,9 @@
 import com.android.settings.TestConfig;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
-import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.inputmethod.PhysicalKeyboardFragment;
 import com.android.settings.inputmethod.VirtualKeyboardFragment;
+import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.testutils.shadow.ShadowActivityWithLoadManager;
 import com.android.settings.testutils.shadow.ShadowContextImplWithRegisterReceiver;
@@ -417,7 +417,7 @@
         final ContentObserver observer = extractContentObserver(UserDictionary.Words.CONTENT_URI);
         assertThat(observer).isNotNull();
 
-        verifyRebuildIndexing(InputMethodAndLanguageSettings.class);
+        verifyRebuildIndexing(LanguageAndInputSettings.class);
 
         /*
          * When user dictionary content is changed, rebuild indexing happens.
@@ -426,7 +426,7 @@
 
         observer.onChange(false /* selfChange */, UserDictionary.Words.CONTENT_URI);
 
-        verifyRebuildIndexing(InputMethodAndLanguageSettings.class);
+        verifyRebuildIndexing(LanguageAndInputSettings.class);
     }
 
     /*
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
index 899952b2..801b509 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
@@ -21,6 +21,7 @@
 
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.codeinspection.CodeInspector;
+import com.android.settings.dashboard.DashboardFragmentSearchIndexProviderInspector;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -36,10 +37,13 @@
     private static final String TAG = "SearchCodeInspector";
 
     private static final String NOT_IMPLEMENTING_INDEXABLE_ERROR =
-            "SettingsPreferenceFragment should implement Indexable, but these are not:\n";
+            "SettingsPreferenceFragment should implement Indexable, but these do not:\n";
     private static final String NOT_CONTAINING_PROVIDER_OBJECT_ERROR =
             "Indexable should have public field " + Index.FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER
                     + " but these are not:\n";
+    private static final String NOT_SHARING_PREF_CONTROLLERS_BETWEEN_FRAG_AND_PROVIDER =
+            "DashboardFragment should share pref controllers with its SearchIndexProvider, but "
+                    + " these are not: \n";
     private static final String NOT_IN_INDEXABLE_PROVIDER_REGISTRY =
             "Class containing " + Index.FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER + " must be added to "
                     + SearchIndexableResources.class.getName() + " but these are not: \n";
@@ -47,18 +51,22 @@
     private final List<String> notImplementingIndexableGrandfatherList;
     private final List<String> notImplementingIndexProviderGrandfatherList;
     private final List<String> notInSearchIndexableRegistryGrandfatherList;
+    private final List<String> notSharingPrefControllersGrandfatherList;
 
     public SearchIndexProviderCodeInspector(List<Class<?>> classes) {
         super(classes);
         notImplementingIndexableGrandfatherList = new ArrayList<>();
         notImplementingIndexProviderGrandfatherList = new ArrayList<>();
         notInSearchIndexableRegistryGrandfatherList = new ArrayList<>();
+        notSharingPrefControllersGrandfatherList = new ArrayList<>();
         initializeGrandfatherList(notImplementingIndexableGrandfatherList,
                 "grandfather_not_implementing_indexable");
         initializeGrandfatherList(notImplementingIndexProviderGrandfatherList,
                 "grandfather_not_implementing_index_provider");
         initializeGrandfatherList(notInSearchIndexableRegistryGrandfatherList,
                 "grandfather_not_in_search_index_provider_registry");
+        initializeGrandfatherList(notSharingPrefControllersGrandfatherList,
+                "grandfather_not_sharing_pref_controllers_with_search_provider");
     }
 
     @Override
@@ -66,6 +74,7 @@
         final Set<String> notImplementingIndexable = new ArraySet<>();
         final Set<String> notImplementingIndexProvider = new ArraySet<>();
         final Set<String> notInSearchProviderRegistry = new ArraySet<>();
+        final Set<String> notSharingPreferenceControllers = new ArraySet<>();
 
         for (Class clazz : mClasses) {
             if (!isConcreteSettingsClass(clazz)) {
@@ -78,20 +87,36 @@
             }
             // If it's a SettingsPreferenceFragment, it must also be Indexable.
             final boolean implementsIndexable = Indexable.class.isAssignableFrom(clazz);
-            if (!implementsIndexable
-                    && !notImplementingIndexableGrandfatherList.contains(className)) {
-                notImplementingIndexable.add(className);
+            if (!implementsIndexable) {
+                if (!notImplementingIndexableGrandfatherList.contains(className)) {
+                    notImplementingIndexable.add(className);
+                }
+                continue;
             }
             final boolean hasSearchIndexProvider = hasSearchIndexProvider(clazz);
             // If it implements Indexable, it must also implement the index provider field.
-            if (implementsIndexable && !hasSearchIndexProvider
-                    && !notImplementingIndexProviderGrandfatherList.contains(className)) {
-                notImplementingIndexProvider.add(className);
+            if (!hasSearchIndexProvider) {
+                if (!notImplementingIndexProviderGrandfatherList.contains(className)) {
+                    notImplementingIndexProvider.add(className);
+                }
+                continue;
             }
-            if (hasSearchIndexProvider
-                    && SearchIndexableResources.getResourceByName(className) == null
-                    && !notInSearchIndexableRegistryGrandfatherList.contains(className)) {
-                notInSearchProviderRegistry.add(className);
+            // If it implements index provider field AND it's a DashboardFragment, its fragment and
+            // search provider must share the same set of PreferenceControllers.
+            final boolean isSharingPrefControllers = DashboardFragmentSearchIndexProviderInspector
+                    .isSharingPreferenceControllers(clazz);
+            if (!isSharingPrefControllers) {
+                if (!notSharingPrefControllersGrandfatherList.contains(className)) {
+                    notSharingPreferenceControllers.add(className);
+                }
+                continue;
+            }
+            // Must be in SearchProviderRegistry
+            if (SearchIndexableResources.getResourceByName(className) == null) {
+                if (!notInSearchIndexableRegistryGrandfatherList.contains(className)) {
+                    notInSearchProviderRegistry.add(className);
+                }
+                continue;
             }
         }
 
@@ -100,15 +125,21 @@
                 notImplementingIndexable);
         final String indexProviderError = buildErrorMessage(NOT_CONTAINING_PROVIDER_OBJECT_ERROR,
                 notImplementingIndexProvider);
+        final String notSharingPrefControllerError = buildErrorMessage(
+                NOT_SHARING_PREF_CONTROLLERS_BETWEEN_FRAG_AND_PROVIDER,
+                notSharingPreferenceControllers);
         final String notInProviderRegistryError =
                 buildErrorMessage(NOT_IN_INDEXABLE_PROVIDER_REGISTRY, notInSearchProviderRegistry);
         assertWithMessage(indexableError)
                 .that(notImplementingIndexable)
                 .isEmpty();
-        assertWithMessage(indexProviderError.toString())
+        assertWithMessage(indexProviderError)
                 .that(notImplementingIndexProvider)
                 .isEmpty();
-        assertWithMessage(notInProviderRegistryError.toString())
+        assertWithMessage(notSharingPrefControllerError)
+                .that(notSharingPreferenceControllers)
+                .isEmpty();
+        assertWithMessage(notInProviderRegistryError)
                 .that(notInSearchProviderRegistry)
                 .isEmpty();
     }
diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
index 300aaaf..028cbb0 100644
--- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
+++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
@@ -56,40 +56,40 @@
 
     @Test
     public void testDataTitleValid_ReturnsPreferenceTitle() {
-        XmlResourceParser parser = getChildByType(R.xml.gesture_settings,
-                "com.android.settings.gestures.GesturePreference");
+        XmlResourceParser parser = getChildByType(R.xml.ia_display_settings,
+                "com.android.settings.TimeoutListPreference");
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String title = XmlParserUtils.getDataTitle(mContext, attrs);
-        String expTitle = mContext.getString(R.string.assist_gesture_title);
+        String expTitle = mContext.getString(R.string.screen_timeout);
         assertThat(title).isEqualTo(expTitle);
     }
 
     @Test
     public void testDataKeywordsValid_ReturnsPreferenceKeywords() {
-        XmlResourceParser parser = getParentPrimedParser(R.xml.gesture_settings);
+        XmlResourceParser parser = getParentPrimedParser(R.xml.ia_display_settings);
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String keywords = XmlParserUtils.getDataKeywords(mContext, attrs);
-        String expKeywords = mContext.getString(R.string.keywords_gesture);
+        String expKeywords = mContext.getString(R.string.keywords_display);
         assertThat(keywords).isEqualTo(expKeywords);
     }
 
     @Test
     public void testDataKeyValid_ReturnsPreferenceKey() {
-        XmlResourceParser parser = getChildByType(R.xml.gesture_settings,
-                "com.android.settings.gestures.GesturePreference");
+        XmlResourceParser parser = getChildByType(R.xml.ia_display_settings,
+                "com.android.settings.TimeoutListPreference");
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String key = XmlParserUtils.getDataKey(mContext, attrs);
-        String expKey = "gesture_assist";
+        String expKey = "screen_timeout";
         assertThat(key).isEqualTo(expKey);
     }
 
     @Test
     public void testDataSummaryValid_ReturnsPreferenceSummary() {
-        XmlResourceParser parser = getChildByType(R.xml.gesture_settings,
-                "com.android.settings.gestures.GesturePreference");
+        XmlResourceParser parser = getChildByType(R.xml.ia_display_settings,
+                "com.android.settings.TimeoutListPreference");
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String summary = XmlParserUtils.getDataSummary(mContext, attrs);
-        String expSummary = mContext.getString(R.string.assist_gesture_summary);
+        String expSummary = mContext.getString(R.string.screen_timeout_summary);
         assertThat(summary).isEqualTo(expSummary);
 
     }
@@ -128,7 +128,7 @@
 
     @Test
     public void testDataKeyInvalid_ReturnsNull() {
-        XmlResourceParser parser = getParentPrimedParser(R.xml.gesture_settings);
+        XmlResourceParser parser = getParentPrimedParser(R.xml.ia_display_settings);
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String key = XmlParserUtils.getDataKey(mContext, attrs);
         assertThat(key).isNull();
@@ -136,7 +136,7 @@
 
     @Test
     public void testDataSummaryInvalid_ReturnsNull() {
-        XmlResourceParser parser = getParentPrimedParser(R.xml.gesture_settings);
+        XmlResourceParser parser = getParentPrimedParser(R.xml.ia_display_settings);
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String summary = XmlParserUtils.getDataSummary(mContext, attrs);
         assertThat(summary).isNull();
@@ -144,7 +144,7 @@
 
     @Test
     public void testDataSummaryOffInvalid_ReturnsNull() {
-        XmlResourceParser parser = getParentPrimedParser(R.xml.gesture_settings);
+        XmlResourceParser parser = getParentPrimedParser(R.xml.ia_display_settings);
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String summaryOff = XmlParserUtils.getDataSummaryOff(mContext, attrs);
         assertThat(summaryOff).isNull();
@@ -152,7 +152,7 @@
 
     @Test
     public void testDataEntriesInvalid_ReturnsNull() {
-        XmlResourceParser parser = getParentPrimedParser(R.xml.gesture_settings);
+        XmlResourceParser parser = getParentPrimedParser(R.xml.ia_display_settings);
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String entries = XmlParserUtils.getDataEntries(mContext, attrs);
         assertThat(entries).isNull();
diff --git a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
index d69ba3e..6f326ab 100644
--- a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
+++ b/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
@@ -29,7 +29,7 @@
 import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.gestures.GestureSettings;
+import com.android.settings.gestures.SwipeToNotificationSettings;
 import com.android.settings.search2.ResultPayload.PayloadType;
 
 import org.junit.Before;
@@ -155,7 +155,7 @@
                 TITLES[0], // Title
                 SUMMARY, // Summary on
                 SUMMARY, // summary off
-                GestureSettings.class.getName(),
+                SwipeToNotificationSettings.class.getName(),
                 BLANK,   // screen title
                 null,    // icon
                 BLANK,   // action
@@ -226,7 +226,7 @@
                 TITLES[0], // Title
                 SUMMARY, // Summary on
                 SUMMARY, // summary off
-                GestureSettings.class.getName(),
+                SwipeToNotificationSettings.class.getName(),
                 BLANK,   // screen title
                 null,    // icon
                 BLANK,   // action
diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
index eaaa00e..fdc1052 100644
--- a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
@@ -205,25 +205,25 @@
 
     @Test
     public void testAddResource_RowsInserted() {
-        SearchIndexableResource resource = getFakeResource(R.xml.gesture_settings);
+        SearchIndexableResource resource = getFakeResource(R.xml.ia_display_settings);
         mManager.indexOneSearchIndexableData(mDb, localeStr, resource,
                 new HashMap<>());
         Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(7);
+        assertThat(cursor.getCount()).isEqualTo(16);
     }
 
     @Test
     public void testAddResourceWithNIKs_RowsInsertedDisabled() {
-        SearchIndexableResource resource = getFakeResource(R.xml.gesture_settings);
-        // Only add 2 of 6 items to be disabled.
-        String[] keys = {"gesture_double_tap_power", "gesture_swipe_down_fingerprint"};
+        SearchIndexableResource resource = getFakeResource(R.xml.ia_display_settings);
+        // Only add 2 of 16 items to be disabled.
+        String[] keys = {"brightness", "wallpaper"};
         Map<String, List<String>> niks = getNonIndexableKeys(keys);
         mManager.indexOneSearchIndexableData(mDb, localeStr, resource, niks);
 
         Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 0", null);
         assertThat(cursor.getCount()).isEqualTo(2);
         cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null);
-        assertThat(cursor.getCount()).isEqualTo(5);
+        assertThat(cursor.getCount()).isEqualTo(14);
     }
 
     @Test
@@ -306,7 +306,7 @@
 
     @Test
     public void testAddResourceCustomSetting_RowsMatch() {
-        SearchIndexableResource resource = getFakeResource(R.xml.gesture_settings);
+        SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings);
         mManager.indexOneSearchIndexableData(mDb, localeStr, resource,
                 new HashMap<>());
         final String prefTitle =
@@ -339,7 +339,7 @@
         assertThat(cursor.getString(9)).isEmpty();
         // Screen Title
         assertThat(cursor.getString(10)).isEqualTo(
-                mContext.getString(R.string.gesture_preference_title));
+                mContext.getString(R.string.fingerprint_swipe_for_notifications_title));
         // Class Name
         assertThat(cursor.getString(11)).isEqualTo(className);
         // Icon
@@ -477,7 +477,7 @@
 
     @Test
     public void testResourceProvider_RowInserted() {
-        SearchIndexableResource resource = getFakeResource(R.xml.gesture_settings);
+        SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings);
         resource.xmlResId = 0;
         resource.className = "com.android.settings.display.ScreenZoomSettings";
 
@@ -489,7 +489,7 @@
 
     @Test
     public void testResourceProvider_Matches() {
-        SearchIndexableResource resource = getFakeResource(R.xml.gesture_settings);
+        SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings);
         resource.xmlResId = 0;
         resource.className = "com.android.settings.display.ScreenZoomSettings";
 
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
similarity index 64%
rename from tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
rename to tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
index 26b231e..72c658f 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
@@ -15,17 +15,17 @@
  *
  */
 
-package com.android.settings.search;
+package com.android.settings.search2;
 
 import android.content.ContentValues;
 import android.content.Context;
+import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search2.DatabaseIndexingUtils;
-import com.android.settings.search2.DatabaseResultLoader;
+import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -39,6 +39,9 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
@@ -57,6 +60,15 @@
     private Context mContext;
     private DatabaseResultLoader loader;
 
+    private final String titleOne = "titleOne";
+    private final String titleTwo = "titleTwo";
+    private final String titleThree = "titleThree";
+    private final String titleFour = "titleFour";
+    private final String summaryOne = "summaryOne";
+    private final String summaryTwo = "summaryTwo";
+    private final String summaryThree = "summaryThree";
+    private final String summaryFour = "summaryFour";
+
     SQLiteDatabase mDb;
 
     @Before
@@ -103,49 +115,49 @@
     }
 
     @Test
-    public void testSpecialCaseWord_MatchesNonPrefix() {
+    public void testSpecialCaseWord_matchesNonPrefix() {
         insertSpecialCase("Data usage");
         loader = new DatabaseResultLoader(mContext, "usage", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
     }
 
     @Test
-    public void testSpecialCaseSpace_Matches() {
+    public void testSpecialCaseSpace_matches() {
         insertSpecialCase("space");
         loader = new DatabaseResultLoader(mContext, " space ", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
     }
 
     @Test
-    public void testSpecialCaseDash_MatchesWordNoDash() {
+    public void testSpecialCaseDash_matchesWordNoDash() {
         insertSpecialCase("wi-fi calling");
         loader = new DatabaseResultLoader(mContext, "wifi", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
     }
 
     @Test
-    public void testSpecialCaseDash_MatchesWordWithDash() {
+    public void testSpecialCaseDash_matchesWordWithDash() {
         insertSpecialCase("priorités seulment");
         loader = new DatabaseResultLoader(mContext, "priorités", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
     }
 
     @Test
-    public void testSpecialCaseDash_MatchesWordWithoutDash() {
+    public void testSpecialCaseDash_matchesWordWithoutDash() {
         insertSpecialCase("priorités seulment");
         loader = new DatabaseResultLoader(mContext, "priorites", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
     }
 
     @Test
-    public void testSpecialCaseDash_MatchesEntireQueryWithoutDash() {
+    public void testSpecialCaseDash_matchesEntireQueryWithoutDash() {
         insertSpecialCase("wi-fi calling");
         loader = new DatabaseResultLoader(mContext, "wifi calling", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
     }
 
     @Test
-    public void testSpecialCasePrefix_MatchesPrefixOfEntry() {
+    public void testSpecialCasePrefix_matchesPrefixOfEntry() {
         insertSpecialCase("Photos");
         loader = new DatabaseResultLoader(mContext, "pho", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
@@ -159,14 +171,14 @@
     }
 
     @Test
-    public void testSpecialCaseMultiWordPrefix_MatchesPrefixOfEntry() {
+    public void testSpecialCaseMultiWordPrefix_matchesPrefixOfEntry() {
         insertSpecialCase("Apps Notifications");
         loader = new DatabaseResultLoader(mContext, "Apps", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
     }
 
     @Test
-    public void testSpecialCaseMultiWordPrefix_MatchesSecondWordPrefixOfEntry() {
+    public void testSpecialCaseMultiWordPrefix_matchesSecondWordPrefixOfEntry() {
         insertSpecialCase("Apps Notifications");
         loader = new DatabaseResultLoader(mContext, "Not", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
@@ -187,25 +199,206 @@
     }
 
     @Test
-    public void testSpecialCaseMultiWordPrefixWithSpecial_MatchesPrefixOfEntry() {
+    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfEntry() {
         insertSpecialCase("Apps & Notifications");
         loader = new DatabaseResultLoader(mContext, "App", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
     }
 
     @Test
-    public void testSpecialCaseMultiWordPrefixWithSpecial_MatchesPrefixOfSecondEntry() {
+    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfSecondEntry() {
         insertSpecialCase("Apps & Notifications");
         loader = new DatabaseResultLoader(mContext, "No", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
     }
 
+    @Test
+    public void testDeDupe_noDuplicates_originalListReturn() {
+        // Three elements with unique titles and summaries
+        List<SearchResult> results = new ArrayList();
+        IntentPayload intentPayload = new IntentPayload(new Intent());
+
+        SearchResult.Builder builder = new SearchResult.Builder();
+        builder.addTitle(titleOne)
+                .addSummary(summaryOne)
+                .addPayload(intentPayload);
+        SearchResult resultOne = builder.build();
+        results.add(resultOne);
+
+        builder.addTitle(titleTwo)
+                .addSummary(summaryTwo);
+        SearchResult resultTwo = builder.build();
+        results.add(resultTwo);
+
+        builder.addTitle(titleThree)
+                .addSummary(summaryThree);
+        SearchResult resultThree = builder.build();
+        results.add(resultThree);
+
+        loader = new DatabaseResultLoader(mContext, "", null);
+        loader.removeDuplicates(results);
+        assertThat(results.size()).isEqualTo(3);
+        assertThat(results.get(0)).isEqualTo(resultOne);
+        assertThat(results.get(1)).isEqualTo(resultTwo);
+        assertThat(results.get(2)).isEqualTo(resultThree);
+    }
+
+    @Test
+    public void testDeDupe_oneDuplicate_duplicateRemoved() {
+        List<SearchResult> results = new ArrayList();
+        IntentPayload intentPayload = new IntentPayload(new Intent());
+
+        SearchResult.Builder builder = new SearchResult.Builder();
+        builder.addTitle(titleOne)
+                .addSummary(summaryOne)
+                .addRank(0)
+                .addPayload(intentPayload);
+        SearchResult resultOne = builder.build();
+        results.add(resultOne);
+
+        // Duplicate of the first element
+        builder.addTitle(titleOne)
+                .addSummary(summaryOne)
+                .addRank(1);
+        SearchResult resultTwo = builder.build();
+        results.add(resultTwo);
+
+        // Unique
+        builder.addTitle(titleThree)
+                .addSummary(summaryThree);
+        SearchResult resultThree = builder.build();
+        results.add(resultThree);
+
+        loader = new DatabaseResultLoader(mContext, "", null);
+        loader.removeDuplicates(results);
+        assertThat(results.size()).isEqualTo(2);
+        assertThat(results.get(0)).isEqualTo(resultOne);
+        assertThat(results.get(1)).isEqualTo(resultThree);
+    }
+
+    @Test
+    public void testDeDupe_firstDupeInline_secondDuplicateRemoved() {
+        List<SearchResult> results = new ArrayList();
+        InlineSwitchPayload inlinePayload = new InlineSwitchPayload("", 0,
+                null);
+        IntentPayload intentPayload = new IntentPayload(new Intent());
+
+        SearchResult.Builder builder = new SearchResult.Builder();
+        // Inline result
+        builder.addTitle(titleOne)
+                .addSummary(summaryOne)
+                .addRank(0)
+                .addPayload(inlinePayload);
+        SearchResult resultOne = builder.build();
+        results.add(resultOne);
+
+        // Duplicate of first result, but Intent Result. Should be removed.
+        builder.addTitle(titleOne)
+                .addSummary(summaryOne)
+                .addRank(1)
+                .addPayload(intentPayload);
+        SearchResult resultTwo = builder.build();
+        results.add(resultTwo);
+
+        // Unique
+        builder.addTitle(titleThree)
+                .addSummary(summaryThree);
+        SearchResult resultThree = builder.build();
+        results.add(resultThree);
+
+        loader = new DatabaseResultLoader(mContext, "", null);
+        loader.removeDuplicates(results);
+        assertThat(results.size()).isEqualTo(2);
+        assertThat(results.get(0)).isEqualTo(resultOne);
+        assertThat(results.get(1)).isEqualTo(resultThree);
+    }
+
+    @Test
+    public void testDeDupe_secondDupeInline_firstDuplicateRemoved() {
+        /*
+         * Create a list as follows:
+         * (5) Intent Four
+         * (4) Inline Two
+         * (3) Intent Three
+         * (2) Intent Two
+         * (1) Intent One
+         *
+         * After removing duplicates:
+         * (4) Intent Four
+         * (3) Inline Two
+         * (2) Intent Three
+         * (1) Intent One
+         */
+        List<SearchResult> results = new ArrayList();
+        InlineSwitchPayload inlinePayload = new InlineSwitchPayload("", 0,
+                null);
+        IntentPayload intentPayload = new IntentPayload(new Intent());
+
+
+        SearchResult.Builder builder = new SearchResult.Builder();
+        // Intent One
+        builder.addTitle(titleOne)
+                .addSummary(summaryOne)
+                .addPayload(intentPayload);
+        SearchResult resultOne = builder.build();
+        results.add(resultOne);
+
+        // Intent Two
+        builder.addTitle(titleTwo)
+                .addSummary(summaryTwo)
+                .addPayload(intentPayload);
+        SearchResult resultTwo = builder.build();
+        results.add(resultTwo);
+
+        // Intent Three
+        builder.addTitle(titleThree)
+                .addSummary(summaryThree);
+        SearchResult resultThree = builder.build();
+        results.add(resultThree);
+
+        // Inline Two
+        builder.addTitle(titleTwo)
+                .addSummary(summaryTwo)
+                .addPayload(inlinePayload);
+        SearchResult resultFour = builder.build();
+        results.add(resultFour);
+
+        // Intent Four
+        builder.addTitle(titleFour)
+                .addSummary(summaryOne)
+                .addPayload(intentPayload);
+        SearchResult resultFive = builder.build();
+        results.add(resultFive);
+
+        loader = new DatabaseResultLoader(mContext, "", null);
+        loader.removeDuplicates(results);
+        assertThat(results.size()).isEqualTo(4);
+        assertThat(results.get(0)).isEqualTo(resultOne);
+        assertThat(results.get(1)).isEqualTo(resultThree);
+        assertThat(results.get(2)).isEqualTo(resultFour);
+        assertThat(results.get(3)).isEqualTo(resultFive);
+    }
+
+    @Test
+    public void testSpecialCaseTwoWords_firstWordMatches_ranksHigher() {
+        final String caseOne = "Apple pear";
+        final String caseTwo = "Banana apple";
+        insertSpecialCase(caseOne);
+        insertSpecialCase(caseTwo);
+        loader = new DatabaseResultLoader(mContext, "App", null);
+        List<? extends SearchResult> results = loader.loadInBackground();
+
+        assertThat(results.get(0).title).isEqualTo(caseOne);
+        assertThat(results.get(1).title).isEqualTo(caseTwo);
+        assertThat(results.get(0).rank).isLessThan(results.get(1).rank);
+    }
+
     private void insertSpecialCase(String specialCase) {
         String normalized = DatabaseIndexingUtils.normalizeHyphen(specialCase);
         normalized = DatabaseIndexingUtils.normalizeString(normalized);
 
         ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, normalized.hashCode());
         values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
         values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
         values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, specialCase);
@@ -313,4 +506,4 @@
 
         mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
     }
-}
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
index 293c0ae..49eb48b 100644
--- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
@@ -42,6 +42,7 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowLooper;
 
 import java.util.Map;
 
@@ -102,8 +103,11 @@
 
     @Test
     public void updateTilesData_shouldNotProcessEmptyScreenOrTiles() {
-        mImpl.updatePreferences(mContext, null, null);
-        mImpl.updatePreferences(mContext, new PreferenceScreen(mContext, null), null);
+        mImpl.updatePreferencesToRunOnWorkerThread(mContext, null, null);
+        ShadowLooper.runUiThreadTasks();
+        mImpl.updatePreferencesToRunOnWorkerThread(
+                mContext, new PreferenceScreen(mContext, null), null);
+        ShadowLooper.runUiThreadTasks();
         verifyNoMoreInteractions(mPackageManager);
     }
 
@@ -111,13 +115,17 @@
     public void updateTilesData_shouldNotProcessNonMatchingPreference() {
         DashboardCategory dashboardCategory = new DashboardCategory();
         dashboardCategory.addTile(new Tile());
-        mImpl.updatePreferences(mContext, getPreferenceScreen(), dashboardCategory);
+        mImpl.updatePreferencesToRunOnWorkerThread(
+                mContext, getPreferenceScreen(), dashboardCategory);
+        ShadowLooper.runUiThreadTasks();
         verifyNoMoreInteractions(mPackageManager);
     }
 
     @Test
     public void updateTilesData_shouldNotProcessMatchingPreferenceWithNoData() {
-        mImpl.updatePreferences(mContext, getPreferenceScreen(), getDashboardCategory());
+        mImpl.updatePreferencesToRunOnWorkerThread(
+                mContext, getPreferenceScreen(), getDashboardCategory());
+        ShadowLooper.runUiThreadTasks();
         verifyNoMoreInteractions(mPackageManager);
     }
 
@@ -135,7 +143,8 @@
         dashboardCategory.getTile(0).intent = new Intent().setPackage("package");
         dashboardCategory.getTile(0).metaData = bundle;
 
-        mImpl.updatePreferences(mContext, screen, dashboardCategory);
+        mImpl.updatePreferencesToRunOnWorkerThread(mContext, screen, dashboardCategory);
+        ShadowLooper.runUiThreadTasks();
         verify(screen.findPreference(MOCK_KEY)).setIcon(mMockDrawable);
         verify(screen.findPreference(MOCK_KEY)).setSummary(MOCK_SUMMARY);
     }
@@ -157,7 +166,8 @@
         dashboardCategory.getTile(0).intent = new Intent().setPackage("package");
         dashboardCategory.getTile(0).metaData = bundle;
 
-        mImpl.updatePreferences(mContext, screen, dashboardCategory);
+        mImpl.updatePreferencesToRunOnWorkerThread(mContext, screen, dashboardCategory);
+        ShadowLooper.runUiThreadTasks();
         verify(screen.findPreference(MOCK_KEY), never()).setSummary(anyString());
     }
 
diff --git a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
new file mode 100644
index 0000000..7c1d587
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/support/SupportConfigTest.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.support;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+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 SupportConfigTest {
+
+    @Test
+    public void getConfigForSupportFeature_shouldBeDisabled() {
+        final boolean supportEnabled = RuntimeEnvironment.application.getResources()
+                .getBoolean(R.bool.config_support_enabled);
+        assertThat(supportEnabled).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index a7eca0d..f4f1c63 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -20,6 +20,7 @@
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
@@ -27,7 +28,6 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SupportFeatureProvider;
 import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settings.suggestions.SuggestionFeatureProvider;
 import com.android.settings.search2.SearchFeatureProvider;
 import com.android.settings.overlay.SurveyFeatureProvider;
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
index cc55a4e..113c7aa 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -10,6 +10,9 @@
 import android.support.annotation.ArrayRes;
 import android.util.AttributeSet;
 import android.util.TypedValue;
+
+import com.android.settings.R;
+
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -36,7 +39,8 @@
 @Implements(Resources.class)
 public class SettingsShadowResources extends ShadowResources {
 
-    @RealObject public Resources realResources;
+    @RealObject
+    public Resources realResources;
 
     @Implementation
     public int getDimensionPixelSize(@DimenRes int id) throws NotFoundException {
@@ -54,8 +58,14 @@
         // The drawable item in switchbar_background.xml refers to a very recent color attribute
         // that Robolectric isn't yet aware of.
         // TODO: Remove this once Robolectric is updated.
-        if (id == com.android.settings.R.drawable.switchbar_background) {
+        if (id == R.drawable.switchbar_background) {
             return new ColorDrawable();
+        } else if (id == R.drawable.ic_launcher_settings) {
+            // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric,
+            // change it to a normal drawable.
+            id = R.drawable.ic_settings_wireless;
+        } else if (id == R.drawable.app_filter_spinner_background) {
+            id = R.drawable.ic_expand_more_inverse;
         }
         return super.loadDrawable(value, id, theme);
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowSystemProperties.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowSystemProperties.java
index e2a863a..45eb432 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowSystemProperties.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowSystemProperties.java
@@ -18,13 +18,13 @@
 
 import android.os.SystemProperties;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowSystemProperties;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * This class provides write capability to ShadowSystemProperties.
  */
@@ -43,10 +43,24 @@
         return ShadowSystemProperties.getBoolean(key, def);
     }
 
+    @Implementation
+    public static synchronized String get(String key) {
+        if (sValues.containsKey(key)) {
+            return sValues.get(key);
+        }
+        return ShadowSystemProperties.get(key);
+    }
+
     public static synchronized void set(String key, String val) {
         sValues.put(key, val);
     }
 
+    @Implementation
+    public static String get(String key, String def) {
+        String value = sValues.get(key);
+        return value == null ? def : value;
+    }
+
     public static synchronized void clear() {
         sValues.clear();
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
new file mode 100644
index 0000000..5dd54c0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.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.testutils.shadow;
+
+import android.content.ContentResolver;
+import android.provider.Settings;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Implements(Settings.Secure.class)
+public class ShadowSecureSettings {
+
+    private static final Map<String, Object> mValueMap = new HashMap<>();
+
+    @Implementation
+    public static boolean putInt(ContentResolver resolver, String name, int value) {
+        mValueMap.put(name, value);
+        return true;
+    }
+
+    @Implementation
+    public static boolean putString(ContentResolver resolver, String name, String value) {
+        mValueMap.put(name, value);
+        return true;
+    }
+
+    @Implementation
+    public static String getString(ContentResolver resolver, String name) {
+        return (String) mValueMap.get(name);
+    }
+
+    @Implementation
+    public static String getStringForUser(ContentResolver resolver, String name, int userHandle) {
+        return getString(resolver, name);
+    }
+
+    @Implementation
+    public static int getInt(ContentResolver resolver, String name, int defaultValue) {
+        Integer value = (Integer) mValueMap.get(name);
+        return value == null ? defaultValue : value;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceDividerDecorationTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceDividerDecorationTest.java
deleted file mode 100644
index f69de54..0000000
--- a/tests/robotests/src/com/android/settings/widget/PreferenceDividerDecorationTest.java
+++ /dev/null
@@ -1,113 +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.widget;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceGroupAdapter;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import com.android.settings.SettingsRobolectricTestRunner;
-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.annotation.Config;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PreferenceDividerDecorationTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private Drawable mDrawable;
-    @Mock
-    private Canvas mCanvas;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private RecyclerView mRecyclerView;
-    @Mock
-    private PreferenceGroupAdapter mAdapter;
-    @Mock
-    private PreferenceCategory mPrefCategory;
-    @Mock
-    private Preference mNormalPref;
-    @Mock
-    private FooterPreference mFooterPref;
-    private PreferenceDividerDecoration mDecoration;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mDecoration = new PreferenceDividerDecoration();
-        mDecoration.setDivider(mDrawable);
-        mDecoration.setDividerHeight(3);
-    }
-
-    @Test
-    public void drawOver_footerPreference_shouldDrawDivider() {
-        when(mRecyclerView.getAdapter()).thenReturn(mAdapter);
-        when(mRecyclerView.getChildCount()).thenReturn(1);
-        when(mAdapter.getItem(anyInt())).thenReturn(mFooterPref);
-
-        mDecoration.onDrawOver(mCanvas, mRecyclerView, null /* state */);
-
-        verify(mDrawable).draw(mCanvas);
-    }
-
-    @Test
-    public void drawOver_preferenceCategory_shouldSkipFirst() {
-        when(mRecyclerView.getAdapter()).thenReturn(mAdapter);
-        when(mRecyclerView.getChildCount()).thenReturn(3);
-        when(mAdapter.getItem(anyInt())).thenReturn(mPrefCategory);
-        when(mRecyclerView.getChildAdapterPosition(any(View.class)))
-                .thenReturn(0)
-                .thenReturn(1)
-                .thenReturn(2);
-
-        mDecoration.onDrawOver(mCanvas, mRecyclerView, null /* state */);
-
-        // 3 prefCategory, should skip first draw
-        verify(mDrawable, times(2)).draw(mCanvas);
-    }
-
-    @Test
-    public void drawOver_preference_doNotDrawDivider() {
-        when(mRecyclerView.getAdapter()).thenReturn(mAdapter);
-        when(mRecyclerView.getChildCount()).thenReturn(1);
-        when(mAdapter.getItem(anyInt())).thenReturn(mNormalPref);
-
-        mDecoration.onDrawOver(mCanvas, mRecyclerView, null /* state */);
-
-        verify(mDrawable, never()).draw(mCanvas);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/TetherServiceTest.java b/tests/unit/src/com/android/settings/TetherServiceTest.java
index bec3e7e..899ea7a 100644
--- a/tests/unit/src/com/android/settings/TetherServiceTest.java
+++ b/tests/unit/src/com/android/settings/TetherServiceTest.java
@@ -415,6 +415,7 @@
 
         private void sendResponse(int response, Context context) {
             Intent responseIntent = new Intent(TEST_RESPONSE_ACTION);
+            responseIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
             responseIntent.putExtra(TetherService.EXTRA_RESULT, response);
             context.sendBroadcast(
                     responseIntent, android.Manifest.permission.CONNECTIVITY_INTERNAL);
diff --git a/tests/unit/src/com/android/settings/backup/BackupIntentTest.java b/tests/unit/src/com/android/settings/backup/BackupIntentTest.java
new file mode 100644
index 0000000..0762e8c
--- /dev/null
+++ b/tests/unit/src/com/android/settings/backup/BackupIntentTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.backup;
+
+import android.app.Instrumentation;
+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 org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class BackupIntentTest {
+
+    private static final String INTENT_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS";
+    private static final String INTENT_BACKUP_SETTINGS =
+            "android.settings.BACKUP_AND_RESET_SETTINGS";
+    private static final String BACKUP_SETTINGS_ACTIVITY =
+            "com.android.settings.backup.BackupSettingsActivity";
+
+    private Context mContext;
+
+    @Before
+    public void setUp() throws Exception {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = instrumentation.getTargetContext();
+    }
+
+    @Test
+    public void testBackupSettingsIntentResolvesToOnlyOneActivity(){
+        PackageManager pm = mContext.getPackageManager();
+        Intent intent = new Intent(INTENT_BACKUP_SETTINGS);
+        List<ResolveInfo> activities = pm.queryIntentActivities(intent, 0);
+        assertThat(activities).isNotNull();
+        assertThat(activities.size()).isEqualTo(1);
+        assertThat(activities.get(0).activityInfo.getComponentName().getClassName()).
+                isEqualTo(BACKUP_SETTINGS_ACTIVITY);
+    }
+
+    @Test
+    public void testPrivacySettingsIntentResolvesToOnlyOneActivity(){
+        PackageManager pm = mContext.getPackageManager();
+        Intent intent = new Intent(INTENT_PRIVACY_SETTINGS);
+        List<ResolveInfo> activities = pm.queryIntentActivities(intent, 0);
+        assertThat(activities).isNotNull();
+        assertThat(activities.size()).isEqualTo(1);
+        assertThat(activities.get(0).activityInfo.getComponentName().getClassName()).
+                isEqualTo(BACKUP_SETTINGS_ACTIVITY);
+    }
+
+}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
index 71a1590..10ba293 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
@@ -18,6 +18,7 @@
 
 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.eq;
@@ -26,10 +27,15 @@
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
+import android.util.SparseArray;
 
 import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settings.applications.UserManagerWrapper;
+import com.android.settingslib.applications.StorageStatsSource;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,78 +45,129 @@
 import org.mockito.MockitoAnnotations;
 
 import java.util.ArrayList;
+import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class StorageAsyncLoaderTest {
+    private static final int PRIMARY_USER_ID = 0;
+    private static final int SECONDARY_USER_ID = 10;
+    private static final String PACKAGE_NAME_1 = "com.blah.test";
+    private static final String PACKAGE_NAME_2 = "com.blah.test2";
+
     @Mock
     private StorageStatsSource mSource;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
     private PackageManagerWrapper mPackageManager;
-    ArrayList<ApplicationInfo> mInfo = new ArrayList<>();
+    @Mock
+    private UserManagerWrapper mUserManager;
+    private List<ApplicationInfo> mInfo = new ArrayList<>();
+    private List<UserInfo> mUsers;
 
     private StorageAsyncLoader mLoader;
 
+
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
         mInfo = new ArrayList<>();
-        mLoader = new StorageAsyncLoader(mContext, 1, "id", mSource, mPackageManager);
+        mLoader = new StorageAsyncLoader(mContext, mUserManager, "id", mSource, mPackageManager);
         when(mPackageManager.getInstalledApplicationsAsUser(anyInt(), anyInt())).thenReturn(mInfo);
+        UserInfo info = new UserInfo();
+        mUsers = new ArrayList<>();
+        mUsers.add(info);
+        when(mUserManager.getUsers()).thenReturn(mUsers);
     }
 
     @Test
     public void testLoadingApps() throws Exception {
-        addPackage(1001, 0, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
-        addPackage(1002, 0, 100, 1000, ApplicationInfo.CATEGORY_UNDEFINED);
+        addPackage(PACKAGE_NAME_1, 0, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
+        addPackage(PACKAGE_NAME_2, 0, 100, 1000, ApplicationInfo.CATEGORY_UNDEFINED);
 
-        StorageAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
 
-        assertThat(result.gamesSize).isEqualTo(0L);
-        assertThat(result.otherAppsSize).isEqualTo(1111L);
+        assertThat(result.size()).isEqualTo(1);
+        assertThat(result.get(PRIMARY_USER_ID).gamesSize).isEqualTo(0L);
+        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(1111L);
     }
 
     @Test
     public void testGamesAreFiltered() throws Exception {
-        addPackage(1001, 0, 1, 10, ApplicationInfo.CATEGORY_GAME);
+        addPackage(PACKAGE_NAME_1, 0, 1, 10, ApplicationInfo.CATEGORY_GAME);
 
-        StorageAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
 
-        assertThat(result.gamesSize).isEqualTo(11L);
-        assertThat(result.otherAppsSize).isEqualTo(0);
-    }
-
-    @Test
-    public void testDuplicateUidsAreSkipped() throws Exception {
-        addPackage(1001, 0, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
-        addPackage(1001, 0, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
-
-        StorageAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
-
-        assertThat(result.otherAppsSize).isEqualTo(11L);
+        assertThat(result.size()).isEqualTo(1);
+        assertThat(result.get(PRIMARY_USER_ID).gamesSize).isEqualTo(11L);
+        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(0);
     }
 
     @Test
     public void testCacheIsIgnored() throws Exception {
-        addPackage(1001, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
+        addPackage(PACKAGE_NAME_1, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
 
-        StorageAsyncLoader.AppsStorageResult result = mLoader.loadInBackground();
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
 
-        assertThat(result.otherAppsSize).isEqualTo(11L);
+        assertThat(result.size()).isEqualTo(1);
+        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(11L);
     }
 
-    private void addPackage(int uid, long cacheSize, long codeSize, long dataSize, int category) {
+    @Test
+    public void testMultipleUsers() throws Exception {
+        UserInfo info = new UserInfo();
+        info.id = SECONDARY_USER_ID;
+        mUsers.add(info);
+        when(mSource.getExternalStorageStats(anyString(), eq(UserHandle.SYSTEM)))
+                .thenReturn(new StorageStatsSource.ExternalStorageStats(9, 2, 3, 4));
+        when(mSource.getExternalStorageStats(anyString(), eq(new UserHandle(SECONDARY_USER_ID))))
+                .thenReturn(new StorageStatsSource.ExternalStorageStats(10, 3, 3, 4));
+
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
+
+        assertThat(result.size()).isEqualTo(2);
+        assertThat(result.get(PRIMARY_USER_ID).externalStats.totalBytes).isEqualTo(9L);
+        assertThat(result.get(SECONDARY_USER_ID).externalStats.totalBytes).isEqualTo(10L);
+    }
+
+    @Test
+    public void testSystemAppsBaseSizeIsIgnored() throws Exception {
+        ApplicationInfo systemApp =
+                addPackage(PACKAGE_NAME_1, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
+        systemApp.flags = ApplicationInfo.FLAG_SYSTEM;
+
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
+
+        assertThat(result.size()).isEqualTo(1);
+        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(10L);
+    }
+
+    @Test
+    public void testUpdatedSystemAppCodeSizeIsCounted() throws Exception {
+        ApplicationInfo systemApp =
+                addPackage(PACKAGE_NAME_1, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
+        systemApp.flags = ApplicationInfo.FLAG_SYSTEM & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
+
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
+
+        assertThat(result.size()).isEqualTo(1);
+        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(11L);
+    }
+
+    private ApplicationInfo addPackage(
+            String packageName, long cacheSize, long codeSize, long dataSize, int category) {
         StorageStatsSource.AppStorageStats storageStats =
                 mock(StorageStatsSource.AppStorageStats.class);
         when(storageStats.getCodeBytes()).thenReturn(codeSize);
         when(storageStats.getDataBytes()).thenReturn(dataSize);
-        when(mSource.getStatsForUid(anyString(), eq(uid))).thenReturn(storageStats);
+        when(mSource.getStatsForPackage(anyString(), eq(packageName), any(UserHandle.class)))
+                .thenReturn(storageStats);
 
         ApplicationInfo info = new ApplicationInfo();
-        info.uid = uid;
+        info.packageName = packageName;
         info.category = category;
         mInfo.add(info);
+        return info;
     }
 }