Merge branch 'cm-13.0' of https://github.com/LineageOS/android_packages_apps_PackageInstaller into mm6.0mm6.0

Conflicts:
	res/values-ast-rES/strings.xml

Change-Id: Id1dd1b6c728b8238be8db57d06dae4da937daeae

8 files changed, 527 insertions, 65 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3f1bb1d8d..7fbc1d4b4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,20 +29,20 @@
         <activity android:name=".PackageInstallerActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:excludeFromRecents="true">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.INSTALL_PACKAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="file" />
                 <data android:mimeType="application/vnd.android.package-archive" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.intent.action.INSTALL_PACKAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="file" />
                 <data android:scheme="package" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.content.pm.action.CONFIRM_PERMISSIONS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -72,7 +72,7 @@
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:excludeFromRecents="true"
                 android:theme="@style/GrantPermissions">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.content.pm.action.REQUEST_PERMISSIONS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -84,7 +84,7 @@
                   android:label="@string/app_permissions"
                   android:theme="@style/Settings"
                   android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MANAGE_PERMISSIONS" />
                 <action android:name="android.intent.action.MANAGE_APP_PERMISSIONS" />
                 <action android:name="android.intent.action.MANAGE_PERMISSION_APPS" />
@@ -98,7 +98,7 @@
 
         <receiver android:name=".permission.model.PermissionStatusReceiver"
             android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.intent.action.GET_PERMISSIONS_COUNT" />
                 <action android:name="android.intent.action.GET_PERMISSIONS_PACKAGES" />
             </intent-filter>
@@ -108,11 +108,11 @@
         <service android:name=".wear.WearPackageInstallerService"
                  android:permission="com.google.android.permission.INSTALL_WEARABLE_PACKAGES"
                  android:exported="true">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="com.android.packageinstaller.wear.INSTALL_PACKAGE"/>
                 <data android:scheme="content" android:mimeType="vnd.android.cursor.item/*"/>
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="com.android.packageinstaller.wear.UNINSTALL_PACKAGE"/>
             </intent-filter>
         </service>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 308690b1c..9bf9f18d7 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -22,133 +22,139 @@
   <!-- TODO REMOVE LATER -->
   <string name="security_settings_desc">Permitir qu\'esta aplicación:</string>
   <string name="cancel">Encaboxar</string>
-  <string name="unknown">Desconocida</string>
-  <string name="installing">Instalando…</string>
-  <string name="install_done">Aplicación instalada</string>
+  <string name="installing">Instalando\u2026</string>
+  <string name="install_done">Aplicación instalada.</string>
   <!-- Message for installing a new app that requires some permissions [CHAR LIMIT=NONE] -->
-  <string name="install_confirm_question">¿Quies instalar esta aplicación? Va poder acceder a:</string>
+  <string name="install_confirm_question">¿Quies instalar esta aplicación?
+            Tendrá accesu a:</string>
   <!-- Message for installing a new app that does not require permissions [CHAR LIMIT=NONE] -->
-  <string name="install_confirm_question_no_perms">¿Quies instalar esta aplicación? Nun necesita accesos especiales.</string>
+  <string name="install_confirm_question_no_perms">¿Quies instalar esta aplicación?
+            Nun rique dengún permisu especial.</string>
   <!-- Message for updating an existing app [CHAR LIMIT=NONE] -->
-  <string name="install_confirm_question_update">¿Quies instalar un anovamientu de l\'aplicación? Los tos datos nun van perdese. L\'aplicación anovada va poder acceder a:</string>
+  <string name="install_confirm_question_update">¿Quies instalar un anovmaientu
+            d\'esta aplicación? Nun se perderán los tos datos
+            actuales. L\'aplicación anovada accederá a:</string>
   <!-- Message for updating an existing system app [CHAR LIMIT=NONE] -->
-  <string name="install_confirm_question_update_system">¿Quies instalar un anovamientu d\'esta aplicación integrada? Los tos datos nun van perdese. L\'aplicación anovada va poder acceder a:</string>
+  <string name="install_confirm_question_update_system">¿Quies instalar un anovamientu
+            d\'esta aplicación integrada? Nun se perderán los tos
+            datos actuales. L\'aplicación anovada consiguirá accesu a:</string>
   <!-- Message for updating an existing app, no permissions [CHAR LIMIT=NONE] -->
-  <string name="install_confirm_question_update_no_perms">¿Quies instalar un anovamientu d\'esta aplicación? Los tos datos nun van perdese. Nun necesita accesos especiales.</string>
+  <string name="install_confirm_question_update_no_perms">¿Quies instalar un anovamientu
+            d\'esta aplicación? Nun se perderán los tos datos.
+            Nun rique dengún permisu especial.</string>
   <!-- Message for updating an existing system app, no permissions [CHAR LIMIT=NONE] -->
-  <string name="install_confirm_question_update_system_no_perms">¿Quies instalar un anovamientu d\'esta aplicación integrada? Los tos datos nun van perdese. Nun necesita accesos especiales.</string>
-  <string name="install_failed">Aplicación non instalada</string>
+  <string name="install_confirm_question_update_system_no_perms">¿Quies instalar un anovamientu
+            d\'esta aplicación integrada? Nun se perderán los tos
+            datos. Nun rique dengún permisu especial.</string>
+  <string name="install_failed">Nun s\'instaló l\'aplicación.</string>
   <!-- Reason displayed when installation fails because the installation package itself is invalid
         in some way (e.g., corrupt) [CHAR LIMIT=100] -->
-  <string name="install_failed_invalid_apk">Paez que\'l paquete ta dañáu.</string>
+  <string name="install_failed_invalid_apk">El paquete paez tar toyíu.</string>
   <!-- Reason displayed when installation fails because the package an existing package is
         installed with a conflicting package author signature [CHAR LIMIT=100] -->
-  <string name="install_failed_inconsistent_certificates">Yá s\'instaló un paquete col mesmu nome con una robla en conflictu.</string>
+  <string name="install_failed_inconsistent_certificates">Yá s\'instaló un paquete esistente col
+        mesmu nome y una robla estremada.</string>
   <!-- Reason displayed when installation fails because the package specifies a minimum compatible
         OS version that is newer than our current OS version. [CHAR LIMIT=100] -->
-  <string name="install_failed_older_sdk">Esti paquete namái funciona nes versiones más recientes d\'Android.</string>
+  <string name="install_failed_older_sdk">El paquete namái funciona en versiones más
+        nueves d\'Android.</string>
   <!-- Reason displayed when installation fails because the package specifies it is compatible
         only with a CPU that the current tablet doesn't have. [CHAR LIMIT=100] -->
-  <string name="install_failed_cpu_abi_incompatible" product="tablet">Esta aplicación nun ye compatible cola tablet.</string>
+  <string name="install_failed_cpu_abi_incompatible" product="tablet">Esta aplicación nun ye
+        compatible cola to tableta.</string>
   <!-- Reason displayed when installation fails because the package specifies it is compatible
         only with a CPU that the current TV doesn't have. [CHAR LIMIT=100] -->
+  <string name="install_failed_cpu_abi_incompatible" product="tv">Esta aplicación nun ye
+        compatible cola to TV.</string>
   <!-- Reason displayed when installation fails because the package specifies it is compatible
         only with a CPU that the current phone doesn't have. [CHAR LIMIT=100] -->
-  <string name="install_failed_cpu_abi_incompatible" product="default">Esta aplicación nun ye compatible col teléfonu.</string>
+  <string name="install_failed_cpu_abi_incompatible" product="default">Esta aplicación nun ye
+        compatible col to teléfonu.</string>
   <!-- Reason displayed when installation fails because the package was deleted during the
         installation process. [CHAR LIMIT=100] -->
-  <string name="install_failed_file_not_found">El paquete especificáu desanicióse enantes de que se completara la instalación.</string>
+  <string name="install_failed_file_not_found">Desanicióse\'l paquete especificáu enantes
+        que se pudiere completar la instalación.</string>
   <!-- Reason displayed when installation fails because the package could not be verified
         because the package verifier rejected it. [CHAR LIMIT=100] -->
-  <string name="install_failed_verify_failed">El paquete nun superó\'l procesu de verificación y nun pue instalase.</string>
+  <string name="install_failed_verify_failed">El paquete nun pasó la verificación y nun pue
+        instalase.</string>
   <!-- Reason displayed when installation fails because the package could not be verified
         before the internal system timer expired. [CHAR LIMIT=100] -->
-  <string name="install_failed_verify_timeout">Escosó\'l tiempu d\'espera al intentar verificar esti paquete. Prueba a instalalu más tarde.</string>
+  <string name="install_failed_verify_timeout">Asocedió una escosa de tiempu entrín se tentaba
+        de verificar esti paquete. Volvi insalalu más sero.</string>
   <!-- Message presented when an application could not be installed on the tablet for some reason. [CHAR LIMIT=100] -->
-  <string name="install_failed_msg" product="tablet">Nun pudo instalase <xliff:g id="APP_NAME">%1$s</xliff:g> na tablet.</string>
+  <string name="install_failed_msg" product="tablet"><xliff:g id="app_name">%1$s</xliff:g> nun pudo instalase na to tableta.</string>
   <!-- Message presented when an application could not be installed on the TV for some reason. [CHAR LIMIT=100] -->
+  <string name="install_failed_msg" product="tv"><xliff:g id="app_name">%1$s</xliff:g> nun pudo instalase na to TV.</string>
   <!-- Message presented when an application could not be installed on the phone for some reason. [CHAR LIMIT=100] -->
-  <string name="install_failed_msg" product="default">Nun pudo instalase <xliff:g id="APP_NAME">%1$s</xliff:g> nel teléfonu.</string>
+  <string name="install_failed_msg" product="default"><xliff:g id="app_name">%1$s</xliff:g> nun pudo instalase na to tableta.</string>
   <string name="launch">Abrir</string>
-  <string name="unknown_apps_dlg_title">Instalación bloquiada</string>
   <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
-  <string name="unknown_apps_dlg_text" product="tablet">Por seguridá, la tablet configuróse pa bloquiar aplicaciones de fontes desconocíes.</string>
   <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
   <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
-  <string name="unknown_apps_dlg_text" product="default">Por seguridá, el teléfonu configuróse pa bloquiar aplicaciones de fontes desconocíes.</string>
   <!-- Message presented in a dialog box when the device administrator restricts the installation of apps from unknown sources. [CHAR LIMIT=none] -->
+  <string name="unknown_apps_admin_dlg_text">El to alministrador nun permite la instalación d\'aplicaciones consiguíes dende fontes desconocíes.</string>
   <string name="ok">Aceutar</string>
   <string name="settings">Axustes</string>
   <!-- Title of dialog asking user if they would allow an application to be an install source. -->
-  <string name="allow_source_dlg_title">Fonte d\'aplicaciones nueva</string>
+  <string name="allow_source_dlg_title">Fonte nueva p\'aplicaciones</string>
   <!-- Message of dialog asking user if they would allow an application to be an install source. -->
-  <string name="allow_source_dlg_text"><xliff:g id="APP_NAME">%1$s</xliff:g> quier instalar otres aplicaciones.\n\n¿Quies permitilo agora y nel futuru?</string>
-  <string name="manage_applications">Alministrar aplicaciones</string>
-  <string name="dlg_app_replacement_title">¿Sustituyir aplicación?</string>
-  <string name="dlg_app_replacement_statement">L\'aplicación que tas instalando va sustituyir otra aplicación.\n\nVan guardase tolos datos d\'usuariu anteriores.</string>
+  <string name="manage_applications">Xestionar aplicaciones</string>
+  <string name="dlg_app_replacement_title">¿Trocar aplicación?</string>
+  <string name="dlg_app_replacement_statement">L\'aplicación que tas instalando trocará otra.\n\nGuardaránse tolos datos previos d\'usuariu.</string>
   <!-- Dialog attributes when replacing system app -->
-  <string name="dlg_sys_app_replacement_statement">Ye una aplicación del sistema.\n\nVan guardase tolos datos d\'usuariu anteriores.</string>
+  <string name="dlg_sys_app_replacement_statement">Esta aplicación ye del sistema.\n\nGuardaránse tolos datos previos d\'usuariu.</string>
   <string name="out_of_space_dlg_title">Ensin espaciu</string>
-  <string name="out_of_space_dlg_text">Nun pudo instalase l\'aplicación <xliff:g id="APP_NAME">%1$s</xliff:g>. Llibera espaciu y vuelvi a intentalo.</string>
   <!-- strings related to uninstall activity -->
   <string name="dlg_ok">Aceutar</string>
-  <string name="app_not_found_dlg_title">Aplicación non atopada</string>
-  <string name="app_not_found_dlg_text">Nun s\'atopó l\'aplicación na llista d\'aplicaciones instalaes.</string>
-  <string name="uninstall_application_title">Desinstalar aplicación</string>
-  <string name="uninstall_update_title">Desinstalar anovamientu</string>
-  <string name="uninstall_activity_text"><xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> forma parte d\'esta aplicación:</string>
+  <string name="app_not_found_dlg_title">Nun s\'alcontró l\'aplicación</string>
   <string name="uninstall_application_text">¿Quies desinstalar esta aplicación?</string>
-  <string name="uninstall_application_text_all_users">¿Quies desinstalar esta aplicación pa \"<b>tolos usuarios"</b> ? L\'aplicación y los sos datos van desaniciase de \"<b>tolos usuarios"</b> del preséu.</string>
-  <string name="uninstall_application_text_user">Quies desinstalar esta app pal usuariu <xliff:g id="username">%1$s</xliff:g>?</string>
-  <string name="uninstall_update_text">¿Quies sustituyir esta aplicación cola versión de fábrica?</string>
+  <string name="uninstall_application_text_all_users">¿Quies desinstalar esta aplicación pa <b>tolos</b>
+        usuarios?  Desaniciaráse l\'aplicación y los sos datos de <b>tolos</b> usuarios nel preséu.</string>
+  <string name="uninstall_application_text_user">¿Quies desinstalar esta aplicación pal usuariu <xliff:g id="username">%1$s</xliff:g>?</string>
+  <string name="uninstall_update_text">¿Quies trocar esta aplicación cola versión de fábrica?</string>
   <string name="uninstalling">Desinstalando…</string>
-  <string name="uninstall_done">Desinstalación completada</string>
-  <string name="uninstall_failed">Desinstalación correuta</string>
   <!-- String presented to the user when uninstalling a package failed because the target package
         is a current device administrator [CHAR LIMIT=80] -->
-  <string name="uninstall_failed_device_policy_manager">Nun pue desinstalase porque esti paquete ye un alministrador de preseos activu.</string>
+  <string name="uninstall_failed_device_policy_manager">Nun pue desinstalase porque esti paquete
+        ye un xestor activu de preseos.</string>
   <!-- String presented to the user when uninstalling a package failed because the target package
         is a current device administrator for some user [CHAR LIMIT=100] -->
   <string name="uninstall_failed_device_policy_manager_of_user">Nun pue instalase porque esti paquete ye
         un alministrador de preseos activu pal usuariu <xliff:g id="username">%1$s</xliff:g>.</string>
   <!-- String presented to the user when uninstalling a package failed because a profile owner
          has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
-  <string name="uninstall_blocked_profile_owner">Precísase esta aplicación
-        pa que nun puea instalase\'l perfil de trabayu.</string>
+  <string name="uninstall_blocked_profile_owner">Esta aplicación precísase pal
+        to perfil de trabayu y nun pue desinstalase.</string>
   <!-- String presented to the user when uninstalling a package failed because a device owner
          has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
-  <string name="uninstall_blocked_device_owner">Esta app necesítala\'l to
-        alministrador del preséu, y nun pue desinstalase.</string>
+  <string name="uninstall_blocked_device_owner">Esta aplicación ríquela\'l
+        to xestor de preseos y nun pue desinstalase.</string>
   <!-- String on a button that leads to the "device administrator" configuration setting where a
         user will be able to disable the device administrator in order to uninstall
         it. [CHAR LIMIT=50] -->
-  <string name="manage_device_administrators">Xestionar alministradores de preseos</string>
-  <string name="uninstall_failed_msg">Nun pudo desinstalase <xliff:g id="APP_NAME">%1$s</xliff:g>.</string>
   <!-- Dialog attributes to indicate parse errors -->
   <string name="Parse_error_dlg_title">Fallu d\'análisis</string>
-  <string name="Parse_error_dlg_text">Hebo un fallu al analizar el paquete.</string>
+  <string name="Parse_error_dlg_text">Hebo un fallu analizando\'l paquete.</string>
   <!-- Tab label for new permissions being added to an existing app [CHAR LIMIT=20] -->
-  <string name="newPerms">Nuevu</string>
   <!-- Tab label for all permissions of an app being installed [CHAR LIMIT=20] -->
   <string name="allPerms">Toos</string>
   <!-- Tab label for permissions related to user privacy [CHAR LIMIT=20] -->
   <string name="privacyPerms">Privacidá</string>
   <!-- Tab label for permissions related to device behavior [CHAR LIMIT=20] -->
-  <string name="devicePerms">Accesu preséu</string>
   <!-- Body text for new tab when there are no new permissions [CHAR LIMIT=NONE] -->
-  <string name="no_new_perms">Esti anovamientu nun necesita permisos nuevos.</string>
-  <string name="grant_confirm_question">¿Quies conceder los siguientes permisos? Va poder accedese a:</string>
+  <string name="no_new_perms">Esti anovamientu nun rique permisos nuevos.</string>
   <!-- Title for the dialog button to allow a permission grant. -->
   <string name="grant_dialog_button_allow">Permitir</string>
   <!-- Title for the dialog button to deny a permission grant. -->
-  <string name="grant_dialog_button_deny">Denegar</string>
+  <string name="grant_dialog_button_deny">Ñegar</string>
   <!-- Template for the current permission from the total number of permissions. -->
   <string name="current_permission_template">
         <xliff:g id="current_permission_index" example="1">%1$s</xliff:g> de
         <xliff:g id="permission_count" example="2">%2$s</xliff:g></string>
   <!-- Template for the warning message when an app requests a permission. -->
-  <string name="permission_warning_template">¿Permitir
-        <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> a
+  <string name="permission_warning_template">¿Permitir a
+        <xliff:g id="app_name" example="Gmail">%1$s</xliff:g>
         <xliff:g id="action" example="do something">%2$s</xliff:g>?</string>
   <!-- Permissions -->
   <!-- Title of an application permission, listed so the user can choose whether they want
@@ -161,7 +167,7 @@
   <string name="app_permissions">Permisos d\'aplicaciones</string>
   <!-- Checkbox that allows user to not be questioned about this permission
          request again -->
-  <string name="never_ask_again">Nun entrugar de nueves</string>
+  <string name="never_ask_again">Nun entrugar enxamás</string>
   <!-- Label when app requests no permissions -->
   <string name="no_permissions">Ensin permisos</string>
   <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
@@ -190,7 +196,7 @@
   <!-- [CHAR LIMIT=NONE] Warning about how this app cannot have location permission disabled -->
   <string name="location_warning"><xliff:g id="app_name" example="Package Installer">%1$s</xliff:g> ye un fornidor del serviciu d\'allugamientu pa esti preséu. L\'accesu al allugamientu pue modificase dende los sos axustes.</string>
   <!-- [CHAR LIMIT=NONE] Warning message when turning off permission for system apps -->
-  <string name="system_warning">Si ñegues esti permisu, quiciabes nun furrulen como s\'esperaben les carauterístiques básiques.</string>
+  <string name="system_warning">Si ñegues esti permisu, quiciabes nun funcionen como s\'esperaben les carauterístiques básiques.</string>
   <!-- [CHAR LIMIT=NONE] Summary of a permission switch when it's enforced by policy -->
   <string name="permission_summary_enforced_by_policy">Aplícase pola política</string>
   <!-- Text displayed until loading is done -->
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
new file mode 100644
index 000000000..81eb8d3b9
--- /dev/null
+++ b/res/values-bs-rBA/strings.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- TODO REMOVE LATER -->
+  <!-- Message for installing a new app that requires some permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for installing a new app that does not require permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing app [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing system app [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing app, no permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing system app, no permissions [CHAR LIMIT=NONE] -->
+  <!-- Reason displayed when installation fails because the installation package itself is invalid
+        in some way (e.g., corrupt) [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package an existing package is
+        installed with a conflicting package author signature [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies a minimum compatible
+        OS version that is newer than our current OS version. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current tablet doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current TV doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current phone doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package was deleted during the
+        installation process. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package could not be verified
+        because the package verifier rejected it. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package could not be verified
+        before the internal system timer expired. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the tablet for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the TV for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the phone for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when the device administrator restricts the installation of apps from unknown sources. [CHAR LIMIT=none] -->
+  <!-- Title of dialog asking user if they would allow an application to be an install source. -->
+  <!-- Message of dialog asking user if they would allow an application to be an install source. -->
+  <!-- Dialog attributes when replacing system app -->
+  <!-- strings related to uninstall activity -->
+  <!-- String presented to the user when uninstalling a package failed because the target package
+        is a current device administrator [CHAR LIMIT=80] -->
+  <!-- String presented to the user when uninstalling a package failed because the target package
+        is a current device administrator for some user [CHAR LIMIT=100] -->
+  <!-- String presented to the user when uninstalling a package failed because a profile owner
+         has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
+  <!-- String presented to the user when uninstalling a package failed because a device owner
+         has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
+  <!-- String on a button that leads to the "device administrator" configuration setting where a
+        user will be able to disable the device administrator in order to uninstall
+        it. [CHAR LIMIT=50] -->
+  <!-- Dialog attributes to indicate parse errors -->
+  <!-- Tab label for new permissions being added to an existing app [CHAR LIMIT=20] -->
+  <!-- Tab label for all permissions of an app being installed [CHAR LIMIT=20] -->
+  <!-- Tab label for permissions related to user privacy [CHAR LIMIT=20] -->
+  <!-- Tab label for permissions related to device behavior [CHAR LIMIT=20] -->
+  <!-- Body text for new tab when there are no new permissions [CHAR LIMIT=NONE] -->
+  <!-- Title for the dialog button to allow a permission grant. -->
+  <!-- Title for the dialog button to deny a permission grant. -->
+  <!-- Template for the current permission from the total number of permissions. -->
+  <!-- Template for the warning message when an app requests a permission. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Breadcrumb for page of managing application permissions [CHAR LIMIT=50] -->
+  <!-- Title for page of managing application permissions -->
+  <!-- Checkbox that allows user to not be questioned about this permission
+         request again -->
+  <!-- Label when app requests no permissions -->
+  <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+  <!-- Warning for turning off permissions on older apps -->
+  <!-- The default description of a permission, i.e. what it does.  [CHAR LIMIT=40] -->
+  <!-- Summary of number of apps currently granted a single permission [CHAR LIMIT=45] -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage permissions to control whether system apps are shown -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage permissions to control whether system apps are hidden -->
+  <!-- [CHAR LIMIT=30] Title for page managing what apps have a permission granted -->
+  <!-- [CHAR LIMIT=NONE] Label when no apps requesting this permission -->
+  <!-- [CHAR LIMIT=30] Title of button that leads to location settings -->
+  <!-- [CHAR LIMIT=NONE] Warning about how this app cannot have location permission disabled -->
+  <!-- [CHAR LIMIT=NONE] Warning message when turning off permission for system apps -->
+  <!-- [CHAR LIMIT=NONE] Summary of a permission switch when it's enforced by policy -->
+  <!-- Text displayed until loading is done -->
+  <!-- [CHAR LIMIT=45] Title of all permissions settings -->
+  <!-- [CHAR LIMIT=45] Group of permissions granted to app automatically when installed. -->
+  <!-- Title of the permission dialog for accessibility purposes- spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Title for the dialog that warns the user they need to turn off screen overlays
+         before permissions can be changed. [CHAR LIMIT=NONE] -->
+  <!-- Message for the dialog that warns the user they need to turn off screen overlays
+        before permissions can be changed. The "Settings > Apps" conveys to the user to
+        go to Settings and click on apps, this may need updates in RTL languages. [CHAR LIMIT=NONE] -->
+  <!-- Button for the dialog that warns the user they need to turn off screen overlays
+         before permissions can be changed. [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog telling users that Install/Uninstall action is not supported on Android Wear. -->
+  <!-- Title of dialog telling users that Install/Uninstall action is not supported on Android Wear. -->
+</resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 81eb8d3b9..e8affb453 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -15,7 +15,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="install">Instali</string>
   <!-- TODO REMOVE LATER -->
+  <string name="cancel">Nuligi</string>
+  <string name="unknown">Nekonata</string>
   <!-- Message for installing a new app that requires some permissions [CHAR LIMIT=NONE] -->
   <!-- Message for installing a new app that does not require permissions [CHAR LIMIT=NONE] -->
   <!-- Message for updating an existing app [CHAR LIMIT=NONE] -->
@@ -43,14 +46,17 @@
   <!-- Message presented when an application could not be installed on the tablet for some reason. [CHAR LIMIT=100] -->
   <!-- Message presented when an application could not be installed on the TV for some reason. [CHAR LIMIT=100] -->
   <!-- Message presented when an application could not be installed on the phone for some reason. [CHAR LIMIT=100] -->
+  <string name="launch">Malfermi</string>
   <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
   <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
   <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
   <!-- Message presented in a dialog box when the device administrator restricts the installation of apps from unknown sources. [CHAR LIMIT=none] -->
+  <string name="settings">Agordoj</string>
   <!-- Title of dialog asking user if they would allow an application to be an install source. -->
   <!-- Message of dialog asking user if they would allow an application to be an install source. -->
   <!-- Dialog attributes when replacing system app -->
   <!-- strings related to uninstall activity -->
+  <string name="uninstall_application_title">Malinstali aplikaĵon</string>
   <!-- String presented to the user when uninstalling a package failed because the target package
         is a current device administrator [CHAR LIMIT=80] -->
   <!-- String presented to the user when uninstalling a package failed because the target package
@@ -64,11 +70,14 @@
         it. [CHAR LIMIT=50] -->
   <!-- Dialog attributes to indicate parse errors -->
   <!-- Tab label for new permissions being added to an existing app [CHAR LIMIT=20] -->
+  <string name="newPerms">Nova</string>
   <!-- Tab label for all permissions of an app being installed [CHAR LIMIT=20] -->
   <!-- Tab label for permissions related to user privacy [CHAR LIMIT=20] -->
+  <string name="privacyPerms">Privateco</string>
   <!-- Tab label for permissions related to device behavior [CHAR LIMIT=20] -->
   <!-- Body text for new tab when there are no new permissions [CHAR LIMIT=NONE] -->
   <!-- Title for the dialog button to allow a permission grant. -->
+  <string name="grant_dialog_button_allow">Permesi</string>
   <!-- Title for the dialog button to deny a permission grant. -->
   <!-- Template for the current permission from the total number of permissions. -->
   <!-- Template for the warning message when an app requests a permission. -->
@@ -78,6 +87,7 @@
   <!-- Description of an application permission, listed so the user can choose whether
          they want to allow the application to do this. -->
   <!-- Breadcrumb for page of managing application permissions [CHAR LIMIT=50] -->
+  <string name="app_permissions_breadcrumb">Aplikaĵoj</string>
   <!-- Title for page of managing application permissions -->
   <!-- Checkbox that allows user to not be questioned about this permission
          request again -->
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
new file mode 100644
index 000000000..81eb8d3b9
--- /dev/null
+++ b/res/values-es-rCO/strings.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- TODO REMOVE LATER -->
+  <!-- Message for installing a new app that requires some permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for installing a new app that does not require permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing app [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing system app [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing app, no permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing system app, no permissions [CHAR LIMIT=NONE] -->
+  <!-- Reason displayed when installation fails because the installation package itself is invalid
+        in some way (e.g., corrupt) [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package an existing package is
+        installed with a conflicting package author signature [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies a minimum compatible
+        OS version that is newer than our current OS version. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current tablet doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current TV doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current phone doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package was deleted during the
+        installation process. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package could not be verified
+        because the package verifier rejected it. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package could not be verified
+        before the internal system timer expired. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the tablet for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the TV for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the phone for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when the device administrator restricts the installation of apps from unknown sources. [CHAR LIMIT=none] -->
+  <!-- Title of dialog asking user if they would allow an application to be an install source. -->
+  <!-- Message of dialog asking user if they would allow an application to be an install source. -->
+  <!-- Dialog attributes when replacing system app -->
+  <!-- strings related to uninstall activity -->
+  <!-- String presented to the user when uninstalling a package failed because the target package
+        is a current device administrator [CHAR LIMIT=80] -->
+  <!-- String presented to the user when uninstalling a package failed because the target package
+        is a current device administrator for some user [CHAR LIMIT=100] -->
+  <!-- String presented to the user when uninstalling a package failed because a profile owner
+         has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
+  <!-- String presented to the user when uninstalling a package failed because a device owner
+         has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
+  <!-- String on a button that leads to the "device administrator" configuration setting where a
+        user will be able to disable the device administrator in order to uninstall
+        it. [CHAR LIMIT=50] -->
+  <!-- Dialog attributes to indicate parse errors -->
+  <!-- Tab label for new permissions being added to an existing app [CHAR LIMIT=20] -->
+  <!-- Tab label for all permissions of an app being installed [CHAR LIMIT=20] -->
+  <!-- Tab label for permissions related to user privacy [CHAR LIMIT=20] -->
+  <!-- Tab label for permissions related to device behavior [CHAR LIMIT=20] -->
+  <!-- Body text for new tab when there are no new permissions [CHAR LIMIT=NONE] -->
+  <!-- Title for the dialog button to allow a permission grant. -->
+  <!-- Title for the dialog button to deny a permission grant. -->
+  <!-- Template for the current permission from the total number of permissions. -->
+  <!-- Template for the warning message when an app requests a permission. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Breadcrumb for page of managing application permissions [CHAR LIMIT=50] -->
+  <!-- Title for page of managing application permissions -->
+  <!-- Checkbox that allows user to not be questioned about this permission
+         request again -->
+  <!-- Label when app requests no permissions -->
+  <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+  <!-- Warning for turning off permissions on older apps -->
+  <!-- The default description of a permission, i.e. what it does.  [CHAR LIMIT=40] -->
+  <!-- Summary of number of apps currently granted a single permission [CHAR LIMIT=45] -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage permissions to control whether system apps are shown -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage permissions to control whether system apps are hidden -->
+  <!-- [CHAR LIMIT=30] Title for page managing what apps have a permission granted -->
+  <!-- [CHAR LIMIT=NONE] Label when no apps requesting this permission -->
+  <!-- [CHAR LIMIT=30] Title of button that leads to location settings -->
+  <!-- [CHAR LIMIT=NONE] Warning about how this app cannot have location permission disabled -->
+  <!-- [CHAR LIMIT=NONE] Warning message when turning off permission for system apps -->
+  <!-- [CHAR LIMIT=NONE] Summary of a permission switch when it's enforced by policy -->
+  <!-- Text displayed until loading is done -->
+  <!-- [CHAR LIMIT=45] Title of all permissions settings -->
+  <!-- [CHAR LIMIT=45] Group of permissions granted to app automatically when installed. -->
+  <!-- Title of the permission dialog for accessibility purposes- spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Title for the dialog that warns the user they need to turn off screen overlays
+         before permissions can be changed. [CHAR LIMIT=NONE] -->
+  <!-- Message for the dialog that warns the user they need to turn off screen overlays
+        before permissions can be changed. The "Settings > Apps" conveys to the user to
+        go to Settings and click on apps, this may need updates in RTL languages. [CHAR LIMIT=NONE] -->
+  <!-- Button for the dialog that warns the user they need to turn off screen overlays
+         before permissions can be changed. [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog telling users that Install/Uninstall action is not supported on Android Wear. -->
+  <!-- Title of dialog telling users that Install/Uninstall action is not supported on Android Wear. -->
+</resources>
diff --git a/res/values-ga-rIE/strings.xml b/res/values-ga-rIE/strings.xml
new file mode 100644
index 000000000..81eb8d3b9
--- /dev/null
+++ b/res/values-ga-rIE/strings.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- TODO REMOVE LATER -->
+  <!-- Message for installing a new app that requires some permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for installing a new app that does not require permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing app [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing system app [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing app, no permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing system app, no permissions [CHAR LIMIT=NONE] -->
+  <!-- Reason displayed when installation fails because the installation package itself is invalid
+        in some way (e.g., corrupt) [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package an existing package is
+        installed with a conflicting package author signature [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies a minimum compatible
+        OS version that is newer than our current OS version. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current tablet doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current TV doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current phone doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package was deleted during the
+        installation process. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package could not be verified
+        because the package verifier rejected it. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package could not be verified
+        before the internal system timer expired. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the tablet for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the TV for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the phone for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when the device administrator restricts the installation of apps from unknown sources. [CHAR LIMIT=none] -->
+  <!-- Title of dialog asking user if they would allow an application to be an install source. -->
+  <!-- Message of dialog asking user if they would allow an application to be an install source. -->
+  <!-- Dialog attributes when replacing system app -->
+  <!-- strings related to uninstall activity -->
+  <!-- String presented to the user when uninstalling a package failed because the target package
+        is a current device administrator [CHAR LIMIT=80] -->
+  <!-- String presented to the user when uninstalling a package failed because the target package
+        is a current device administrator for some user [CHAR LIMIT=100] -->
+  <!-- String presented to the user when uninstalling a package failed because a profile owner
+         has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
+  <!-- String presented to the user when uninstalling a package failed because a device owner
+         has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
+  <!-- String on a button that leads to the "device administrator" configuration setting where a
+        user will be able to disable the device administrator in order to uninstall
+        it. [CHAR LIMIT=50] -->
+  <!-- Dialog attributes to indicate parse errors -->
+  <!-- Tab label for new permissions being added to an existing app [CHAR LIMIT=20] -->
+  <!-- Tab label for all permissions of an app being installed [CHAR LIMIT=20] -->
+  <!-- Tab label for permissions related to user privacy [CHAR LIMIT=20] -->
+  <!-- Tab label for permissions related to device behavior [CHAR LIMIT=20] -->
+  <!-- Body text for new tab when there are no new permissions [CHAR LIMIT=NONE] -->
+  <!-- Title for the dialog button to allow a permission grant. -->
+  <!-- Title for the dialog button to deny a permission grant. -->
+  <!-- Template for the current permission from the total number of permissions. -->
+  <!-- Template for the warning message when an app requests a permission. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Breadcrumb for page of managing application permissions [CHAR LIMIT=50] -->
+  <!-- Title for page of managing application permissions -->
+  <!-- Checkbox that allows user to not be questioned about this permission
+         request again -->
+  <!-- Label when app requests no permissions -->
+  <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+  <!-- Warning for turning off permissions on older apps -->
+  <!-- The default description of a permission, i.e. what it does.  [CHAR LIMIT=40] -->
+  <!-- Summary of number of apps currently granted a single permission [CHAR LIMIT=45] -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage permissions to control whether system apps are shown -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage permissions to control whether system apps are hidden -->
+  <!-- [CHAR LIMIT=30] Title for page managing what apps have a permission granted -->
+  <!-- [CHAR LIMIT=NONE] Label when no apps requesting this permission -->
+  <!-- [CHAR LIMIT=30] Title of button that leads to location settings -->
+  <!-- [CHAR LIMIT=NONE] Warning about how this app cannot have location permission disabled -->
+  <!-- [CHAR LIMIT=NONE] Warning message when turning off permission for system apps -->
+  <!-- [CHAR LIMIT=NONE] Summary of a permission switch when it's enforced by policy -->
+  <!-- Text displayed until loading is done -->
+  <!-- [CHAR LIMIT=45] Title of all permissions settings -->
+  <!-- [CHAR LIMIT=45] Group of permissions granted to app automatically when installed. -->
+  <!-- Title of the permission dialog for accessibility purposes- spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Title for the dialog that warns the user they need to turn off screen overlays
+         before permissions can be changed. [CHAR LIMIT=NONE] -->
+  <!-- Message for the dialog that warns the user they need to turn off screen overlays
+        before permissions can be changed. The "Settings > Apps" conveys to the user to
+        go to Settings and click on apps, this may need updates in RTL languages. [CHAR LIMIT=NONE] -->
+  <!-- Button for the dialog that warns the user they need to turn off screen overlays
+         before permissions can be changed. [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog telling users that Install/Uninstall action is not supported on Android Wear. -->
+  <!-- Title of dialog telling users that Install/Uninstall action is not supported on Android Wear. -->
+</resources>
diff --git a/res/values-sr-rCS/strings.xml b/res/values-sr-rCS/strings.xml
new file mode 100644
index 000000000..81eb8d3b9
--- /dev/null
+++ b/res/values-sr-rCS/strings.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- TODO REMOVE LATER -->
+  <!-- Message for installing a new app that requires some permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for installing a new app that does not require permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing app [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing system app [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing app, no permissions [CHAR LIMIT=NONE] -->
+  <!-- Message for updating an existing system app, no permissions [CHAR LIMIT=NONE] -->
+  <!-- Reason displayed when installation fails because the installation package itself is invalid
+        in some way (e.g., corrupt) [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package an existing package is
+        installed with a conflicting package author signature [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies a minimum compatible
+        OS version that is newer than our current OS version. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current tablet doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current TV doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package specifies it is compatible
+        only with a CPU that the current phone doesn't have. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package was deleted during the
+        installation process. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package could not be verified
+        because the package verifier rejected it. [CHAR LIMIT=100] -->
+  <!-- Reason displayed when installation fails because the package could not be verified
+        before the internal system timer expired. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the tablet for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the TV for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented when an application could not be installed on the phone for some reason. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
+  <!-- Message presented in a dialog box when the device administrator restricts the installation of apps from unknown sources. [CHAR LIMIT=none] -->
+  <!-- Title of dialog asking user if they would allow an application to be an install source. -->
+  <!-- Message of dialog asking user if they would allow an application to be an install source. -->
+  <!-- Dialog attributes when replacing system app -->
+  <!-- strings related to uninstall activity -->
+  <!-- String presented to the user when uninstalling a package failed because the target package
+        is a current device administrator [CHAR LIMIT=80] -->
+  <!-- String presented to the user when uninstalling a package failed because the target package
+        is a current device administrator for some user [CHAR LIMIT=100] -->
+  <!-- String presented to the user when uninstalling a package failed because a profile owner
+         has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
+  <!-- String presented to the user when uninstalling a package failed because a device owner
+         has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
+  <!-- String on a button that leads to the "device administrator" configuration setting where a
+        user will be able to disable the device administrator in order to uninstall
+        it. [CHAR LIMIT=50] -->
+  <!-- Dialog attributes to indicate parse errors -->
+  <!-- Tab label for new permissions being added to an existing app [CHAR LIMIT=20] -->
+  <!-- Tab label for all permissions of an app being installed [CHAR LIMIT=20] -->
+  <!-- Tab label for permissions related to user privacy [CHAR LIMIT=20] -->
+  <!-- Tab label for permissions related to device behavior [CHAR LIMIT=20] -->
+  <!-- Body text for new tab when there are no new permissions [CHAR LIMIT=NONE] -->
+  <!-- Title for the dialog button to allow a permission grant. -->
+  <!-- Title for the dialog button to deny a permission grant. -->
+  <!-- Template for the current permission from the total number of permissions. -->
+  <!-- Template for the warning message when an app requests a permission. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Breadcrumb for page of managing application permissions [CHAR LIMIT=50] -->
+  <!-- Title for page of managing application permissions -->
+  <!-- Checkbox that allows user to not be questioned about this permission
+         request again -->
+  <!-- Label when app requests no permissions -->
+  <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+  <!-- Warning for turning off permissions on older apps -->
+  <!-- The default description of a permission, i.e. what it does.  [CHAR LIMIT=40] -->
+  <!-- Summary of number of apps currently granted a single permission [CHAR LIMIT=45] -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage permissions to control whether system apps are shown -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage permissions to control whether system apps are hidden -->
+  <!-- [CHAR LIMIT=30] Title for page managing what apps have a permission granted -->
+  <!-- [CHAR LIMIT=NONE] Label when no apps requesting this permission -->
+  <!-- [CHAR LIMIT=30] Title of button that leads to location settings -->
+  <!-- [CHAR LIMIT=NONE] Warning about how this app cannot have location permission disabled -->
+  <!-- [CHAR LIMIT=NONE] Warning message when turning off permission for system apps -->
+  <!-- [CHAR LIMIT=NONE] Summary of a permission switch when it's enforced by policy -->
+  <!-- Text displayed until loading is done -->
+  <!-- [CHAR LIMIT=45] Title of all permissions settings -->
+  <!-- [CHAR LIMIT=45] Group of permissions granted to app automatically when installed. -->
+  <!-- Title of the permission dialog for accessibility purposes- spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Title for the dialog that warns the user they need to turn off screen overlays
+         before permissions can be changed. [CHAR LIMIT=NONE] -->
+  <!-- Message for the dialog that warns the user they need to turn off screen overlays
+        before permissions can be changed. The "Settings > Apps" conveys to the user to
+        go to Settings and click on apps, this may need updates in RTL languages. [CHAR LIMIT=NONE] -->
+  <!-- Button for the dialog that warns the user they need to turn off screen overlays
+         before permissions can be changed. [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog telling users that Install/Uninstall action is not supported on Android Wear. -->
+  <!-- Title of dialog telling users that Install/Uninstall action is not supported on Android Wear. -->
+</resources>
diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java
index 21830378e..fb2ba6540 100644
--- a/src/com/android/packageinstaller/permission/utils/Utils.java
+++ b/src/com/android/packageinstaller/permission/utils/Utils.java
@@ -26,6 +26,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
 import android.graphics.drawable.Drawable;
+import android.graphics.PorterDuff;
 import android.util.ArraySet;
 import android.util.Log;
 import android.util.TypedValue;
@@ -113,6 +114,7 @@ public class Utils {
         theme.resolveAttribute(attr, typedValue, true);
         icon = icon.mutate();
         icon.setTint(context.getColor(typedValue.resourceId));
+        icon.setTintMode(PorterDuff.Mode.SRC_ATOP);
         return icon;
     }