Snap for 7570015 from bc92fc38042cf3d11b7b3129de72d0004b0fb9d8 to mainline-sdkext-release
Change-Id: I42e2221058eefb2d97f0ee77eb07fdd819ad3925
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..ddeff9f
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,44 @@
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_app {
+ name: "StorageManager",
+ defaults: ["SettingsLibDefaults"],
+ platform_apis: true,
+
+ optimize: {
+ proguard_flags_files: ["proguard.cfg"],
+ },
+
+ system_ext_specific: true,
+ privileged: true,
+ required: ["privapp_whitelist_com.android.storagemanager"],
+
+ static_libs: [
+ "androidx.legacy_legacy-preference-v14",
+ "androidx.appcompat_appcompat",
+ "androidx.preference_preference",
+ "androidx.recyclerview_recyclerview",
+ ],
+
+ uses_libs: ["org.apache.http.legacy"],
+
+ resource_dirs: ["res"],
+
+ srcs: ["src/**/*.java"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index ac5525f..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := StorageManager
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_PROGUARD_FLAG_FILES := proguard.cfg
-
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.storagemanager
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- androidx.legacy_legacy-preference-v14 \
- androidx.appcompat_appcompat \
- androidx.preference_preference \
- androidx.recyclerview_recyclerview
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_SRC_FILES := \
- $(call all-java-files-under, src)
-
-include frameworks/base/packages/SettingsLib/common.mk
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-ifeq (,$(ONE_SHOT_MAKEFILE))
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0460fad..1b21545 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.storagemanager">
+ package="com.android.storagemanager">
<uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
<uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
@@ -29,58 +29,60 @@
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.USE_RESERVED_DISK"/>
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
- <uses-sdk android:minSdkVersion="24" />
+ <uses-sdk android:minSdkVersion="24"/>
<application android:label="@string/app_name"
- android:icon="@mipmap/ic_storage_manager_48px"
- android:theme="@style/StorageManager"
- android:allowBackup="false"
- android:supportsRtl="true">
- <uses-library android:name="org.apache.http.legacy" />
+ android:icon="@mipmap/ic_storage_manager_48px"
+ android:theme="@style/StorageManager"
+ android:allowBackup="false"
+ android:supportsRtl="true">
+ <uses-library android:name="org.apache.http.legacy"/>
<!-- Initial Page -->
<activity android:name=".deletionhelper.DeletionHelperActivity"
- android:label="@string/deletion_helper_title"
- android:launchMode="singleTask">
+ android:label="@string/deletion_helper_title"
+ android:launchMode="singleTask"
+ android:exported="true">
<intent-filter>
- <action android:name="android.os.storage.action.MANAGE_STORAGE" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.os.storage.action.MANAGE_STORAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<!-- Warning for activating the storage manager. -->
<activity android:name=".automatic.WarningDialogActivity"
- android:excludeFromRecents="true"
- android:label=""
- android:noHistory="true"
- android:taskAffinity=".WarningDialogActivity"
- android:theme="@style/TransparentDialog">
+ android:excludeFromRecents="true"
+ android:label=""
+ android:noHistory="true"
+ android:taskAffinity=".WarningDialogActivity"
+ android:theme="@style/TransparentDialog">
</activity>
<!-- Automatic storage management tasks. -->
- <service
- android:name=".automatic.AutomaticStorageManagementJobService"
- android:label="@string/automatic_storage_manager_service_label"
- android:permission="android.permission.BIND_JOB_SERVICE"
- android:enabled="@bool/enable_automatic_storage_management"
- android:exported="false"/>
+ <service android:name=".automatic.AutomaticStorageManagementJobService"
+ android:label="@string/automatic_storage_manager_service_label"
+ android:permission="android.permission.BIND_JOB_SERVICE"
+ android:enabled="@bool/enable_automatic_storage_management"
+ android:exported="false"/>
<receiver android:name=".automatic.AutomaticStorageBroadcastReceiver"
- android:enabled="@bool/enable_automatic_storage_management">
+ android:enabled="@bool/enable_automatic_storage_management"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED" />
+ <action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
</receiver>
<receiver android:name=".automatic.NotificationController"
- android:exported="false">
+ android:exported="false">
<intent-filter>
- <action android:name="com.android.storagemanager.automatic.DISMISS" />
- <action android:name="com.android.storagemanager.automatic.ACTIVATE" />
- <action android:name="com.android.storagemanager.automatic.NO_THANKS" />
- <action android:name="com.android.storagemanager.automatic.SHOW_NOTIFICATION" />
- <action android:name="com.android.storagemanager.automatic.DEBUG_SHOW_NOTIFICATION" />
- <action android:name="com.android.storagemanager.automatic.SHOW_SETTINGS" />
+ <action android:name="com.android.storagemanager.automatic.DISMISS"/>
+ <action android:name="com.android.storagemanager.automatic.ACTIVATE"/>
+ <action android:name="com.android.storagemanager.automatic.NO_THANKS"/>
+ <action android:name="com.android.storagemanager.automatic.SHOW_NOTIFICATION"/>
+ <action android:name="com.android.storagemanager.automatic.DEBUG_SHOW_NOTIFICATION"/>
+ <action android:name="com.android.storagemanager.automatic.SHOW_SETTINGS"/>
</intent-filter>
</receiver>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 68262b7..6cc6366 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -17,8 +17,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="automatic_storage_management_days">
- <item msgid="4262697175462957945">"تم إنشاؤها منذ أكثر من 30 يومًا"</item>
- <item msgid="2920779420892632946">"تم إنشاؤها منذ أكثر من 60 يومًا"</item>
- <item msgid="1402081670011072896">"تم إنشاؤها منذ أكثر من 90 يومًا"</item>
+ <item msgid="4262697175462957945">"تم إنشاؤها قبل أكثر من 30 يومًا."</item>
+ <item msgid="2920779420892632946">"تم إنشاؤها قبل أكثر من 60 يومًا."</item>
+ <item msgid="1402081670011072896">"تم إنشاؤها قبل أكثر من 90 يومًا."</item>
</string-array>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6bb2fc3..fd16dae 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -27,7 +27,7 @@
<string name="deletion_helper_app_summary_unknown_used" msgid="8576377054665785558">"وقت آخر استخدام لسعة التخزين غير مؤكَّد"</string>
<string name="deletion_helper_free_button" msgid="1760529213407548661">"إخلاء <xliff:g id="FREEABLE">%1$s</xliff:g>"</string>
<string name="deletion_helper_photos_title" msgid="2602723121486729972">"صور وفيديوهات تمّ حفظ نسخ احتياطية منها"</string>
- <string name="deletion_helper_photos_age_summary" msgid="1820871709448371984">"أقدم من 30 يومًا"</string>
+ <string name="deletion_helper_photos_age_summary" msgid="1820871709448371984">"تم إنشاؤها قبل أكثر من 30 يومًا."</string>
<!-- no translation found for deletion_helper_photos_summary (3194825464552700889) -->
<skip />
<string name="deletion_helper_downloads_title" msgid="8002058095019254694">"عمليات التنزيل"</string>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 345a536..7a94f30 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -17,8 +17,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="automatic_storage_management_days">
- <item msgid="4262697175462957945">"30 gündən köhnədir"</item>
- <item msgid="2920779420892632946">"60 gündən köhnədir"</item>
- <item msgid="1402081670011072896">"90 gündən köhnədir"</item>
+ <item msgid="4262697175462957945">"30 gündən köhnə"</item>
+ <item msgid="2920779420892632946">"60 gündən köhnə"</item>
+ <item msgid="1402081670011072896">"90 gündən köhnə"</item>
</string-array>
</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 0ba8578..8541801 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -27,7 +27,7 @@
<string name="deletion_helper_app_summary_unknown_used" msgid="8576377054665785558">"Son istifadə vaxtı dəqiq deyil"</string>
<string name="deletion_helper_free_button" msgid="1760529213407548661">"<xliff:g id="FREEABLE">%1$s</xliff:g> yer boşaldın"</string>
<string name="deletion_helper_photos_title" msgid="2602723121486729972">"Yedəklənmiş foto və videolar"</string>
- <string name="deletion_helper_photos_age_summary" msgid="1820871709448371984">"30 gündən köhnədir"</string>
+ <string name="deletion_helper_photos_age_summary" msgid="1820871709448371984">"30 gündən köhnə"</string>
<!-- no translation found for deletion_helper_photos_summary (3194825464552700889) -->
<skip />
<string name="deletion_helper_downloads_title" msgid="8002058095019254694">"Endirmələr"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 1e02856..0a03557 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -23,7 +23,7 @@
<string name="deletion_helper_app_summary" msgid="4904590040180275237">"Pre <xliff:g id="DAYS">%1$d</xliff:g> dana"</string>
<!-- no translation found for deletion_helper_app_summary_item_size (3770886184921427886) -->
<skip />
- <string name="deletion_helper_app_summary_never_used" msgid="2695210890063792461">"Nije korišćena u poslednjih godinu dana"</string>
+ <string name="deletion_helper_app_summary_never_used" msgid="2695210890063792461">"Nije korišćeno u poslednjih godinu dana"</string>
<string name="deletion_helper_app_summary_unknown_used" msgid="8576377054665785558">"Nije sigurno kada je poslednji put korišćena"</string>
<string name="deletion_helper_free_button" msgid="1760529213407548661">"Oslobodite <xliff:g id="FREEABLE">%1$s</xliff:g>"</string>
<string name="deletion_helper_photos_title" msgid="2602723121486729972">"Rezervne kopije slika i video snimaka"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index bb4def8..9f26998 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="963247385700831716">"Tallennustilan hallinta"</string>
- <string name="cancel" msgid="7021218262867558825">"Peruuta"</string>
+ <string name="cancel" msgid="7021218262867558825">"Peru"</string>
<string name="storage_menu_free" msgid="1878247401436882778">"Vapauta tilaa"</string>
<string name="deletion_helper_title" msgid="3526170325226275927">"Poista kohteita"</string>
<string name="deletion_helper_app_summary" msgid="4904590040180275237">"<xliff:g id="DAYS">%1$d</xliff:g> päivää sitten"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 1a38079..ac0af56 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -26,7 +26,7 @@
<string name="deletion_helper_app_summary_never_used" msgid="2695210890063792461">"Non se utilizou no último ano"</string>
<string name="deletion_helper_app_summary_unknown_used" msgid="8576377054665785558">"Non se sabe cando se utilizou por última vez"</string>
<string name="deletion_helper_free_button" msgid="1760529213407548661">"Liberar <xliff:g id="FREEABLE">%1$s</xliff:g>"</string>
- <string name="deletion_helper_photos_title" msgid="2602723121486729972">"Copias de seguranza de fotos e vídeos"</string>
+ <string name="deletion_helper_photos_title" msgid="2602723121486729972">"Fotos e vídeos con copia de seguranza"</string>
<string name="deletion_helper_photos_age_summary" msgid="1820871709448371984">"De máis de 30 días"</string>
<!-- no translation found for deletion_helper_photos_summary (3194825464552700889) -->
<skip />
@@ -39,7 +39,7 @@
<string name="deletion_helper_clear_dialog_message" msgid="5196490478187120700">"Contido que se eliminará do teu dispositivo: <xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g>"</string>
<string name="deletion_helper_clear_dialog_remove" msgid="863575755467985516">"Liberar espazo"</string>
<string name="deletion_helper_upsell_title" msgid="8512037674466762017">"Queres xestionar o almacenamento automaticamente?"</string>
- <string name="deletion_helper_upsell_summary" msgid="2301597713694474407">"Actualmente tes <xliff:g id="USED">%1$s</xliff:g> libres. Queres permitir que o xestor de almacenamento elimine o contido con copia de seguranza do teu dispositivo para liberar espazo?"</string>
+ <string name="deletion_helper_upsell_summary" msgid="2301597713694474407">"Actualmente tes <xliff:g id="USED">%1$s</xliff:g> libres. Queres permitir que o xestor de almacenamento quite o contido con copia de seguranza do teu dispositivo para liberar espazo?"</string>
<string name="deletion_helper_upsell_cancel" msgid="7084167642850053889">"Non, grazas"</string>
<string name="deletion_helper_upsell_activate" msgid="7157360257760895976">"Activar"</string>
<string name="deletion_helper_apps_group_title" msgid="2578309121350341258">"Aplicacións pouco utilizadas"</string>
@@ -51,17 +51,17 @@
<string name="automatic_storage_manager_service_label" msgid="648592272375278978">"Xestión automática do almacenamento"</string>
<string name="automatic_storage_manager_notification_title" product="default" msgid="8480483265300964701">"O teléfono ten pouco espazo restante."</string>
<string name="automatic_storage_manager_notification_title" product="tablet" msgid="3150907918531844467">"Á tableta quédalle pouco espazo"</string>
- <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"Permite que o xestor de almacenamento elimine automaticamente as fotos e os vídeos antigos cando o teléfono case está cheo de novo e así liberar espazo."</string>
+ <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"Permite que o xestor de almacenamento quite automaticamente as fotos e os vídeos antigos cando o teléfono case está cheo de novo e así liberar espazo."</string>
<string name="automatic_storage_manager_cancel_button" msgid="1826365037494962803">"Non, grazas"</string>
<string name="automatic_storage_manager_activate_button" msgid="6257070263061898041">"Activar"</string>
- <string name="deletion_helper_photos_loading_title" msgid="2768067991066779772">"Copias de seguranza de fotos e vídeos"</string>
+ <string name="deletion_helper_photos_loading_title" msgid="2768067991066779772">"Fotos e vídeos con copia de seguranza"</string>
<string name="deletion_helper_photos_loading_summary" msgid="8203033249458245854">"Buscando elementos…"</string>
<string name="deletion_helper_no_threshold" msgid="6943179204098250444">"Mostrar todos os elementos"</string>
<string name="deletion_helper_default_threshold" msgid="8410389370069021113">"Ocultar elementos recentes"</string>
<string name="deletion_helper_clear_dialog_message_first_time" msgid="686530413183529901">"Contido que se eliminará do teu dispositivo: <xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g>"</string>
<string name="automatic_storage_manager_activation_warning" msgid="7657017408180001078">"Agora o xestor de almacenamento administra o teu espazo"</string>
- <string name="empty_state_title" msgid="4033285438176545309">"Nada para eliminar"</string>
+ <string name="empty_state_title" msgid="4033285438176545309">"Nada para quitar"</string>
<string name="empty_state_review_items_link" msgid="8411186441239304545">"Revisar elementos recentes"</string>
- <string name="empty_state_summary" msgid="8439893007424243790">"Non hai ningún ficheiro antigo para eliminar. Para liberar espazo, elimina fotos, vídeos e aplicacións recentes."</string>
+ <string name="empty_state_summary" msgid="8439893007424243790">"Non hai ningún ficheiro antigo para quitar. Para liberar espazo, quita fotos, vídeos e aplicacións recentes."</string>
<string name="app_requesting_space" msgid="857425181289960167">"A aplicación <xliff:g id="APP">%1$s</xliff:g> precisa <xliff:g id="CLEARABLE_BYTES">%2$s</xliff:g> de espazo"</string>
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index a82a022..325e155 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -45,7 +45,7 @@
<string name="deletion_helper_apps_group_title" msgid="2578309121350341258">"ક્વચિત્ ઉપયોગમાં લેવાયેલી ઍપ્લિકેશનો"</string>
<!-- no translation found for deletion_helper_apps_group_summary (360315517252452356) -->
<skip />
- <string name="deletion_helper_automatic_title" msgid="4610119358490679299">"સ્વચાલિત"</string>
+ <string name="deletion_helper_automatic_title" msgid="4610119358490679299">"ઑટોમૅટિક રીતે"</string>
<string name="deletion_helper_manual_title" msgid="3905192395039688529">"મેન્યુઅલ"</string>
<string name="deletion_helper_preference_title" msgid="803484286872745892">"હમણાં સ્થાન ખાલી કરો"</string>
<string name="automatic_storage_manager_service_label" msgid="648592272375278978">"ઑટોમેટિક સ્ટોરેજ મેનેજમેન્ટ સેવા"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4f29ebb..b0bc680 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="963247385700831716">"जगह प्रबंधक"</string>
+ <string name="app_name" msgid="963247385700831716">"जगह मैनेजर"</string>
<string name="cancel" msgid="7021218262867558825">"रद्द करें"</string>
<string name="storage_menu_free" msgid="1878247401436882778">"जगह खाली करें"</string>
<string name="deletion_helper_title" msgid="3526170325226275927">"चीज़ें मिटाएं"</string>
@@ -39,7 +39,7 @@
<string name="deletion_helper_clear_dialog_message" msgid="5196490478187120700">"<xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g> सामग्री आपके डिवाइस से हटा दी जाएगी"</string>
<string name="deletion_helper_clear_dialog_remove" msgid="863575755467985516">"जगह खाली करें"</string>
<string name="deletion_helper_upsell_title" msgid="8512037674466762017">"जगह अपने आप प्रबंधित करें?"</string>
- <string name="deletion_helper_upsell_summary" msgid="2301597713694474407">"अब <xliff:g id="USED">%1$s</xliff:g> जगह खाली है. मेमोरी प्रबंधक को आपके डिवाइस से बैक अप ली गई सामग्री को निकालकर अपने आप जगह खाली करने दें?"</string>
+ <string name="deletion_helper_upsell_summary" msgid="2301597713694474407">"अब <xliff:g id="USED">%1$s</xliff:g> जगह खाली है. मेमोरी मैनेजर को आपके डिवाइस से बैक अप ली गई सामग्री को निकालकर अपने आप जगह खाली करने दें?"</string>
<string name="deletion_helper_upsell_cancel" msgid="7084167642850053889">"नहीं, धन्यवाद"</string>
<string name="deletion_helper_upsell_activate" msgid="7157360257760895976">"चालू करें"</string>
<string name="deletion_helper_apps_group_title" msgid="2578309121350341258">"कम उपयोग किए जाने वाले ऐप्लिकेशन"</string>
@@ -51,7 +51,7 @@
<string name="automatic_storage_manager_service_label" msgid="648592272375278978">"मेमोरी का अपने आप प्रबंधन करने वाली सेवा"</string>
<string name="automatic_storage_manager_notification_title" product="default" msgid="8480483265300964701">"आपके फ़ोन में जगह कम है"</string>
<string name="automatic_storage_manager_notification_title" product="tablet" msgid="3150907918531844467">"आपके टैबलेट में जगह कम है"</string>
- <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"जब आपके फ़ोन की मेमोरी फिर से भरने लगे तो मेमोरी प्रबंधक को पुरानी फ़ोटो और वीडियो को हटाकर जगह खाली करने दें."</string>
+ <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"जब आपके फ़ोन की मेमोरी फिर से भरने लगे तो मेमोरी मैनेजर को पुरानी फ़ोटो और वीडियो को हटाकर जगह खाली करने दें."</string>
<string name="automatic_storage_manager_cancel_button" msgid="1826365037494962803">"नहीं, धन्यवाद"</string>
<string name="automatic_storage_manager_activate_button" msgid="6257070263061898041">"चालू करें"</string>
<string name="deletion_helper_photos_loading_title" msgid="2768067991066779772">"बैकअप ली गईं फ़ोटो और वीडियो"</string>
@@ -59,7 +59,7 @@
<string name="deletion_helper_no_threshold" msgid="6943179204098250444">"सभी आइटम दिखाएं"</string>
<string name="deletion_helper_default_threshold" msgid="8410389370069021113">"हाल ही के आइटम छिपाएं"</string>
<string name="deletion_helper_clear_dialog_message_first_time" msgid="686530413183529901">"<xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g> सामग्री आपके डिवाइस से हटा दी जाएगी"</string>
- <string name="automatic_storage_manager_activation_warning" msgid="7657017408180001078">"आपकी जगह का प्रबंधन अब जगह प्रबंधक द्वारा किया जा रहा है"</string>
+ <string name="automatic_storage_manager_activation_warning" msgid="7657017408180001078">"आपकी जगह का प्रबंधन अब जगह मैनेजर द्वारा किया जा रहा है"</string>
<string name="empty_state_title" msgid="4033285438176545309">"हटाने के लिए कुछ नहीं है"</string>
<string name="empty_state_review_items_link" msgid="8411186441239304545">"हाल ही के आइटम देखें"</string>
<string name="empty_state_summary" msgid="8439893007424243790">"हटाने के लिए कोई भी पुरानी फ़ाइल नहीं है. जगह बनाने के लिए, हाल ही की फ़ोटो, वीडियो और ऐप्लिकेशन हटाएं."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 51445c4..d915698 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -20,7 +20,7 @@
<string name="cancel" msgid="7021218262867558825">"Batal"</string>
<string name="storage_menu_free" msgid="1878247401436882778">"Kosongkan ruang"</string>
<string name="deletion_helper_title" msgid="3526170325226275927">"Hapus item"</string>
- <string name="deletion_helper_app_summary" msgid="4904590040180275237">"<xliff:g id="DAYS">%1$d</xliff:g> hari yang lalu"</string>
+ <string name="deletion_helper_app_summary" msgid="4904590040180275237">"<xliff:g id="DAYS">%1$d</xliff:g> hari lalu"</string>
<!-- no translation found for deletion_helper_app_summary_item_size (3770886184921427886) -->
<skip />
<string name="deletion_helper_app_summary_never_used" msgid="2695210890063792461">"Tidak digunakan setahun terakhir"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6204d41..c4bc34a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -51,11 +51,11 @@
<string name="automatic_storage_manager_service_label" msgid="648592272375278978">"שירות ניהול אחסון אוטומטי"</string>
<string name="automatic_storage_manager_notification_title" product="default" msgid="8480483265300964701">"אין מספיק שטח אחסון בטלפון"</string>
<string name="automatic_storage_manager_notification_title" product="tablet" msgid="3150907918531844467">"אין מספיק שטח אחסון בטאבלט"</string>
- <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"אפשר למנהל האחסון לפנות שטח אחסון על ידי הסרה אוטומטית של תמונות וסרטונים ישנים, כששטח האחסון בטלפון מתחיל להתמלא שוב."</string>
+ <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"מתירים למנהל האחסון לפנות שטח אחסון על ידי הסרה אוטומטית של תמונות וסרטונים ישנים, כששטח האחסון בטלפון מתחיל להתמלא שוב."</string>
<string name="automatic_storage_manager_cancel_button" msgid="1826365037494962803">"לא, תודה"</string>
<string name="automatic_storage_manager_activate_button" msgid="6257070263061898041">"הפעלה"</string>
<string name="deletion_helper_photos_loading_title" msgid="2768067991066779772">"תמונות וסרטונים שגובו"</string>
- <string name="deletion_helper_photos_loading_summary" msgid="8203033249458245854">"מחפש פריטים…"</string>
+ <string name="deletion_helper_photos_loading_summary" msgid="8203033249458245854">"חיפוש פריטים מתבצע…"</string>
<string name="deletion_helper_no_threshold" msgid="6943179204098250444">"הצגת כל הפריטים"</string>
<string name="deletion_helper_default_threshold" msgid="8410389370069021113">"הסתרת פריטים אחרונים"</string>
<string name="deletion_helper_clear_dialog_message_first_time" msgid="686530413183529901">"<xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g> של תוכן יוסרו מהמכשיר"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index ba0d187..5dd59a4 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="963247385700831716">"Сактагычты көзөмөлдөгүч"</string>
- <string name="cancel" msgid="7021218262867558825">"Жокко чыгаруу"</string>
+ <string name="cancel" msgid="7021218262867558825">"Жок"</string>
<string name="storage_menu_free" msgid="1878247401436882778">"Орун бошотуу"</string>
<string name="deletion_helper_title" msgid="3526170325226275927">"Объекттерди өчүрүү"</string>
<string name="deletion_helper_app_summary" msgid="4904590040180275237">"<xliff:g id="DAYS">%1$d</xliff:g> күн мурун"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8cd9064..cd0b114 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -41,7 +41,7 @@
<string name="deletion_helper_upsell_title" msgid="8512037674466762017">"Wil je opslagruimte automatisch beheren?"</string>
<string name="deletion_helper_upsell_summary" msgid="2301597713694474407">"Er is nu <xliff:g id="USED">%1$s</xliff:g> vrij. Opslagbeheer automatisch ruimte laten vrijmaken door content waarvan een back-up is gemaakt, van je apparaat te verwijderen?"</string>
<string name="deletion_helper_upsell_cancel" msgid="7084167642850053889">"Nee, bedankt"</string>
- <string name="deletion_helper_upsell_activate" msgid="7157360257760895976">"Inschakelen"</string>
+ <string name="deletion_helper_upsell_activate" msgid="7157360257760895976">"Aanzetten"</string>
<string name="deletion_helper_apps_group_title" msgid="2578309121350341258">"Weinig gebruikte apps"</string>
<!-- no translation found for deletion_helper_apps_group_summary (360315517252452356) -->
<skip />
@@ -53,10 +53,10 @@
<string name="automatic_storage_manager_notification_title" product="tablet" msgid="3150907918531844467">"Weinig ruimte vrij op je tablet"</string>
<string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"Laat Opslagbeheer automatisch ruimte vrijmaken door oude foto\'s en video\'s van je telefoon te verwijderen zodra je telefoon weer vol begint te raken."</string>
<string name="automatic_storage_manager_cancel_button" msgid="1826365037494962803">"Nee, bedankt"</string>
- <string name="automatic_storage_manager_activate_button" msgid="6257070263061898041">"Inschakelen"</string>
+ <string name="automatic_storage_manager_activate_button" msgid="6257070263061898041">"Aanzetten"</string>
<string name="deletion_helper_photos_loading_title" msgid="2768067991066779772">"Foto\'s en video\'s waarvan een back-up is gemaakt"</string>
<string name="deletion_helper_photos_loading_summary" msgid="8203033249458245854">"Items zoeken…"</string>
- <string name="deletion_helper_no_threshold" msgid="6943179204098250444">"Alle items weergeven"</string>
+ <string name="deletion_helper_no_threshold" msgid="6943179204098250444">"Alle items tonen"</string>
<string name="deletion_helper_default_threshold" msgid="8410389370069021113">"Recente items verbergen"</string>
<string name="deletion_helper_clear_dialog_message_first_time" msgid="686530413183529901">"Er wordt <xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g> aan content verwijderd van je apparaat"</string>
<string name="automatic_storage_manager_activation_warning" msgid="7657017408180001078">"Je opslag wordt nu beheerd door de opslagbeheerder"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 8952224..7df3569 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="963247385700831716">"ଷ୍ଟୋରେଜ୍ ମ୍ୟାନେଜର୍"</string>
- <string name="cancel" msgid="7021218262867558825">"ବାତିଲ୍"</string>
+ <string name="cancel" msgid="7021218262867558825">"ବାତିଲ୍ କରନ୍ତୁ"</string>
<string name="storage_menu_free" msgid="1878247401436882778">"ଜାଗା ଖାଲି କରନ୍ତୁ"</string>
<string name="deletion_helper_title" msgid="3526170325226275927">"ଆଇଟମ୍ କାଢ଼ନ୍ତୁ"</string>
<string name="deletion_helper_app_summary" msgid="4904590040180275237">"<xliff:g id="DAYS">%1$d</xliff:g> ଦିନ ପୂର୍ବେ"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index ba452eb..e8f6134 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -23,7 +23,7 @@
<string name="deletion_helper_app_summary" msgid="4904590040180275237">"Пре <xliff:g id="DAYS">%1$d</xliff:g> дана"</string>
<!-- no translation found for deletion_helper_app_summary_item_size (3770886184921427886) -->
<skip />
- <string name="deletion_helper_app_summary_never_used" msgid="2695210890063792461">"Није коришћена у последњих годину дана"</string>
+ <string name="deletion_helper_app_summary_never_used" msgid="2695210890063792461">"Није коришћено у последњих годину дана"</string>
<string name="deletion_helper_app_summary_unknown_used" msgid="8576377054665785558">"Није сигурно када је последњи пут коришћена"</string>
<string name="deletion_helper_free_button" msgid="1760529213407548661">"Ослободите <xliff:g id="FREEABLE">%1$s</xliff:g>"</string>
<string name="deletion_helper_photos_title" msgid="2602723121486729972">"Резервне копије слика и видео снимака"</string>
diff --git a/robotests/Android.bp b/robotests/Android.bp
new file mode 100644
index 0000000..c6ea51f
--- /dev/null
+++ b/robotests/Android.bp
@@ -0,0 +1,28 @@
+//############################################################
+// StorageManager Robolectric test target. #
+//############################################################
+
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_robolectric_test {
+ name: "StorageManagerRoboTests",
+
+ srcs: ["src/**/*.java"],
+
+ java_resource_dirs: ["config"],
+
+ libs: [
+ "robolectric_android-all-stub",
+ "Robolectric_all-target",
+ "mockito-robolectric-prebuilt",
+ "truth-prebuilt",
+ ],
+
+ instrumentation_for: "StorageManager",
+
+ test_options: {
+ timeout: 36000,
+ },
+}
diff --git a/robotests/Android.mk b/robotests/Android.mk
deleted file mode 100644
index dbc010d..0000000
--- a/robotests/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#############################################################
-# StorageManager Robolectric test target. #
-#############################################################
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := StorageManagerRoboTests
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_RESOURCE_DIRS := config
-
-LOCAL_JAVA_LIBRARIES := \
- robolectric_android-all-stub \
- Robolectric_all-target \
- mockito-robolectric-prebuilt \
- truth-prebuilt
-
-LOCAL_INSTRUMENTATION_FOR := StorageManager
-
-LOCAL_MODULE_TAGS := optional
-
-# Generate test_config.properties
-include external/robolectric-shadows/gen_test_config.mk
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-#############################################################
-# StorageManager runner target to run the previous target. #
-#############################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := RunStorageManagerRoboTests
-
-LOCAL_JAVA_LIBRARIES := \
- StorageManagerRoboTests \
- robolectric_android-all-stub \
- Robolectric_all-target \
- mockito-robolectric-prebuilt \
- truth-prebuilt
-
-LOCAL_TEST_PACKAGE := StorageManager
-
-LOCAL_ROBOTEST_TIMEOUT := 36000
-
-include external/robolectric-shadows/run_robotests.mk
diff --git a/src/com/android/storagemanager/automatic/NotificationController.java b/src/com/android/storagemanager/automatic/NotificationController.java
index e596a75..2cb7c8c 100644
--- a/src/com/android/storagemanager/automatic/NotificationController.java
+++ b/src/com/android/storagemanager/automatic/NotificationController.java
@@ -177,7 +177,7 @@
Notification.Action.Builder cancelAction = new Notification.Action.Builder(null,
res.getString(R.string.automatic_storage_manager_cancel_button),
PendingIntent.getBroadcast(context, 0, noThanksIntent,
- PendingIntent.FLAG_UPDATE_CURRENT));
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE));
Intent activateIntent = getBaseIntent(context, INTENT_ACTION_ACTIVATE_ASM);
@@ -185,18 +185,18 @@
Notification.Action.Builder activateAutomaticAction = new Notification.Action.Builder(null,
res.getString(R.string.automatic_storage_manager_activate_button),
PendingIntent.getBroadcast(context, 0, activateIntent,
- PendingIntent.FLAG_UPDATE_CURRENT));
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE));
Intent dismissIntent = getBaseIntent(context, INTENT_ACTION_DISMISS);
dismissIntent.putExtra(INTENT_EXTRA_ID, NOTIFICATION_ID);
PendingIntent deleteIntent = PendingIntent.getBroadcast(context, 0,
dismissIntent,
- PendingIntent.FLAG_ONE_SHOT);
+ PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
Intent contentIntent = getBaseIntent(context, INTENT_ACTION_TAP);
contentIntent.putExtra(INTENT_EXTRA_ID, NOTIFICATION_ID);
PendingIntent tapIntent = PendingIntent.getBroadcast(context, 0, contentIntent,
- PendingIntent.FLAG_ONE_SHOT);
+ PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
Notification.Builder builder;
// We really should only have the path with the notification channel set. The other path is
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index fd297e3..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Include all makefiles in subdirectories
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/app/Android.bp b/tests/app/Android.bp
new file mode 100644
index 0000000..334124f
--- /dev/null
+++ b/tests/app/Android.bp
@@ -0,0 +1,25 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+ name: "StorageManagerAppTests",
+
+ libs: ["android.test.runner"],
+
+ static_libs: [
+ "androidx.test.rules",
+ "mockito-target",
+ "androidx.test.espresso.core",
+ "androidx.test.espresso.contrib-nodeps",
+ "androidx.test.espresso.intents-nodeps",
+ "truth-prebuilt",
+ ],
+
+ // Include all test java files.
+ srcs: ["src/**/*.java"],
+
+ platform_apis: true,
+
+ instrumentation_for: "StorageManager",
+}
diff --git a/tests/app/Android.mk b/tests/app/Android.mk
deleted file mode 100644
index 8b0133c..0000000
--- a/tests/app/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- mockito-target \
- androidx.test.espresso.core \
- androidx.test.espresso.contrib-nodeps \
- androidx.test.espresso.intents-nodeps \
- truth-prebuilt
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := StorageManagerAppTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_INSTRUMENTATION_FOR := StorageManager
-
-include $(BUILD_PACKAGE)
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
new file mode 100644
index 0000000..d32057c
--- /dev/null
+++ b/tests/unit/Android.bp
@@ -0,0 +1,25 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+ name: "StorageManagerUnitTests",
+
+ libs: [
+ "android.test.runner",
+ "android.test.base",
+ "android.test.mock",
+ ],
+
+ static_libs: [
+ "androidx.test.rules",
+ "mockito-target",
+ ],
+
+ // Include all test java files.
+ srcs: ["src/**/*.java"],
+
+ platform_apis: true,
+
+ instrumentation_for: "StorageManager",
+}
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
deleted file mode 100644
index 45892a4..0000000
--- a/tests/unit/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- mockito-target
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := StorageManagerUnitTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_INSTRUMENTATION_FOR := StorageManager
-
-include $(BUILD_PACKAGE)
