Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I9dbaebc5cccd62b8124f86682f83d56508fd6935
diff --git a/Android.mk b/Android.mk
index f7bddf2..ae6b5f4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,10 +24,10 @@
LOCAL_PRIVILEGED_MODULE := true
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v14-preference \
- android-support-v7-appcompat \
- android-support-v7-preference \
- android-support-v7-recyclerview
+ androidx.legacy_legacy-preference-v14 \
+ androidx.appcompat_appcompat \
+ androidx.preference_preference \
+ androidx.recyclerview_recyclerview
LOCAL_USE_AAPT2 := true
diff --git a/proguard.cfg b/proguard.cfg
index b4e8c79..799e737 100644
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -5,19 +5,6 @@
-verbose
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.preference.Preference
--keep public class android.support.v7.preference.Preference {
- public <init>(android.content.Context, android.util.AttributeSet);
-}
--keep public class * extends android.support.v7.preference.Preference {
- public <init>(android.content.Context, android.util.AttributeSet);
-}
-
-keepclasseswithmembernames class * {
native <methods>;
}
@@ -43,9 +30,9 @@
public static final android.os.Parcelable$Creator *;
}
--keep @android.support.annotation.Keep class *
+-keep @androidx.annotation.Keep class *
-keepclassmembers class * {
- @android.support.annotation.Keep *;
+ @androidx.annotation.Keep *;
}
-keep class com.android.storagemanager.overlay.FeatureFactoryImpl
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4a8085c..1fc575f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -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-as/arrays.xml b/res/values-as/arrays.xml
deleted file mode 100644
index 85ac96a..0000000
--- a/res/values-as/arrays.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<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">"৩০ দিনতকৈ অধিক পুৰণি"</item>
- <item msgid="2920779420892632946">"৬০ দিনতকৈ অধিক পুৰণি"</item>
- <item msgid="1402081670011072896">"৯০ দিনতকৈ অধিক পুৰণি"</item>
- </string-array>
-</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
deleted file mode 100644
index d8da27d..0000000
--- a/res/values-as/strings.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<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="storage_menu_free" msgid="1878247401436882778">"সঞ্চয়াগাৰত ঠাই খালী কৰক"</string>
- <!-- no translation found for deletion_helper_title (3526170325226275927) -->
- <skip />
- <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_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">"৩০ দিনতকৈ অধিক পুৰণি"</string>
- <!-- no translation found for deletion_helper_photos_summary (3194825464552700889) -->
- <skip />
- <string name="deletion_helper_downloads_title" msgid="8002058095019254694">"ডাউনল\'ডসমূহ"</string>
- <!-- no translation found for deletion_helper_downloads_category_summary (8545989355108311347) -->
- <skip />
- <!-- no translation found for deletion_helper_downloads_summary_empty (3988054032360371887) -->
- <skip />
- <string name="deletion_helper_clear_dialog_title" msgid="9169670752655850967">"সঞ্চয়াগাৰত ঠাই খালী কৰক"</string>
- <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_cancel" msgid="7084167642850053889">"নালাগে, ধন্যবাদ"</string>
- <string name="deletion_helper_upsell_activate" msgid="7157360257760895976">"অন কৰক"</string>
- <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_manual_title" msgid="3905192395039688529">"মেনুৱেলভাৱে"</string>
- <string name="deletion_helper_preference_title" msgid="803484286872745892">"এতিয়া ঠাই খালী কৰক"</string>
- <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_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_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="empty_state_title" msgid="4033285438176545309">"আঁতৰাব লগা একোৱেই নাই"</string>
- <string name="empty_state_review_items_link" msgid="8411186441239304545">"শেহতীয়া বস্তুবোৰৰ সমীক্ষা কৰক"</string>
- <string name="empty_state_summary" msgid="8439893007424243790">"আঁতৰাব লগা কোনো পুৰণা ফাইল নাই৷ খালী ঠাই উলিয়াবলৈ, শেহতীয়া ফট\', ভিডিঅ\' আৰু এপসমূহ আঁতৰাওক৷"</string>
- <string name="app_requesting_space" msgid="857425181289960167">"<xliff:g id="APP">%1$s</xliff:g>ক <xliff:g id="CLEARABLE_BYTES">%2$s</xliff:g> খালী ঠাইৰ প্ৰয়োজন"</string>
-</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index cad421a..54e1fb0 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -19,7 +19,7 @@
<string name="app_name" msgid="963247385700831716">"Storage Manager"</string>
<string name="cancel" msgid="7021218262867558825">"Cancel"</string>
<string name="storage_menu_free" msgid="1878247401436882778">"Free up space"</string>
- <string name="deletion_helper_title" msgid="3526170325226275927">"Remove items"</string>
+ <string name="deletion_helper_title" msgid="7928959984891140427">"Choose items to remove"</string>
<string name="deletion_helper_app_summary" msgid="4904590040180275237">"<xliff:g id="DAYS">%1$d</xliff:g> days ago"</string>
<!-- no translation found for deletion_helper_app_summary_item_size (3770886184921427886) -->
<skip />
@@ -40,7 +40,7 @@
<string name="deletion_helper_clear_dialog_remove" msgid="863575755467985516">"Free up space"</string>
<string name="deletion_helper_upsell_title" msgid="8512037674466762017">"Manage storage automatically?"</string>
<string name="deletion_helper_upsell_summary" msgid="2301597713694474407">"<xliff:g id="USED">%1$s</xliff:g> now free. Let Storage Manager automatically free up space by removing backed-up content from your device?"</string>
- <string name="deletion_helper_upsell_cancel" msgid="7084167642850053889">"No, thanks"</string>
+ <string name="deletion_helper_upsell_cancel" msgid="7084167642850053889">"No thanks"</string>
<string name="deletion_helper_upsell_activate" msgid="7157360257760895976">"Turn on"</string>
<string name="deletion_helper_apps_group_title" msgid="2578309121350341258">"Infrequently used apps"</string>
<!-- no translation found for deletion_helper_apps_group_summary (360315517252452356) -->
@@ -52,7 +52,7 @@
<string name="automatic_storage_manager_notification_title" product="default" msgid="8480483265300964701">"Your phone is low on space"</string>
<string name="automatic_storage_manager_notification_title" product="tablet" msgid="3150907918531844467">"Your tablet is low on space"</string>
<string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"Let Storage Manager free up space by automatically removing old photos and videos when your phone starts to get full again."</string>
- <string name="automatic_storage_manager_cancel_button" msgid="1826365037494962803">"No, thanks"</string>
+ <string name="automatic_storage_manager_cancel_button" msgid="1826365037494962803">"No thanks"</string>
<string name="automatic_storage_manager_activate_button" msgid="6257070263061898041">"Turn on"</string>
<string name="deletion_helper_photos_loading_title" msgid="2768067991066779772">"Backed up photos & videos"</string>
<string name="deletion_helper_photos_loading_summary" msgid="8203033249458245854">"Finding items…"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index f5982f1..f267200 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -19,7 +19,7 @@
<string name="app_name" msgid="963247385700831716">"Storage Manager"</string>
<string name="cancel" msgid="7021218262867558825">"Cancel"</string>
<string name="storage_menu_free" msgid="1878247401436882778">"Free up space"</string>
- <string name="deletion_helper_title" msgid="3526170325226275927">"Remove items"</string>
+ <string name="deletion_helper_title" msgid="7928959984891140427">"Choose items to remove"</string>
<string name="deletion_helper_app_summary" msgid="4904590040180275237">"<xliff:g id="DAYS">%1$d</xliff:g> days ago"</string>
<!-- no translation found for deletion_helper_app_summary_item_size (3770886184921427886) -->
<skip />
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 26d525d..ec10b66 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -36,7 +36,7 @@
<!-- no translation found for deletion_helper_downloads_summary_empty (3988054032360371887) -->
<skip />
<string name="deletion_helper_clear_dialog_title" msgid="9169670752655850967">"ठाउँ खाली गर्नुहोस्"</string>
- <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_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>
@@ -58,7 +58,7 @@
<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>
+ <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="empty_state_title" msgid="4033285438176545309">"हटाउनु पर्ने कुनै कुरा छैन"</string>
<string name="empty_state_review_items_link" msgid="8411186441239304545">"हालैका वस्तुहरूको समीक्षा गर्नुहोस्"</string>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
deleted file mode 100644
index 5a410f8..0000000
--- a/res/values-or/arrays.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<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>
- </string-array>
-</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
deleted file mode 100644
index 775b4c5..0000000
--- a/res/values-or/strings.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<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="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>
- <!-- 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_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>
- <!-- no translation found for deletion_helper_photos_summary (3194825464552700889) -->
- <skip />
- <string name="deletion_helper_downloads_title" msgid="8002058095019254694">"ଡାଉନଲୋଡ୍ଗୁଡ଼ିକ"</string>
- <!-- no translation found for deletion_helper_downloads_category_summary (8545989355108311347) -->
- <skip />
- <!-- no translation found for deletion_helper_downloads_summary_empty (3988054032360371887) -->
- <skip />
- <string name="deletion_helper_clear_dialog_title" msgid="9169670752655850967">"ଜାଗା ଖାଲି କରନ୍ତୁ"</string>
- <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_cancel" msgid="7084167642850053889">"ନାହିଁ, ଥାଉ"</string>
- <string name="deletion_helper_upsell_activate" msgid="7157360257760895976">"ଅନ୍ କରନ୍ତୁ"</string>
- <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_manual_title" msgid="3905192395039688529">"ମାନୁଆଲ୍"</string>
- <string name="deletion_helper_preference_title" msgid="803484286872745892">"ଏବେ ଜାଗା ଖାଲି କରନ୍ତୁ"</string>
- <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_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_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="empty_state_title" msgid="4033285438176545309">"ଡିଲିଟ୍ କରିବା ପାଇଁ କିଛି ନାହିଁ"</string>
- <string name="empty_state_review_items_link" msgid="8411186441239304545">"ସାମ୍ପ୍ରତିକ ଆଇଟମ୍ଗୁଡ଼ିକୁ ରିଭ୍ୟୁ କରନ୍ତୁ"</string>
- <string name="empty_state_summary" msgid="8439893007424243790">"ଡିଲିଟ୍ କରିବା ପାଇଁ କୌଣସି ପୁରୁଣା ଫାଇଲ୍ ନାହିଁ। ଜାଗା ତିଆରି କରିବା ପାଇଁ ସାମ୍ପ୍ରତିକ ଫଟୋ, ଭିଡିଓ ଏବଂ ଆପ୍ ଡିଲିଟ୍ କରନ୍ତୁ।"</string>
- <string name="app_requesting_space" msgid="857425181289960167">"<xliff:g id="APP">%1$s</xliff:g>କୁ <xliff:g id="CLEARABLE_BYTES">%2$s</xliff:g> ଜାଗା ଆବଶ୍ୟକ"</string>
-</resources>
diff --git a/robotests/Android.mk b/robotests/Android.mk
index 0ef13d7..7d59d8f 100644
--- a/robotests/Android.mk
+++ b/robotests/Android.mk
@@ -14,7 +14,7 @@
LOCAL_JAVA_LIBRARIES := \
junit \
- platform-robolectric-3.6.1-prebuilt
+ platform-robolectric-3.6.2-prebuilt
LOCAL_INSTRUMENTATION_FOR := StorageManager
LOCAL_MODULE := StorageManagerRoboTests
@@ -37,4 +37,4 @@
LOCAL_TEST_PACKAGE := StorageManager
-include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
+include prebuilts/misc/common/robolectric/3.6.2/run_robotests.mk
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroupTest.java b/robotests/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroupTest.java
index 55ee9b3..dd2f0cb 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroupTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroupTest.java
@@ -18,8 +18,8 @@
import static com.google.common.truth.Truth.assertThat;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.storagemanager.testing.TestingConstants;
import java.util.ArrayList;
import java.util.List;
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java b/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java
index bec2f2b..503678c 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java
@@ -16,14 +16,17 @@
package com.android.storagemanager.deletionhelper;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
+import androidx.preference.PreferenceViewHolder;
+import com.android.storagemanager.R;
import com.android.storagemanager.deletionhelper.DeletionType.LoadingStatus;
import com.android.storagemanager.testing.TestingConstants;
-import com.android.storagemanager.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,9 +37,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestingConstants.MANIFEST, sdk = TestingConstants.SDK_VERSION)
public class CollapsibleCheckboxPreferenceGroupTest {
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java b/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java
index 388f8b8..edbe257 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java
@@ -33,7 +33,7 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.storage.StorageManager;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
import com.android.storagemanager.testing.StorageManagerRobolectricTestRunner;
import com.android.storagemanager.testing.TestingConstants;
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroupTest.java b/robotests/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroupTest.java
index c4b5db7..b44763b 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroupTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroupTest.java
@@ -25,7 +25,7 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
import com.android.storagemanager.testing.StorageManagerRobolectricTestRunner;
import com.android.storagemanager.testing.TestingConstants;
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java b/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java
index f731cea..24ebef0 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java
@@ -17,7 +17,7 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/robotests/src/com/android/storagemanager/utils/PreferenceListCacheTest.java b/robotests/src/com/android/storagemanager/utils/PreferenceListCacheTest.java
index 76b4278..f26b6a3 100644
--- a/robotests/src/com/android/storagemanager/utils/PreferenceListCacheTest.java
+++ b/robotests/src/com/android/storagemanager/utils/PreferenceListCacheTest.java
@@ -17,8 +17,8 @@
package com.android.storagemanager.utils;
import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.storagemanager.testing.TestingConstants;
import org.junit.Before;
import org.junit.Test;
@@ -32,8 +32,6 @@
import org.robolectric.annotation.Config;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
diff --git a/src/com/android/storagemanager/automatic/NotificationController.java b/src/com/android/storagemanager/automatic/NotificationController.java
index 58c99d8..a2e2081 100644
--- a/src/com/android/storagemanager/automatic/NotificationController.java
+++ b/src/com/android/storagemanager/automatic/NotificationController.java
@@ -27,8 +27,8 @@
import android.content.res.Resources;
import android.os.SystemProperties;
import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.os.BuildCompat;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.os.BuildCompat;
import com.android.storagemanager.R;
diff --git a/src/com/android/storagemanager/deletionhelper/AppDeletionPreference.java b/src/com/android/storagemanager/deletionhelper/AppDeletionPreference.java
index cd0ce28..dfd0419 100644
--- a/src/com/android/storagemanager/deletionhelper/AppDeletionPreference.java
+++ b/src/com/android/storagemanager/deletionhelper/AppDeletionPreference.java
@@ -15,7 +15,7 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.PreferenceViewHolder;
import android.text.format.DateUtils;
import com.android.storagemanager.R;
import com.android.storagemanager.deletionhelper.AppsAsyncLoader.PackageInfo;
diff --git a/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroup.java b/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroup.java
index bfca07e..0010b05 100644
--- a/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroup.java
+++ b/src/com/android/storagemanager/deletionhelper/AppDeletionPreferenceGroup.java
@@ -17,9 +17,9 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.format.Formatter;
import android.util.AttributeSet;
import com.android.internal.logging.MetricsLogger;
diff --git a/src/com/android/storagemanager/deletionhelper/AppsAsyncLoader.java b/src/com/android/storagemanager/deletionhelper/AppsAsyncLoader.java
index 1142b69..eb892a5 100644
--- a/src/com/android/storagemanager/deletionhelper/AppsAsyncLoader.java
+++ b/src/com/android/storagemanager/deletionhelper/AppsAsyncLoader.java
@@ -26,7 +26,7 @@
import android.graphics.drawable.Drawable;
import android.os.SystemProperties;
import android.os.UserHandle;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import android.text.format.DateUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
diff --git a/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java b/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java
index 51a969d..c5de8c6 100644
--- a/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java
+++ b/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java
@@ -19,10 +19,10 @@
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.view.View;
diff --git a/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java b/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java
index 1a63b17..93f2df3 100644
--- a/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java
+++ b/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java
@@ -23,10 +23,10 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.storage.StorageManager;
-import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import android.text.format.Formatter;
import android.view.LayoutInflater;
import android.view.Menu;
diff --git a/src/com/android/storagemanager/deletionhelper/DeletionPreference.java b/src/com/android/storagemanager/deletionhelper/DeletionPreference.java
index 0dd8fb0..5ae27d4 100644
--- a/src/com/android/storagemanager/deletionhelper/DeletionPreference.java
+++ b/src/com/android/storagemanager/deletionhelper/DeletionPreference.java
@@ -17,10 +17,10 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.view.View;
diff --git a/src/com/android/storagemanager/deletionhelper/DeletionType.java b/src/com/android/storagemanager/deletionhelper/DeletionType.java
index 47cd479..87cc618 100644
--- a/src/com/android/storagemanager/deletionhelper/DeletionType.java
+++ b/src/com/android/storagemanager/deletionhelper/DeletionType.java
@@ -18,7 +18,7 @@
import android.app.Activity;
import android.os.Bundle;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
/**
* Helper for the Deletion Helper which can query, clear out, and visualize deletable data.
diff --git a/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroup.java b/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroup.java
index 8213170..e595d07 100644
--- a/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroup.java
+++ b/src/com/android/storagemanager/deletionhelper/DownloadsDeletionPreferenceGroup.java
@@ -20,8 +20,8 @@
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
import android.text.format.Formatter;
import android.util.AttributeSet;
diff --git a/src/com/android/storagemanager/deletionhelper/DownloadsDeletionType.java b/src/com/android/storagemanager/deletionhelper/DownloadsDeletionType.java
index e8cf1df..e82d189 100644
--- a/src/com/android/storagemanager/deletionhelper/DownloadsDeletionType.java
+++ b/src/com/android/storagemanager/deletionhelper/DownloadsDeletionType.java
@@ -24,7 +24,7 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Environment;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.ArraySet;
import com.android.internal.logging.MetricsLogger;
diff --git a/src/com/android/storagemanager/deletionhelper/DownloadsFilePreference.java b/src/com/android/storagemanager/deletionhelper/DownloadsFilePreference.java
index c7d2570..9de43fd 100644
--- a/src/com/android/storagemanager/deletionhelper/DownloadsFilePreference.java
+++ b/src/com/android/storagemanager/deletionhelper/DownloadsFilePreference.java
@@ -17,7 +17,7 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
import android.text.format.DateUtils;
import com.android.storagemanager.utils.IconProvider;
diff --git a/src/com/android/storagemanager/deletionhelper/FetchDownloadsLoader.java b/src/com/android/storagemanager/deletionhelper/FetchDownloadsLoader.java
index f848ec4..5826baf 100644
--- a/src/com/android/storagemanager/deletionhelper/FetchDownloadsLoader.java
+++ b/src/com/android/storagemanager/deletionhelper/FetchDownloadsLoader.java
@@ -21,7 +21,7 @@
import android.media.ThumbnailUtils;
import android.os.SystemProperties;
import android.provider.MediaStore;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import android.text.format.DateUtils;
import com.android.storagemanager.utils.AsyncLoader;
diff --git a/src/com/android/storagemanager/deletionhelper/GaugePreference.java b/src/com/android/storagemanager/deletionhelper/GaugePreference.java
index 3ffdbac..9b71ebf 100644
--- a/src/com/android/storagemanager/deletionhelper/GaugePreference.java
+++ b/src/com/android/storagemanager/deletionhelper/GaugePreference.java
@@ -17,7 +17,7 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
import android.util.AttributeSet;
import com.android.storagemanager.R;
diff --git a/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java b/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java
index 47656d9..6f8fdd0 100644
--- a/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java
+++ b/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java
@@ -17,8 +17,8 @@
package com.android.storagemanager.deletionhelper;
import android.content.Context;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.PreferenceViewHolder;
import android.text.format.Formatter;
import android.view.View;
import android.widget.CheckBox;
diff --git a/src/com/android/storagemanager/deletionhelper/PackageDeletionTask.java b/src/com/android/storagemanager/deletionhelper/PackageDeletionTask.java
index 32fc09f..07e73b7 100644
--- a/src/com/android/storagemanager/deletionhelper/PackageDeletionTask.java
+++ b/src/com/android/storagemanager/deletionhelper/PackageDeletionTask.java
@@ -19,6 +19,7 @@
import android.content.pm.IPackageDeleteObserver;
import android.content.pm.PackageManager;
import android.os.UserHandle;
+import android.util.Log;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
@@ -27,6 +28,7 @@
* Deletes a specified set of apps as a specified user and calls back once done.
*/
public class PackageDeletionTask {
+ private static final String TAG = "PackageDeletionTask";
private Set<String> mPackages;
private Callback mCallback;
private PackageManager mPm;
@@ -46,7 +48,12 @@
public void run() {
PackageDeletionObserver observer = new PackageDeletionObserver(mPackages.size());
for (String packageName : mPackages) {
- mPm.deletePackageAsUser(packageName, observer, 0, mUser.getIdentifier());
+ try {
+ mPm.deletePackageAsUser(packageName, observer, 0, mUser.getIdentifier());
+ } catch (IllegalArgumentException e) {
+ // Couldn't find the package, no need to delete.
+ Log.w(TAG, "Could not find package, not deleting " + packageName, e);
+ }
}
}
diff --git a/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreference.java b/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreference.java
index 28139dc..d87a338 100644
--- a/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreference.java
+++ b/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreference.java
@@ -18,8 +18,8 @@
import android.content.Context;
import android.os.Handler;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.text.format.Formatter;
diff --git a/src/com/android/storagemanager/deletionhelper/StorageManagerUpsellDialog.java b/src/com/android/storagemanager/deletionhelper/StorageManagerUpsellDialog.java
index af85277..00521a9 100644
--- a/src/com/android/storagemanager/deletionhelper/StorageManagerUpsellDialog.java
+++ b/src/com/android/storagemanager/deletionhelper/StorageManagerUpsellDialog.java
@@ -23,7 +23,7 @@
import android.content.SharedPreferences;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import android.text.format.Formatter;
import com.android.settingslib.Utils;
diff --git a/src/com/android/storagemanager/utils/PreferenceListCache.java b/src/com/android/storagemanager/utils/PreferenceListCache.java
index 3d552d5..05cedd5 100644
--- a/src/com/android/storagemanager/utils/PreferenceListCache.java
+++ b/src/com/android/storagemanager/utils/PreferenceListCache.java
@@ -16,8 +16,8 @@
package com.android.storagemanager.utils;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
import android.text.TextUtils;
import android.util.ArrayMap;
