From d08040fabe25bd81db1100c578b98bf03884a1a0 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 12 Jan 2020 20:26:55 -0800
Subject: Import translations. DO NOT MERGE

Change-Id: I51baf91ec9e6e777ac2310d1751f84a36abfe7a9
Auto-generated-cl: translation import
---
 res/values-es/strings.xml     | 4 ++--
 res/values-pt-rPT/strings.xml | 2 +-
 res/values-zh-rHK/strings.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d1fe9fa8..6fd4aeac 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -23,8 +23,8 @@
     <string name="app_not_found_dlg_title" msgid="8897078571059217849">"Aplicación no encontrada"</string>
     <string name="grant_dialog_button_deny" msgid="1649644200597601964">"Denegar"</string>
     <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="5716583584580362144">"Denegar y no volver a preguntar"</string>
-    <string name="grant_dialog_button_deny_background" msgid="5378693207810841555">"Denegar acceso mientras esté en uso"</string>
-    <string name="grant_dialog_button_deny_background_and_dont_ask_again" msgid="1032019626928637454">"Denegar y no volver a preguntar"</string>
+    <string name="grant_dialog_button_deny_background" msgid="5378693207810841555">"Mantener acceso solo mientras esté en uso"</string>
+    <string name="grant_dialog_button_deny_background_and_dont_ask_again" msgid="1032019626928637454">"Mantener y no volver a preguntar"</string>
     <string name="grant_dialog_button_more_info" msgid="6933952978344714007">"Más información"</string>
     <string name="grant_dialog_button_deny_anyway" msgid="6134672842863824171">"Denegar"</string>
     <string name="current_permission_template" msgid="5642540253562598515">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> de <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9b54fffd..5355e2f4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -267,7 +267,7 @@
     <string name="request_role_dont_ask_again" msgid="6250680190065090205">"Não perguntar novamente"</string>
     <string name="request_role_set_as_default" msgid="5706081295230541240">"Definir como predef."</string>
     <string name="default_app_search_keyword" msgid="6938709626391437391">"aplicações predefinidas"</string>
-    <string name="ongoing_usage_dialog_ok" msgid="3007005536659549573">"Compreendi"</string>
+    <string name="ongoing_usage_dialog_ok" msgid="3007005536659549573">"OK"</string>
     <string name="ongoing_usage_dialog_open_settings" msgid="3368892579319881043">"Defin. de privacidade"</string>
     <string name="ongoing_usage_dialog_title" msgid="7173961211414061803">"Aplicações que utilizam: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
     <string name="ongoing_usage_dialog_separator" msgid="9008030412869423988">", "</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index dd7d70a8..0a64676c 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -23,7 +23,7 @@
     <string name="app_not_found_dlg_title" msgid="8897078571059217849">"找不到應用程式"</string>
     <string name="grant_dialog_button_deny" msgid="1649644200597601964">"拒絕"</string>
     <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="5716583584580362144">"拒絕，不要再詢問"</string>
-    <string name="grant_dialog_button_deny_background" msgid="5378693207810841555">"保留前景存取權"</string>
+    <string name="grant_dialog_button_deny_background" msgid="5378693207810841555">"保持「僅在使用此應用程式時允許」"</string>
     <string name="grant_dialog_button_deny_background_and_dont_ask_again" msgid="1032019626928637454">"保持現狀，不要再詢問"</string>
     <string name="grant_dialog_button_more_info" msgid="6933952978344714007">"更多資料"</string>
     <string name="grant_dialog_button_deny_anyway" msgid="6134672842863824171">"仍要拒絕"</string>
-- 
cgit v1.2.3


From e861749b6537943ed0197dc712f8a8722baf0cac Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Thu, 12 Mar 2020 15:33:06 -0700
Subject: DO NOT MERGE: Chassify PermissionController

This was chassified in P, but never made it's way to Q
because it was renamed from PackageInstaller -> PermissionController

Not using baselayouts yet.

Fixes: 151254284
Test: Manually
Change-Id: Ia489787a89b076722c540a19521a344b71816a31
---
 Android.bp                                         |  5 +-
 proguard.flags                                     |  2 +
 res/layout/car_settings_frame.xml                  | 90 ----------------------
 res/values/overlayable.xml                         |  6 --
 res/values/styles.xml                              | 17 ----
 res/values/themes.xml                              |  8 +-
 .../auto/AutoSettingsFrameFragment.java            | 50 ++++++------
 .../ui/auto/AutoAllAppPermissionsFragment.java     |  4 +-
 .../ui/auto/AutoAppPermissionFragment.java         |  9 +--
 9 files changed, 39 insertions(+), 152 deletions(-)
 delete mode 100644 res/layout/car_settings_frame.xml

diff --git a/Android.bp b/Android.bp
index 963ca2be..3bc0ddb8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,6 +42,8 @@ android_app {
         "src/**/*.proto",
     ],
 
+    libs: ["android.car-stubs"],
+
     static_libs: [
         "iconloader",
         "com.google.android.material_material",
@@ -69,7 +71,8 @@ android_app {
         "SettingsLibActionBarShadow",
         "SettingsLibProgressBar",
         "androidx.annotation_annotation",
-        "permissioncontroller-statsd"
+        "permissioncontroller-statsd",
+        "car-ui-lib-bp"
     ],
 
     proto: {
diff --git a/proguard.flags b/proguard.flags
index a2e58846..91f7d382 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -11,3 +11,5 @@
 -keep class * implements com.android.packageinstaller.role.model.RoleBehavior {
     *;
 }
+
+-keep class com.android.car.ui.** {*;}
diff --git a/res/layout/car_settings_frame.xml b/res/layout/car_settings_frame.xml
deleted file mode 100644
index 4381d014..00000000
--- a/res/layout/car_settings_frame.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright 2019 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="@*android:dimen/car_app_bar_height">
-
-        <FrameLayout
-            android:id="@+id/back_button"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="?android:attr/selectableItemBackground"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/start_margin"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-            <ImageView
-                android:layout_width="@*android:dimen/car_primary_icon_size"
-                android:layout_height="@*android:dimen/car_primary_icon_size"
-                android:layout_gravity="center"
-                android:scaleType="fitCenter"
-                android:src="@drawable/ic_arrow_back"
-                android:tint="?android:attr/textColorPrimary"/>
-        </FrameLayout>
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/start_margin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_begin="@*android:dimen/action_bar_margin_start"/>
-
-        <TextView
-            android:id="@+id/label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/start_margin"
-            app:layout_constraintTop_toTopOf="parent"/>
-
-        <Button
-            android:id="@+id/action"
-            style="@*android:style/ActionBarButton"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginEnd="@*android:dimen/action_bar_button_margin"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        android:visibility="gone"/>
-
-    <FrameLayout
-        android:id="@android:id/list_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingEnd="@*android:dimen/car_margin"
-        android:paddingStart="@*android:dimen/car_margin"/>
-</LinearLayout>
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml
index 6d0dda5a..2bcb571a 100644
--- a/res/values/overlayable.xml
+++ b/res/values/overlayable.xml
@@ -248,14 +248,8 @@
             <item type="dimen" name="car_icon_size" />
             <!-- END CAR DIMENS -->
 
-            <!-- START CAR STYLES -->
-            <item type="style" name="CarPreferenceFragment" />
-            <item type="style" name="CarPreferenceFragmentList" />
-            <!-- END CAR STYLES -->
-
             <!-- START CAR THEMES -->
             <item type="style" name="CarSettings" />
-            <item type="style" name="CarPreferenceTheme" />
             <!-- END CAR THEMES -->
 
         </policy>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5516dbe3..55c47787 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -869,21 +869,4 @@
 
     <!-- END ACCESSIBILITY SERVICE DIALOG ITEM -->
 
-    <!-- START CAR SETTINGS PREFERENCE STYLES -->
-
-    <style name="CarPreferenceFragment">
-        <item name="android:layout">@layout/car_settings_frame</item>
-    </style>
-
-    <style name="CarPreferenceFragmentList">
-        <item name="android:paddingTop">0dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:paddingStart">0dp</item>
-        <item name="android:paddingEnd">0dp</item>
-        <item name="android:paddingLeft">0dp</item>
-        <item name="android:paddingRight">0dp</item>
-    </style>
-
-    <!-- END CAR SETTINGS PREFERENCE STYLES -->
-
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b8ed550a..fb456402 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -77,14 +77,8 @@
            parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar">
     </style>
 
-    <style name="CarSettings" parent="@android:style/Theme.DeviceDefault.NoActionBar">
-        <item name="preferenceTheme">@style/CarPreferenceTheme</item>
+    <style name="CarSettings" parent="Theme.CarUi">
         <item name="carDividerColor">@*android:color/car_list_divider</item>
     </style>
 
-    <style name="CarPreferenceTheme">
-        <item name="preferenceFragmentCompatStyle">@style/CarPreferenceFragment</item>
-        <item name="preferenceFragmentListStyle">@style/CarPreferenceFragmentList</item>
-    </style>
-
 </resources>
diff --git a/src/com/android/packageinstaller/auto/AutoSettingsFrameFragment.java b/src/com/android/packageinstaller/auto/AutoSettingsFrameFragment.java
index ea8987e3..d89ced7b 100644
--- a/src/com/android/packageinstaller/auto/AutoSettingsFrameFragment.java
+++ b/src/com/android/packageinstaller/auto/AutoSettingsFrameFragment.java
@@ -21,22 +21,21 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.preference.PreferenceFragmentCompat;
 
+import com.android.car.ui.preference.PreferenceFragment;
+import com.android.car.ui.toolbar.MenuItem;
+import com.android.car.ui.toolbar.ToolbarController;
 import com.android.permissioncontroller.R;
 
+import java.util.Collections;
+
 /** Common settings frame for car related settings in permission controller. */
-public abstract class AutoSettingsFrameFragment extends PreferenceFragmentCompat {
+public abstract class AutoSettingsFrameFragment extends PreferenceFragment {
 
-    private TextView mLabelView;
-    private ProgressBar mProgressBar;
-    private Button mAction;
+    private ToolbarController mToolbar;
 
     private CharSequence mLabel;
     private boolean mIsLoading;
@@ -48,16 +47,10 @@ public abstract class AutoSettingsFrameFragment extends PreferenceFragmentCompat
             @Nullable Bundle savedInstanceState) {
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
 
-        View backButton = rootView.findViewById(R.id.back_button);
-        backButton.setOnClickListener(v -> getActivity().onBackPressed());
+        mToolbar = rootView.findViewById(R.id.toolbar);
 
-        mLabelView = rootView.findViewById(R.id.label);
         updateHeaderLabel();
-
-        mProgressBar = rootView.findViewById(R.id.progress_bar);
         updateLoading();
-
-        mAction = rootView.findViewById(R.id.action);
         updateAction();
 
         return rootView;
@@ -66,6 +59,10 @@ public abstract class AutoSettingsFrameFragment extends PreferenceFragmentCompat
     /** Sets the header text of this fragment. */
     public void setHeaderLabel(CharSequence label) {
         mLabel = label;
+        if (getPreferenceScreen() != null) {
+            // Needed because CarUi's preference fragment reads this title
+            getPreferenceScreen().setTitle(mLabel);
+        }
         updateHeaderLabel();
     }
 
@@ -75,8 +72,8 @@ public abstract class AutoSettingsFrameFragment extends PreferenceFragmentCompat
     }
 
     private void updateHeaderLabel() {
-        if (mLabelView != null) {
-            mLabelView.setText(mLabel);
+        if (mToolbar != null) {
+            mToolbar.setTitle(mLabel);
         }
     }
 
@@ -91,8 +88,12 @@ public abstract class AutoSettingsFrameFragment extends PreferenceFragmentCompat
     }
 
     private void updateLoading() {
-        if (mProgressBar != null) {
-            mProgressBar.setVisibility(mIsLoading ? View.VISIBLE : View.GONE);
+        if (mToolbar != null) {
+            if (mIsLoading) {
+                mToolbar.showProgressBar();
+            } else {
+                mToolbar.hideProgressBar();
+            }
         }
     }
 
@@ -107,15 +108,16 @@ public abstract class AutoSettingsFrameFragment extends PreferenceFragmentCompat
     }
 
     private void updateAction() {
-        if (mAction == null) {
+        if (mToolbar == null) {
             return;
         }
         if (!TextUtils.isEmpty(mActionLabel) && mActionOnClickListener != null) {
-            mAction.setText(mActionLabel);
-            mAction.setOnClickListener(mActionOnClickListener);
-            mAction.setVisibility(View.VISIBLE);
+            mToolbar.setMenuItems(Collections.singletonList(MenuItem.builder(getContext())
+                    .setTitle(mActionLabel)
+                    .setOnClickListener(i -> mActionOnClickListener.onClick(null))
+                    .build()));
         } else {
-            mAction.setVisibility(View.GONE);
+            mToolbar.setMenuItems(null);
         }
     }
 }
diff --git a/src/com/android/packageinstaller/permission/ui/auto/AutoAllAppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/auto/AutoAllAppPermissionsFragment.java
index c07fe5ff..006aec3a 100644
--- a/src/com/android/packageinstaller/permission/ui/auto/AutoAllAppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/auto/AutoAllAppPermissionsFragment.java
@@ -16,7 +16,6 @@
 
 package com.android.packageinstaller.permission.ui.auto;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -41,6 +40,7 @@ import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceViewHolder;
 import androidx.preference.SwitchPreference;
 
+import com.android.car.ui.AlertDialogBuilder;
 import com.android.packageinstaller.auto.AutoSettingsFrameFragment;
 import com.android.packageinstaller.permission.model.AppPermissionGroup;
 import com.android.packageinstaller.permission.model.Permission;
@@ -251,7 +251,7 @@ public class AutoAllAppPermissionsFragment extends AutoSettingsFrameFragment {
         final CharSequence desc = perm.loadDescription(pm);
 
         pref.setOnPreferenceClickListener((Preference preference) -> {
-            new AlertDialog.Builder(getContext())
+            new AlertDialogBuilder(getContext())
                     .setMessage(desc)
                     .setPositiveButton(android.R.string.ok, /* listener= */ null)
                     .show();
diff --git a/src/com/android/packageinstaller/permission/ui/auto/AutoAppPermissionFragment.java b/src/com/android/packageinstaller/permission/ui/auto/AutoAppPermissionFragment.java
index ecbde6c5..1ff7c769 100644
--- a/src/com/android/packageinstaller/permission/ui/auto/AutoAppPermissionFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/auto/AutoAppPermissionFragment.java
@@ -19,7 +19,6 @@ package com.android.packageinstaller.permission.ui.auto;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
@@ -43,6 +42,7 @@ import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.TwoStatePreference;
 
+import com.android.car.ui.AlertDialogBuilder;
 import com.android.packageinstaller.auto.AutoSettingsFrameFragment;
 import com.android.packageinstaller.permission.model.AppPermissionGroup;
 import com.android.packageinstaller.permission.model.Permission;
@@ -772,15 +772,14 @@ public class AutoAppPermissionFragment extends AutoSettingsFrameFragment {
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             AutoAppPermissionFragment fragment = (AutoAppPermissionFragment) getTargetFragment();
-            AlertDialog.Builder b = new AlertDialog.Builder(getContext())
+            return new AlertDialogBuilder(getContext())
                     .setMessage(getArguments().getInt(MSG))
                     .setNegativeButton(R.string.cancel,
                             (dialog, which) -> fragment.updateUi())
                     .setPositiveButton(R.string.grant_dialog_button_deny_anyway,
                             (dialog, which) ->
-                                    fragment.onDenyAnyWay(getArguments().getInt(CHANGE_TARGET)));
-
-            return b.create();
+                                    fragment.onDenyAnyWay(getArguments().getInt(CHANGE_TARGET)))
+                    .create();
         }
     }
 
-- 
cgit v1.2.3


From 42838e2ee7b30538fd43bbf530b108ef03a59a82 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 20 Mar 2020 12:32:35 -0700
Subject: Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Change-Id: I01027c32c8666e6f3153d735722e3fce5263a927
---
 res/values-ar/strings.xml     |  6 +++---
 res/values-bg/strings.xml     |  2 +-
 res/values-ca/strings.xml     |  2 +-
 res/values-es-rUS/strings.xml |  2 +-
 res/values-es/strings.xml     | 16 ++++++++--------
 res/values-fr/strings.xml     |  6 +++---
 res/values-gl/strings.xml     |  4 ++--
 res/values-hy/strings.xml     |  4 ++--
 res/values-it/strings.xml     |  4 ++--
 res/values-ja/strings.xml     |  8 ++++----
 res/values-ky/strings.xml     |  2 +-
 res/values-mr/strings.xml     |  2 +-
 res/values-nb/strings.xml     |  4 ++--
 res/values-or/strings.xml     |  2 +-
 res/values-pt-rBR/strings.xml |  2 +-
 res/values-pt-rPT/strings.xml |  8 ++++----
 res/values-pt/strings.xml     |  2 +-
 res/values-ru/strings.xml     |  6 +++---
 res/values-uk/strings.xml     |  6 +++---
 res/values-zh-rHK/strings.xml |  2 +-
 20 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index faf1ef3c..8e4088c8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -66,8 +66,8 @@
     <string name="system_warning" msgid="6868290533389195836">"في حال رفض هذا الإذن، قد لا تعمل ميزات أساسية في جهازك على النحو المطلوب."</string>
     <string name="permission_summary_enforced_by_policy" msgid="632945329450867948">"فرضته إحدى السياسات"</string>
     <string name="permission_summary_disabled_by_policy_background_only" msgid="137178879402491132">"تمّ إيقاف الوصول إلى الخلفية بواسطة السياسة."</string>
-    <string name="permission_summary_enabled_by_policy_background_only" msgid="2699118232240494204">"تمّ تفعيل الوصول إلى الخلفية بواسطة السياسة."</string>
-    <string name="permission_summary_enabled_by_policy_foreground_only" msgid="8652417310534780420">"تمّ تفعيل الوصول إلى المقدمة بواسطة السياسة."</string>
+    <string name="permission_summary_enabled_by_policy_background_only" msgid="2699118232240494204">"تمّ تمكين الوصول إلى الخلفية بواسطة السياسة."</string>
+    <string name="permission_summary_enabled_by_policy_foreground_only" msgid="8652417310534780420">"تمّ تمكين الوصول إلى المقدمة بواسطة السياسة."</string>
     <string name="permission_summary_enforced_by_admin" msgid="5156952484229154563">"إعدادات يتحكم فيها المشرف"</string>
     <string name="permission_summary_disabled_by_admin_background_only" msgid="3580805532594984554">"أوقف المشرف وصول التطبيق للبيانات أثناء عدم نشاطه."</string>
     <string name="permission_summary_enabled_by_admin_background_only" msgid="5087543391647053237">"فعَّل المشرف وصول التطبيق للبيانات أثناء عدم نشاطه."</string>
@@ -323,7 +323,7 @@
     <string name="incident_report_notification_text" msgid="8316657912290049576">"يريد تطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> تحميل معلومات تصحيح الأخطاء."</string>
     <string name="incident_report_dialog_title" msgid="6147075171471634629">"مشاركة بيانات تصحيح الأخطاء"</string>
     <string name="incident_report_dialog_intro" msgid="153446034925770956">"رصَد النظام مشكلة."</string>
-    <string name="incident_report_dialog_text" msgid="6838105320223101131">"يطلب تطبيق <xliff:g id="APP_NAME_0">%1$s</xliff:g> تحميل تقرير خطأ من هذا الجهاز تم تسجيله بتاريخ <xliff:g id="DATE">%2$s</xliff:g> في <xliff:g id="TIME">%3$s</xliff:g>. وتشمل تقارير الأخطاء المعلومات الشخصية حول جهازك أو المعلومات التي سجلتها التطبيقات، مثل أسماء المستخدمين وبيانات الموقع الجغرافي ومعرّفات الأجهزة ومعلومات الشبكة. ويجب عدم مشاركة تقارير الأخطاء إلا مع المستخدمين والتطبيقات التي تثق بمشاركة هذه المعلومات معها. هل تريد السماح لتطبيق <xliff:g id="APP_NAME_1">%4$s</xliff:g> بتحميل تقرير خطأ؟"</string>
+    <string name="incident_report_dialog_text" msgid="6838105320223101131">"يطلب تطبيق <xliff:g id="APP_NAME_0">%1$s</xliff:g> تحميل تقرير للأخطاء من هذا الجهاز تم تسجيله بتاريخ <xliff:g id="DATE">%2$s</xliff:g> في <xliff:g id="TIME">%3$s</xliff:g>. وتشمل تقارير الأخطاء المعلومات الشخصية حول جهازك أو المعلومات التي سجلتها التطبيقات، مثل أسماء المستخدمين وبيانات الموقع الجغرافي ومعرّفات الأجهزة ومعلومات الشبكة. ويجب عدم مشاركة تقارير الأخطاء إلا مع المستخدمين والتطبيقات التي تثق بمشاركة هذه المعلومات معها. هل تريد السماح لتطبيق <xliff:g id="APP_NAME_1">%4$s</xliff:g> بتحميل تقرير أخطاء؟"</string>
     <string name="incident_report_error_dialog_text" msgid="1001752000696958519">"حدث خطأ أثناء معالجة تقرير الخطأ لتطبيق <xliff:g id="APP_NAME">%1$s</xliff:g>، ولذلك تم رفض مشاركة بيانات تصحيح الأخطاء التفصيلية. نأسف للمقاطعة."</string>
     <string name="incident_report_dialog_allow_label" msgid="6863130835544805205">"سماح"</string>
     <string name="incident_report_dialog_deny_label" msgid="1297192379930944676">"رفض"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1bf6a418..3cc09e6c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -306,5 +306,5 @@
     <string name="adjust_user_sensitive_per_app_header" msgid="1372152438971168364">"Открояване на употребата за следното"</string>
     <string name="assistant_record_audio_user_sensitive_title" msgid="5382972366928946381">"Показване на икона за готовност на Асистент"</string>
     <string name="assistant_record_audio_user_sensitive_summary" msgid="6852572549436960848">"Показване на икона в лентата на състоянието, когато микрофонът се използва за активиране на гласовия асистент"</string>
-    <string name="permgrouprequest_storage_isolated" msgid="1019696034804170865">"Да се разреши ли на &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; да осъществява достъп до снимките и мултимедията на устройството ви?"</string>
+    <string name="permgrouprequest_storage_isolated" msgid="1019696034804170865">"Да се разреши ли на &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; да има достъп до снимките и мултимедията на устройството ви?"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6228b4bf..42b2eb95 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -23,7 +23,7 @@
     <string name="app_not_found_dlg_title" msgid="8897078571059217849">"No s\'ha trobat l\'aplicació"</string>
     <string name="grant_dialog_button_deny" msgid="1649644200597601964">"Denega"</string>
     <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="5716583584580362144">"Denega i no m\'ho tornis a preguntar"</string>
-    <string name="grant_dialog_button_deny_background" msgid="5378693207810841555">"Denega l\'accés mentre estigui en ús"</string>
+    <string name="grant_dialog_button_deny_background" msgid="5378693207810841555">"Permet l\'accés mentre estigui en ús"</string>
     <string name="grant_dialog_button_deny_background_and_dont_ask_again" msgid="1032019626928637454">"Denega i no m\'ho tornis a preguntar"</string>
     <string name="grant_dialog_button_more_info" msgid="6933952978344714007">"Més informació"</string>
     <string name="grant_dialog_button_deny_anyway" msgid="6134672842863824171">"Denega igualment"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b1512c78..e3bc7188 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -173,7 +173,7 @@
     <string name="app_permission_footer_app_permissions_link" msgid="8033278634020892918">"Ver todos los permisos de <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_permission_footer_permission_apps_link" msgid="8759141212929298774">"Ver todas las apps que tienen este permiso"</string>
     <string name="permission_description_summary_generic" msgid="5479202003136667039">"Las apps con este permiso pueden <xliff:g id="DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"Las apps que tienen este permiso pueden acceder a tu actividad física, recorridos a pie o en bicicleta, trayectos en automóvil, recuento de pasos y mucho más"</string>
+    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"Las apps que tienen este permiso pueden acceder a tu actividad física, recorridos a pie o en bicicleta, trayectos en automóvil, recuento de pasos y más"</string>
     <string name="permission_description_summary_calendar" msgid="2846128908236787586">"Las apps con este permiso pueden acceder a tu calendario"</string>
     <string name="permission_description_summary_call_log" msgid="2429916962093948340">"Las apps que tienen este permiso pueden leer el registro de llamadas del teléfono y escribir en él"</string>
     <string name="permission_description_summary_camera" msgid="6699611334403400091">"Las apps que tienen este permiso pueden tomar fotos y grabar videos"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6fd4aeac..317381c0 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -53,9 +53,9 @@
     </plurals>
     <string name="old_sdk_deny_warning" msgid="6018489265342857714">"Esta aplicación está diseñada para una versión anterior de Android. Si se le deniega el permiso, puede dejar de funcionar de la forma prevista."</string>
     <string name="default_permission_description" msgid="692254823411049573">"realizar una acción desconocida"</string>
-    <string name="app_permissions_group_summary" msgid="5019625174481872207">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicaciones con el permiso"</string>
-    <string name="menu_show_system" msgid="7623002570829860709">"Mostrar aplicaciones del sistema"</string>
-    <string name="menu_hide_system" msgid="2274204366405029090">"Ocultar aplicaciones del sistema"</string>
+    <string name="app_permissions_group_summary" msgid="5019625174481872207">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicaciones con permiso"</string>
+    <string name="menu_show_system" msgid="7623002570829860709">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="2274204366405029090">"Ocultar sistema"</string>
     <string name="no_apps" msgid="2377153782338039463">"No hay aplicaciones"</string>
     <string name="location_settings" msgid="547378321761364906">"Ajustes de ubicación"</string>
     <string name="location_warning" msgid="4687406043150343369">"<xliff:g id="APP_NAME">%1$s</xliff:g> es un proveedor de servicios de ubicación de este dispositivo. El acceso a la ubicación se puede modificar en los ajustes de ubicación."</string>
@@ -92,7 +92,7 @@
     <string name="current_permissions_category" msgid="3835461245150972589">"Permisos actuales"</string>
     <string name="message_staging" msgid="641286607664721291">"Preparando aplicación…"</string>
     <string name="app_name_unknown" msgid="8288360585728122735">"Desconocida"</string>
-    <string name="permission_usage_title" msgid="6808284837306026819">"Panel"</string>
+    <string name="permission_usage_title" msgid="6808284837306026819">"Panel de control"</string>
     <string name="permission_usage_summary_foreground" msgid="2482299388611440256">"Último acceso: <xliff:g id="TIME">%1$s</xliff:g>\nÚltimo acceso mientras la aplicación estaba en uso"</string>
     <string name="permission_usage_summary_background" msgid="4789805581854248472">"Último acceso: <xliff:g id="TIME">%1$s</xliff:g>\nÚltimo acceso en segundo plano"</string>
     <string name="permission_usage_any_permission" msgid="7824062114364689751">"Cualquier permiso"</string>
@@ -173,7 +173,7 @@
     <string name="app_permission_footer_app_permissions_link" msgid="8033278634020892918">"Ver todos los permisos de <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_permission_footer_permission_apps_link" msgid="8759141212929298774">"Ver todas las aplicaciones con este permiso"</string>
     <string name="permission_description_summary_generic" msgid="5479202003136667039">"Las aplicaciones con este permiso pueden <xliff:g id="DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"Las aplicaciones con este permiso pueden acceder a tu actividad física, como paseos a pie o en bici, trayectos en coche, recuento de pasos y mucho más"</string>
+    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"Las aplicaciones con este permiso pueden acceder a tu actividad física, como paseos a pie o en bici, trayectos en coche, recuento de pasos y más"</string>
     <string name="permission_description_summary_calendar" msgid="2846128908236787586">"Las aplicaciones que tengan este permiso pueden acceder a tu calendario"</string>
     <string name="permission_description_summary_call_log" msgid="2429916962093948340">"Las aplicaciones que tengan este permiso pueden leer y editar el registro de llamadas del teléfono"</string>
     <string name="permission_description_summary_camera" msgid="6699611334403400091">"Las aplicaciones que tengan este permiso pueden hacer fotos y grabar vídeo"</string>
@@ -188,10 +188,10 @@
     <string name="app_permission_most_recent_denied_summary" msgid="127066792562419809">"Actualmente denegado / Último acceso: <xliff:g id="TIME_DATE">%1$s</xliff:g>"</string>
     <string name="app_permission_never_accessed_summary" msgid="594285912530635023">"No ha accedido nunca"</string>
     <string name="app_permission_never_accessed_denied_summary" msgid="4791195647350628165">"Denegado / Último acceso: Nunca"</string>
-    <string name="allowed_header" msgid="6279244592227088158">"Con permiso"</string>
+    <string name="allowed_header" msgid="6279244592227088158">"Permitido"</string>
     <string name="allowed_always_header" msgid="6698473105201405782">"Permitido siempre"</string>
     <string name="allowed_foreground_header" msgid="7553595563464819175">"Permitido solo mientras se usa"</string>
-    <string name="denied_header" msgid="2277998574238617699">"Sin permiso"</string>
+    <string name="denied_header" msgid="2277998574238617699">"Denegado"</string>
     <string name="detailed_usage_link" msgid="3990452346369247944">"Ver uso detallado"</string>
     <plurals name="days" formatted="false" msgid="3903419301028414979">
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> días</item>
@@ -216,7 +216,7 @@
     <string name="no_permissions_allowed" msgid="5781278485002145993">"No se ha concedido ningún permiso"</string>
     <string name="no_permissions_denied" msgid="2449583707612365442">"No se ha denegado ningún permiso"</string>
     <string name="no_apps_allowed" msgid="4529095928504611810">"Ninguna aplicación tiene permiso"</string>
-    <string name="no_apps_denied" msgid="2736758388618487796">"A ninguna aplicación se le ha denegado el permiso"</string>
+    <string name="no_apps_denied" msgid="2736758388618487796">"No hay aplicaciones denegadas"</string>
     <string name="car_permission_selected" msgid="2163426344720483487">"Seleccionado"</string>
     <string name="settings" msgid="2884124136779508907">"Ajustes"</string>
     <string name="accessibility_service_dialog_title_single" msgid="1613456964930225277">"<xliff:g id="SERVICE_NAME">%s</xliff:g> tiene acceso completo a tu dispositivo"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3b66c14b..5ff501e6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -179,7 +179,7 @@
     <string name="permission_description_summary_camera" msgid="6699611334403400091">"Les applications disposant de cette autorisation peuvent prendre des photos et enregistrer des vidéos"</string>
     <string name="permission_description_summary_contacts" msgid="5169995707720233126">"Les applications disposant de cette autorisation peuvent accéder à vos contacts"</string>
     <string name="permission_description_summary_location" msgid="687820658574645201">"Les applications disposant de cette autorisation peuvent accéder à la position de cet appareil"</string>
-    <string name="permission_description_summary_microphone" msgid="2300290217308759293">"Les applications disposant de cette autorisation peuvent enregistrer des fichiers audio"</string>
+    <string name="permission_description_summary_microphone" msgid="2300290217308759293">"Les applications disposant de cette autorisation peuvent enregistrer du contenu audio"</string>
     <string name="permission_description_summary_phone" msgid="3773977614654088578">"Les applications disposant de cette autorisation permettent de passer des appels téléphoniques et de les gérer"</string>
     <string name="permission_description_summary_sensors" msgid="6733606479604624853">"Les applications disposant de cette autorisation peuvent accéder aux données des capteurs corporels"</string>
     <string name="permission_description_summary_sms" msgid="8850213022386508528">"Les applications disposant de cette autorisation peuvent envoyer et lire des SMS"</string>
@@ -215,8 +215,8 @@
     <string name="permission_subtitle_only_in_foreground" msgid="3101936262905298459">"Seulement quand l\'application est en cours d\'utilisation"</string>
     <string name="no_permissions_allowed" msgid="5781278485002145993">"Aucune autorisation accordée"</string>
     <string name="no_permissions_denied" msgid="2449583707612365442">"Aucune autorisation refusée"</string>
-    <string name="no_apps_allowed" msgid="4529095928504611810">"Cette autorisation n\'a été accordée à aucune application"</string>
-    <string name="no_apps_denied" msgid="2736758388618487796">"Cette autorisation n\'a été refusée à aucune application"</string>
+    <string name="no_apps_allowed" msgid="4529095928504611810">"Aucune application autorisée"</string>
+    <string name="no_apps_denied" msgid="2736758388618487796">"Aucune application refusée"</string>
     <string name="car_permission_selected" msgid="2163426344720483487">"Sélectionnée"</string>
     <string name="settings" msgid="2884124136779508907">"Paramètres"</string>
     <string name="accessibility_service_dialog_title_single" msgid="1613456964930225277">"<xliff:g id="SERVICE_NAME">%s</xliff:g> bénéficie d\'un accès complet à votre appareil"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 5ee2681c..6023a0ad 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -23,7 +23,7 @@
     <string name="app_not_found_dlg_title" msgid="8897078571059217849">"Non se encontrou a aplicación"</string>
     <string name="grant_dialog_button_deny" msgid="1649644200597601964">"Denegar"</string>
     <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="5716583584580362144">"Denegar e non volver preguntar"</string>
-    <string name="grant_dialog_button_deny_background" msgid="5378693207810841555">"Seguir permitindo que acceda mentres se utilice"</string>
+    <string name="grant_dialog_button_deny_background" msgid="5378693207810841555">"Seguir permitindo que acceda mentres estea en uso"</string>
     <string name="grant_dialog_button_deny_background_and_dont_ask_again" msgid="1032019626928637454">"Conservar e non preguntar de novo"</string>
     <string name="grant_dialog_button_more_info" msgid="6933952978344714007">"Máis info."</string>
     <string name="grant_dialog_button_deny_anyway" msgid="6134672842863824171">"Denegar"</string>
@@ -190,7 +190,7 @@
     <string name="app_permission_never_accessed_denied_summary" msgid="4791195647350628165">"Denegado/Non accedeu nunca"</string>
     <string name="allowed_header" msgid="6279244592227088158">"Permiso concedido"</string>
     <string name="allowed_always_header" msgid="6698473105201405782">"Permítese sempre"</string>
-    <string name="allowed_foreground_header" msgid="7553595563464819175">"Só se permite mentres se utiliza"</string>
+    <string name="allowed_foreground_header" msgid="7553595563464819175">"Só se permite mentres estea en uso"</string>
     <string name="denied_header" msgid="2277998574238617699">"Permiso denegado"</string>
     <string name="detailed_usage_link" msgid="3990452346369247944">"Ver uso detallado"</string>
     <plurals name="days" formatted="false" msgid="3903419301028414979">
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index ba19e675..88a83165 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -57,8 +57,8 @@
     <string name="menu_show_system" msgid="7623002570829860709">"Ցույց տալ համակարգի հավելվածները"</string>
     <string name="menu_hide_system" msgid="2274204366405029090">"Թաքցնել համակարգի հավելվածները"</string>
     <string name="no_apps" msgid="2377153782338039463">"Հավելվածներ չկան"</string>
-    <string name="location_settings" msgid="547378321761364906">"Տեղորոշման կարգավորումներ"</string>
-    <string name="location_warning" msgid="4687406043150343369">"Այս սարքի տեղորոշման ծառայությունները տրամադրում է <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածը: Տեղադրության ցուցադրման կարգավորումները կարող եք փոխել տեղորոշման կարգավորումներից:"</string>
+    <string name="location_settings" msgid="547378321761364906">"Տեղադրության կարգավորումներ"</string>
+    <string name="location_warning" msgid="4687406043150343369">"Այս սարքի տեղորոշման ծառայությունները տրամադրում է <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածը: Տեղադրության ցուցադրման կարգավորումները կարող եք փոխել տեղադրության կարգավորումներում:"</string>
     <string name="system_warning" msgid="6868290533389195836">"Եթե այս թույլտվությունը մերժեք, ձեր սարքի հիմնական գործառույթները հնարավոր է պատշաճ չաշխատեն:"</string>
     <string name="permission_summary_enforced_by_policy" msgid="632945329450867948">"Կանոնների համաձայն"</string>
     <string name="permission_summary_disabled_by_policy_background_only" msgid="137178879402491132">"Հասանելիությունը ֆոնային ռեժիմում անջատած է կանոնի համաձայն"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c7d4e94c..8763654c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -53,7 +53,7 @@
     </plurals>
     <string name="old_sdk_deny_warning" msgid="6018489265342857714">"Questa app è stata sviluppata per una versione precedente di Android. Se l\'autorizzazione viene rifiutata, l\'app potrebbe non funzionare più come previsto."</string>
     <string name="default_permission_description" msgid="692254823411049573">"esegue un\'azione sconosciuta"</string>
-    <string name="app_permissions_group_summary" msgid="5019625174481872207">"Sono consentite <xliff:g id="COUNT_0">%1$d</xliff:g> app su <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="5019625174481872207">"App consentite: <xliff:g id="COUNT_0">%1$d</xliff:g> su <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="menu_show_system" msgid="7623002570829860709">"Mostra sistema"</string>
     <string name="menu_hide_system" msgid="2274204366405029090">"Nascondi sistema"</string>
     <string name="no_apps" msgid="2377153782338039463">"Nessuna app"</string>
@@ -249,7 +249,7 @@
     <string name="role_emergency_request_title" msgid="6595296517085761522">"Impostare <xliff:g id="APP_NAME">%1$s</xliff:g> come app di emergenza predefinita?"</string>
     <string name="role_emergency_request_description" msgid="2824966073894226992">"Nessuna autorizzazione necessaria"</string>
     <string name="role_home_label" msgid="6245106863177808486">"App casa predefinita"</string>
-    <string name="role_home_short_label" msgid="4565882523300643525">"App casa"</string>
+    <string name="role_home_short_label" msgid="4565882523300643525">"App iniziale"</string>
     <string name="role_home_description" msgid="6736956389161158052">"App, spesso chiamate Avvio app, che sostituiscono le schermate Home sul tuo dispositivo Android e che ti forniscono l\'accesso ai contenuti e alle funzionalità del dispositivo"</string>
     <string name="role_home_request_title" msgid="2964609319767315444">"Impostare <xliff:g id="APP_NAME">%1$s</xliff:g> come app casa predefinita?"</string>
     <string name="role_home_request_description" msgid="6437733879812403277">"Nessuna autorizzazione necessaria"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 83208fdc..245dd9dd 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -54,8 +54,8 @@
     <string name="old_sdk_deny_warning" msgid="6018489265342857714">"このアプリは Android の以前のバージョンを対象としています。権限を許可しないと、意図されたとおりに動作しなくなる可能性があります。"</string>
     <string name="default_permission_description" msgid="692254823411049573">"不明な操作の実行"</string>
     <string name="app_permissions_group_summary" msgid="5019625174481872207">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> 個のアプリを許可"</string>
-    <string name="menu_show_system" msgid="7623002570829860709">"システムを表示"</string>
-    <string name="menu_hide_system" msgid="2274204366405029090">"システムを表示しない"</string>
+    <string name="menu_show_system" msgid="7623002570829860709">"システムアプリを表示"</string>
+    <string name="menu_hide_system" msgid="2274204366405029090">"システムアプリを表示しない"</string>
     <string name="no_apps" msgid="2377153782338039463">"アプリがありません"</string>
     <string name="location_settings" msgid="547378321761364906">"位置情報の設定"</string>
     <string name="location_warning" msgid="4687406043150343369">"<xliff:g id="APP_NAME">%1$s</xliff:g>はこのデバイスの位置情報サービスのプロバイダです。位置情報へのアクセスは位置情報の設定から変更できます。"</string>
@@ -172,8 +172,8 @@
     <string name="app_permission_footer_not_available" msgid="8880039652295478414">"現在、この権限の最終アクセスデータはご利用いただけません"</string>
     <string name="app_permission_footer_app_permissions_link" msgid="8033278634020892918">"<xliff:g id="APP">%1$s</xliff:g>の権限をすべて表示"</string>
     <string name="app_permission_footer_permission_apps_link" msgid="8759141212929298774">"この権限があるアプリをすべて表示"</string>
-    <string name="permission_description_summary_generic" msgid="5479202003136667039">"この権限があるアプリで可能な操作: <xliff:g id="DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"この権限があるアプリは、ウォーキング、自転車、運転、歩数など、運動データにアクセスできます"</string>
+    <string name="permission_description_summary_generic" msgid="5479202003136667039">"この権限があるアプリは、<xliff:g id="DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"この権限があるアプリは、ウォーキング、自転車、運転、歩数などの運動データにアクセスできます"</string>
     <string name="permission_description_summary_calendar" msgid="2846128908236787586">"この権限があるアプリはカレンダーにアクセスできます"</string>
     <string name="permission_description_summary_call_log" msgid="2429916962093948340">"この権限があるアプリは通話履歴の読み取りと書き込みを行えます"</string>
     <string name="permission_description_summary_camera" msgid="6699611334403400091">"この権限があるアプリは写真や動画を撮影できます"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index c426018d..6ff0362e 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -85,7 +85,7 @@
     <string name="wear_not_allowed_dlg_title" msgid="6923880912091041609">"Android Wear"</string>
     <string name="wear_not_allowed_dlg_text" msgid="8731817202551430387">"Орнотуу/чыгарып салуу аракеттери Android Wear\'де колдоого алынбайт."</string>
     <string name="permission_review_title_template_install" msgid="8131698354985303888">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; колдонмосу үчүн уруксаттарды тандаңыз"</string>
-    <string name="permission_review_title_template_update" msgid="7597155653571395485">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; жаңыртылды. Ал үчүн уруксаттарды тандаңыз."</string>
+    <string name="permission_review_title_template_update" msgid="7597155653571395485">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; жаңырды. Ал үчүн уруксаттарды тандаңыз."</string>
     <string name="review_button_cancel" msgid="7108377593627664194">"Жок"</string>
     <string name="review_button_continue" msgid="1367925420132212571">"Улантуу"</string>
     <string name="new_permissions_category" msgid="7242713808413888679">"Жаңы уруксаттар"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index c082fcdd..3212d68b 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -306,5 +306,5 @@
     <string name="adjust_user_sensitive_per_app_header" msgid="1372152438971168364">"पुढील गोष्टींचा वापर ठळक करा"</string>
     <string name="assistant_record_audio_user_sensitive_title" msgid="5382972366928946381">"असिस्टंट ट्रिगर डिटेक्शन दाखवा"</string>
     <string name="assistant_record_audio_user_sensitive_summary" msgid="6852572549436960848">"व्हॉइस असिस्टंट अ‍ॅक्टिव्हेट करण्यासाठी मायक्रोफोन वापरला जाईल तेव्हा स्टेटस बारमध्ये आयकन दाखवा"</string>
-    <string name="permgrouprequest_storage_isolated" msgid="1019696034804170865">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; ला तुमच्या डिव्हाइसवरील फोटो, मीडिया आणि फायली अ‍ॅक्सेस करू द्यायचे?"</string>
+    <string name="permgrouprequest_storage_isolated" msgid="1019696034804170865">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; ला तुमच्या डिव्हाइसवरील फोटो, मीडिया आणि फाइल अ‍ॅक्सेस करू द्यायच्या?"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d4770f04..38f82380 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -54,8 +54,8 @@
     <string name="old_sdk_deny_warning" msgid="6018489265342857714">"Denne appen er laget for en eldre versjon av Android. Hvis du ikke gir tillatelse, kan det føre til at den ikke lenger fungerer som den skal."</string>
     <string name="default_permission_description" msgid="692254823411049573">"utføre en ukjent handling"</string>
     <string name="app_permissions_group_summary" msgid="5019625174481872207">"<xliff:g id="COUNT_0">%1$d</xliff:g> av <xliff:g id="COUNT_1">%2$d</xliff:g> apper er tillatt"</string>
-    <string name="menu_show_system" msgid="7623002570829860709">"Vis systemapper"</string>
-    <string name="menu_hide_system" msgid="2274204366405029090">"Skjul systemapper"</string>
+    <string name="menu_show_system" msgid="7623002570829860709">"Vis systemet"</string>
+    <string name="menu_hide_system" msgid="2274204366405029090">"Skjul systemet"</string>
     <string name="no_apps" msgid="2377153782338039463">"Ingen apper"</string>
     <string name="location_settings" msgid="547378321761364906">"Posisjonsinnstillinger"</string>
     <string name="location_warning" msgid="4687406043150343369">"<xliff:g id="APP_NAME">%1$s</xliff:g> er en leverandør av posisjonstjenester for denne enheten. Tilgang til posisjon kan endres fra posisjonsinnstillingene."</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 4efde5c4..5ee0c33d 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -188,7 +188,7 @@
     <string name="app_permission_most_recent_denied_summary" msgid="127066792562419809">"ବର୍ତ୍ତମାନ ପ୍ରତ୍ୟାଖ୍ୟାନ କରାଗଲା / ଶେଷ ଥର ଆକ୍ସେସ୍: <xliff:g id="TIME_DATE">%1$s</xliff:g>"</string>
     <string name="app_permission_never_accessed_summary" msgid="594285912530635023">"କେବେବି ଆକ୍ସେସ୍ ହୋଇନାହିଁ"</string>
     <string name="app_permission_never_accessed_denied_summary" msgid="4791195647350628165">"ପ୍ରତ୍ୟାଖ୍ୟାନ କରାଯାଇଛି / କେବେବି ଆକ୍ସେସ୍ ହୋଇନାହିଁ"</string>
-    <string name="allowed_header" msgid="6279244592227088158">"ଅନୁମୋଦିତ"</string>
+    <string name="allowed_header" msgid="6279244592227088158">"ଅନୁମତି ଦିଆଯାଇଛି"</string>
     <string name="allowed_always_header" msgid="6698473105201405782">"ସର୍ବଦା ଅନୁମତି ଦିଆଯାଇଥିବା ଆପ୍ସ"</string>
     <string name="allowed_foreground_header" msgid="7553595563464819175">"କେବଳ ବ୍ୟବହାର ପାଇଁ ଅନୁମତି ଦିଆଯାଇଛି"</string>
     <string name="denied_header" msgid="2277998574238617699">"ପ୍ରତ୍ୟାଖ୍ୟାନ କରାଗଲା"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index bdfc25fd..fcf72b59 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -173,7 +173,7 @@
     <string name="app_permission_footer_app_permissions_link" msgid="8033278634020892918">"Ver todas as permissões do app <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_permission_footer_permission_apps_link" msgid="8759141212929298774">"Ver todos os apps que têm esta permissão"</string>
     <string name="permission_description_summary_generic" msgid="5479202003136667039">"Apps que têm esta permissão podem <xliff:g id="DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"Apps com esta permissão podem acessar sua atividade física, como caminhar, pedalar, dirigir, contagem de passos e muito mais"</string>
+    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"Apps com esta permissão podem acessar sua atividade física, como caminhar, pedalar, dirigir e contagem de passos, entre outros."</string>
     <string name="permission_description_summary_calendar" msgid="2846128908236787586">"Apps que têm esta permissão podem acessar sua agenda"</string>
     <string name="permission_description_summary_call_log" msgid="2429916962093948340">"Apps que têm esta permissão podem ler e gravar o registro de chamadas do smartphone"</string>
     <string name="permission_description_summary_camera" msgid="6699611334403400091">"Apps que têm esta permissão podem tirar fotos e gravar vídeos"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5355e2f4..32ed49a2 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -173,7 +173,7 @@
     <string name="app_permission_footer_app_permissions_link" msgid="8033278634020892918">"Ver todas as autorizações da aplicação <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_permission_footer_permission_apps_link" msgid="8759141212929298774">"Ver todas as aplicações com esta autorização"</string>
     <string name="permission_description_summary_generic" msgid="5479202003136667039">"As aplicações com esta autorização podem <xliff:g id="DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"As aplicações com esta autorização podem aceder aos dados da sua atividade física, como caminhar, andar de bicicleta, conduzir, contagem de passos, etc."</string>
+    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"As aplicações com esta autorização podem aceder aos dados da sua atividade física, como caminhar, andar de bicicleta, conduzir, contar os passos, etc."</string>
     <string name="permission_description_summary_calendar" msgid="2846128908236787586">"As aplicações com esta autorização podem aceder ao seu calendário"</string>
     <string name="permission_description_summary_call_log" msgid="2429916962093948340">"As aplicações com esta autorização podem ler e escrever no registo de chamadas do telemóvel"</string>
     <string name="permission_description_summary_camera" msgid="6699611334403400091">"As aplicações com esta autorização podem tirar fotos e gravar vídeo"</string>
@@ -190,7 +190,7 @@
     <string name="app_permission_never_accessed_denied_summary" msgid="4791195647350628165">"Recusado/nunca foi acedido"</string>
     <string name="allowed_header" msgid="6279244592227088158">"Permitidas"</string>
     <string name="allowed_always_header" msgid="6698473105201405782">"Permitidas sempre"</string>
-    <string name="allowed_foreground_header" msgid="7553595563464819175">"Apenas permitido durante a utilização"</string>
+    <string name="allowed_foreground_header" msgid="7553595563464819175">"Apenas permitidas durante a utilização"</string>
     <string name="denied_header" msgid="2277998574238617699">"Recusadas"</string>
     <string name="detailed_usage_link" msgid="3990452346369247944">"Ver a utilização detalhada"</string>
     <plurals name="days" formatted="false" msgid="3903419301028414979">
@@ -215,8 +215,8 @@
     <string name="permission_subtitle_only_in_foreground" msgid="3101936262905298459">"Apenas enquanto a aplicação está a ser utilizada"</string>
     <string name="no_permissions_allowed" msgid="5781278485002145993">"Nenhuma autorização permitida."</string>
     <string name="no_permissions_denied" msgid="2449583707612365442">"Nenhuma autorização recusada."</string>
-    <string name="no_apps_allowed" msgid="4529095928504611810">"Nenhuma aplicação permitida."</string>
-    <string name="no_apps_denied" msgid="2736758388618487796">"Nenhuma aplicação recusada."</string>
+    <string name="no_apps_allowed" msgid="4529095928504611810">"Nenhuma app permitida"</string>
+    <string name="no_apps_denied" msgid="2736758388618487796">"Nenhuma app recusada"</string>
     <string name="car_permission_selected" msgid="2163426344720483487">"Selecionada"</string>
     <string name="settings" msgid="2884124136779508907">"Definições"</string>
     <string name="accessibility_service_dialog_title_single" msgid="1613456964930225277">"O serviço <xliff:g id="SERVICE_NAME">%s</xliff:g> tem acesso total ao seu dispositivo"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index bdfc25fd..fcf72b59 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -173,7 +173,7 @@
     <string name="app_permission_footer_app_permissions_link" msgid="8033278634020892918">"Ver todas as permissões do app <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_permission_footer_permission_apps_link" msgid="8759141212929298774">"Ver todos os apps que têm esta permissão"</string>
     <string name="permission_description_summary_generic" msgid="5479202003136667039">"Apps que têm esta permissão podem <xliff:g id="DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"Apps com esta permissão podem acessar sua atividade física, como caminhar, pedalar, dirigir, contagem de passos e muito mais"</string>
+    <string name="permission_description_summary_activity_recognition" msgid="7914828358811635600">"Apps com esta permissão podem acessar sua atividade física, como caminhar, pedalar, dirigir e contagem de passos, entre outros."</string>
     <string name="permission_description_summary_calendar" msgid="2846128908236787586">"Apps que têm esta permissão podem acessar sua agenda"</string>
     <string name="permission_description_summary_call_log" msgid="2429916962093948340">"Apps que têm esta permissão podem ler e gravar o registro de chamadas do smartphone"</string>
     <string name="permission_description_summary_camera" msgid="6699611334403400091">"Apps que têm esta permissão podem tirar fotos e gravar vídeos"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index abcac8ca..3cd886a0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -57,7 +57,7 @@
     <string name="default_permission_description" msgid="692254823411049573">"выполнять неизвестное действие"</string>
     <string name="app_permissions_group_summary" msgid="5019625174481872207">"Приложений с разрешением: <xliff:g id="COUNT_0">%1$d</xliff:g> из <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="menu_show_system" msgid="7623002570829860709">"Показать системные процессы"</string>
-    <string name="menu_hide_system" msgid="2274204366405029090">"Скрыть системные процессы"</string>
+    <string name="menu_hide_system" msgid="2274204366405029090">"Скрыть сист. процессы"</string>
     <string name="no_apps" msgid="2377153782338039463">"Нет приложений"</string>
     <string name="location_settings" msgid="547378321761364906">"Настройки геолокации"</string>
     <string name="location_warning" msgid="4687406043150343369">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" обеспечивает геолокацию на этом устройстве. Вы всегда можете изменить настройки доступа к данным о местоположении."</string>
@@ -309,7 +309,7 @@
     <string name="incident_report_notification_text" msgid="8316657912290049576">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" запрашивает разрешение на загрузку данных об отладке."</string>
     <string name="incident_report_dialog_title" msgid="6147075171471634629">"Отправка данных об отладке"</string>
     <string name="incident_report_dialog_intro" msgid="153446034925770956">"В системе обнаружена проблема"</string>
-    <string name="incident_report_dialog_text" msgid="6838105320223101131">"Приложение \"<xliff:g id="APP_NAME_0">%1$s</xliff:g>\" запрашивает ваше согласие на загрузку с этого устройства отчета об ошибке от <xliff:g id="TIME">%3$s</xliff:g> <xliff:g id="DATE">%2$s</xliff:g>. Отчет может содержать персональную информацию с устройства или из установленных приложений, например имена пользователей, сведения о местоположении, идентификаторы устройства и данные сети. Мы рекомендуем отправлять отчеты об ошибке только тем приложениям и пользователям, которым вы доверяете. Разрешить приложению \"<xliff:g id="APP_NAME_1">%4$s</xliff:g>\" загрузку отчета об ошибке?"</string>
+    <string name="incident_report_dialog_text" msgid="6838105320223101131">"Приложение \"<xliff:g id="APP_NAME_0">%1$s</xliff:g>\" запрашивает ваше согласие на загрузку с этого устройства отчета об ошибке, созданного <xliff:g id="DATE">%2$s</xliff:g> в <xliff:g id="TIME">%3$s</xliff:g>. Отчет может содержать персональную информацию с устройства или из установленных приложений, например имена пользователей, сведения о местоположении, идентификаторы устройства и данные сети. Отправляйте отчеты об ошибке только тем приложениям и пользователям, которым доверяете. Разрешить приложению \"<xliff:g id="APP_NAME_1">%4$s</xliff:g>\" загрузить отчет об ошибке?"</string>
     <string name="incident_report_error_dialog_text" msgid="1001752000696958519">"Не удалось обработать информацию об ошибке в приложении \"<xliff:g id="APP_NAME">%1$s</xliff:g>\". Данные об отладке не отправлены. Приносим извинения за неудобства."</string>
     <string name="incident_report_dialog_allow_label" msgid="6863130835544805205">"Разрешить"</string>
     <string name="incident_report_dialog_deny_label" msgid="1297192379930944676">"Запретить"</string>
@@ -320,5 +320,5 @@
     <string name="adjust_user_sensitive_per_app_header" msgid="1372152438971168364">"Показывать выбранные приложения"</string>
     <string name="assistant_record_audio_user_sensitive_title" msgid="5382972366928946381">"Показывать значок активации голосового помощника"</string>
     <string name="assistant_record_audio_user_sensitive_summary" msgid="6852572549436960848">"Показывать значок в строке состояния, когда для активации голосового помощника используется микрофон"</string>
-    <string name="permgrouprequest_storage_isolated" msgid="1019696034804170865">"Открыть приложению &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; доступ к фото и мультимедиа на устройстве?"</string>
+    <string name="permgrouprequest_storage_isolated" msgid="1019696034804170865">"Разрешить приложению &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; доступ к фото и мультимедиа на устройстве?"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index eb653be3..bd8a78ef 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -21,12 +21,12 @@
     <string name="permission_search_keyword" msgid="1652964722383449182">"дозволи"</string>
     <string name="cancel" msgid="7279939269964834974">"Скасувати"</string>
     <string name="app_not_found_dlg_title" msgid="8897078571059217849">"Додаток не знайдено"</string>
-    <string name="grant_dialog_button_deny" msgid="1649644200597601964">"Відмовити"</string>
+    <string name="grant_dialog_button_deny" msgid="1649644200597601964">"Заборонити"</string>
     <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="5716583584580362144">"Відмовити й не запитувати"</string>
     <string name="grant_dialog_button_deny_background" msgid="5378693207810841555">"Не змінювати дозвіл (\"Коли додаток використовується\")"</string>
     <string name="grant_dialog_button_deny_background_and_dont_ask_again" msgid="1032019626928637454">"Не змінювати й більше не запитувати"</string>
     <string name="grant_dialog_button_more_info" msgid="6933952978344714007">"Докладніше"</string>
-    <string name="grant_dialog_button_deny_anyway" msgid="6134672842863824171">"Відмовити"</string>
+    <string name="grant_dialog_button_deny_anyway" msgid="6134672842863824171">"Заборонити"</string>
     <string name="current_permission_template" msgid="5642540253562598515">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> з <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
     <string name="permission_warning_template" msgid="1353228984024423745">"Дозволити додатку &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; таке: <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
     <string name="permission_add_background_warning_template" msgid="1046864917164159751">"Завжди дозволяти додатку &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; таке: <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
@@ -312,7 +312,7 @@
     <string name="incident_report_dialog_text" msgid="6838105320223101131">"Додаток <xliff:g id="APP_NAME_0">%1$s</xliff:g> запитує, чи можна завантажити повідомлення про помилку, створене на цьому пристрої <xliff:g id="TIME">%3$s</xliff:g> <xliff:g id="DATE">%2$s</xliff:g>. Повідомлення про помилки містять особисту інформацію про ваш пристрій або відомості, записані додатками, як-от імена користувачів, місцеположення, ідентифікатори пристроїв та інформацію про мережу. Діліться повідомленнями про помилки лише з тими людьми й додатками, яким довіряєте. Дозволити додатку <xliff:g id="APP_NAME_1">%4$s</xliff:g> завантажити повідомлення про помилку?"</string>
     <string name="incident_report_error_dialog_text" msgid="1001752000696958519">"Не вдалося обробити повідомлення про помилку в додатку <xliff:g id="APP_NAME">%1$s</xliff:g>. Дані про налагодження не надіслано. Вибачте за незручності."</string>
     <string name="incident_report_dialog_allow_label" msgid="6863130835544805205">"Дозволити"</string>
-    <string name="incident_report_dialog_deny_label" msgid="1297192379930944676">"Відмовити"</string>
+    <string name="incident_report_dialog_deny_label" msgid="1297192379930944676">"Заборонити"</string>
     <string name="adjust_user_sensitive_title" msgid="979740627674332095">"Розширені налаштування"</string>
     <string name="menu_adjust_user_sensitive" msgid="9016544530763156678">"Розширені налаштування"</string>
     <string name="adjust_user_sensitive_globally_title" msgid="4596006254112905767">"Показувати дані про використання для системних додатків"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0a64676c..c4ae4639 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -42,7 +42,7 @@
     <string name="grant_dialog_button_allow_background" msgid="3190568549032350790">"一律允許"</string>
     <string name="app_permissions_breadcrumb" msgid="6174723486639913311">"應用程式"</string>
     <string name="app_permissions" msgid="2778362347879465223">"應用程式權限"</string>
-    <string name="app_permission_manager" msgid="3802609813311662642">"權限管理員"</string>
+    <string name="app_permission_manager" msgid="3802609813311662642">"權限管理工具"</string>
     <string name="never_ask_again" msgid="7645304182523160030">"不要再詢問"</string>
     <string name="no_permissions" msgid="2193893107241172888">"沒有權限"</string>
     <string name="additional_permissions" msgid="7124470111123472154">"其他權限"</string>
-- 
cgit v1.2.3