summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-bn/strings.xml22
-rw-r--r--res/values-gu/arrays.xml6
-rw-r--r--res/values-gu/strings.xml14
-rw-r--r--res/values-hi/arrays.xml2
-rw-r--r--res/values-hi/strings.xml10
-rw-r--r--res/values-ml/strings.xml2
-rw-r--r--res/values-mr/strings.xml6
-rw-r--r--res/values-pa/strings.xml2
-rw-r--r--res/values-ta/strings.xml10
-rw-r--r--res/values-uz/strings.xml2
-rw-r--r--robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java29
-rw-r--r--src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java36
12 files changed, 95 insertions, 46 deletions
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 0a8d552..586cf9f 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -16,9 +16,9 @@
<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="storage_menu_free" msgid="1878247401436882778">"স্টোরেজ খালি করুন"</string>
<string name="deletion_helper_title" msgid="7928959984891140427">"মুছে ফেলার জন্য আইটেমগুলি বাছুন"</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) -->
@@ -37,20 +37,20 @@
<skip />
<string name="deletion_helper_clear_dialog_message" msgid="4896104662649947320">"আপনার ডিভাইস থেকে <xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g> সরানো হবে"</string>
<string name="deletion_helper_clear_dialog_remove" msgid="3386502418767917932">"সরান"</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_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_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="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_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>
@@ -58,9 +58,9 @@
<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="386144597646356521">"আপনার ডিভাইস থেকে <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_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-gu/arrays.xml b/res/values-gu/arrays.xml
index 62b2775..4f7889c 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/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-gu/strings.xml b/res/values-gu/strings.xml
index c31e566..3cbadf7 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -26,8 +26,8 @@
<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>
+ <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>
@@ -39,7 +39,7 @@
<string name="deletion_helper_clear_dialog_remove" msgid="3386502418767917932">"દૂર કરો"</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_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) -->
@@ -50,10 +50,10 @@
<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_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_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>
@@ -61,6 +61,6 @@
<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="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-hi/arrays.xml b/res/values-hi/arrays.xml
index 3a0a193..36d37c2 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -19,6 +19,6 @@
<string-array name="automatic_storage_management_days">
<item msgid="4262697175462957945">"30 दिन से अधिक पुराने"</item>
<item msgid="2920779420892632946">"60 दिन से अधिक पुराने"</item>
- <item msgid="1402081670011072896">"90 दिन से अधिक पुराने"</item>
+ <item msgid="1402081670011072896">"90 दिन से ज़्यादा पुराने"</item>
</string-array>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index cdeda23..560990c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -18,7 +18,7 @@
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="storage_menu_free" msgid="1878247401436882778">"जगह खाली करें"</string>
<string name="deletion_helper_title" msgid="7928959984891140427">"निकालने के आइटम चुनें"</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) -->
@@ -38,7 +38,7 @@
<string name="deletion_helper_clear_dialog_message" msgid="4896104662649947320">"आपके डिवाइस से <xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g> जगह निकाल दी जाएगी"</string>
<string name="deletion_helper_clear_dialog_remove" msgid="3386502418767917932">"निकालें"</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>
@@ -46,11 +46,11 @@
<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="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_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>
@@ -61,6 +61,6 @@
<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="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-ml/strings.xml b/res/values-ml/strings.xml
index 57785f6..690d817 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -44,7 +44,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-mr/strings.xml b/res/values-mr/strings.xml
index 0c0435d..28875f0 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -38,8 +38,8 @@
<string name="deletion_helper_clear_dialog_message" msgid="4896104662649947320">"आपल्या डिव्हाइसमधून <xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g> काढले जाईल"</string>
<string name="deletion_helper_clear_dialog_remove" msgid="3386502418767917932">"काढा"</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_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) -->
@@ -51,7 +51,7 @@
<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_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>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index ca8977f..ca5e4c7 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -50,7 +50,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>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 825f19d..7b6e1cc 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -55,12 +55,12 @@
<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_no_threshold" msgid="6943179204098250444">"எல்லாம் காட்டு"</string>
+ <string name="deletion_helper_default_threshold" msgid="8410389370069021113">"சமீபத்தியவற்றை மறை"</string>
<string name="deletion_helper_clear_dialog_message_first_time" msgid="386144597646356521">"சாதனத்திலிருந்து <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="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-uz/strings.xml b/res/values-uz/strings.xml
index 52bc0f4..07b81d4 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -25,7 +25,7 @@
<skip />
<string name="deletion_helper_app_summary_never_used" msgid="2695210890063792461">"O‘tgan yili ishlatilmagan"</string>
<string name="deletion_helper_app_summary_unknown_used" msgid="8576377054665785558">"Oxirgi marta qachon ishlatilgani noaniq"</string>
- <string name="deletion_helper_free_button" msgid="1760529213407548661">"<xliff:g id="FREEABLE">%1$s</xliff:g> joy bo‘shatish"</string>
+ <string name="deletion_helper_free_button" msgid="1760529213407548661">"<xliff:g id="FREEABLE">%1$s</xliff:g> bo‘shatish"</string>
<string name="deletion_helper_photos_title" msgid="2602723121486729972">"Surat va videolarning zaxira nusxalari"</string>
<string name="deletion_helper_photos_age_summary" msgid="1820871709448371984">"30 kundan oldingi"</string>
<!-- no translation found for deletion_helper_photos_summary (3194825464552700889) -->
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java b/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java
index b2b81b6..388f8b8 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/DeletionHelperSettingsTest.java
@@ -23,7 +23,9 @@ import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -31,6 +33,7 @@ import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.storage.StorageManager;
+import android.support.v7.preference.PreferenceScreen;
import com.android.storagemanager.testing.StorageManagerRobolectricTestRunner;
import com.android.storagemanager.testing.TestingConstants;
@@ -74,4 +77,30 @@ public class DeletionHelperSettingsTest {
assertThat(DeletionHelperSettings.getGaugeString(mContext, intent, PACKAGE_NAME))
.isNotNull();
}
+
+ @Test
+ public void downloadsNotDeletedInNoThresholdMode() throws Exception {
+ DeletionHelperSettings settings =
+ spy(DeletionHelperSettings.newInstance(AppsAsyncLoader.NO_THRESHOLD));
+ PreferenceScreen preferenceScreen = mock(PreferenceScreen.class);
+ doReturn(preferenceScreen).when(settings).getPreferenceScreen();
+ DownloadsDeletionType downloadsDeletionType = mock(DownloadsDeletionType.class);
+ settings.setDownloadsDeletionType(downloadsDeletionType);
+
+ settings.setupEmptyState();
+ settings.clearData();
+
+ verify(downloadsDeletionType, never()).clearFreeableData(any());
+ }
+
+ @Test
+ public void onFreeableChangeChecksForNull() throws Exception {
+ DeletionHelperSettings settings =
+ DeletionHelperSettings.newInstance(AppsAsyncLoader.NO_THRESHOLD);
+ AppDeletionType appBackend = mock(AppDeletionType.class);
+ when(appBackend.isEmpty()).thenReturn(true);
+ settings.mAppBackend = appBackend;
+
+ settings.onFreeableChanged(0, 0L);
+ }
}
diff --git a/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java b/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java
index fca2380..1a63b17 100644
--- a/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java
+++ b/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java
@@ -23,6 +23,7 @@ import android.content.Intent;
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;
@@ -66,7 +67,7 @@ public class DeletionHelperSettings extends PreferenceFragment
private List<DeletionType> mDeletableContentList;
private AppDeletionPreferenceGroup mApps;
- private AppDeletionType mAppBackend;
+ @VisibleForTesting AppDeletionType mAppBackend;
private DownloadsDeletionPreferenceGroup mDownloadsPreference;
private DownloadsDeletionType mDownloadsDeletion;
private PhotosDeletionPreference mPhotoPreference;
@@ -189,11 +190,19 @@ public class DeletionHelperSettings extends PreferenceFragment
updateFreeButtonText();
}
- private void setupEmptyState() {
- mDownloadsPreference.setChecked(false);
+ @VisibleForTesting
+ void setupEmptyState() {
final PreferenceScreen screen = getPreferenceScreen();
- screen.removePreference(mDownloadsPreference);
+ if (mDownloadsPreference != null) {
+ mDownloadsPreference.setChecked(false);
+ screen.removePreference(mDownloadsPreference);
+ }
screen.removePreference(mApps);
+
+ // Nulling out the downloads preferences means we won't accidentally delete what isn't
+ // visible.
+ mDownloadsDeletion = null;
+ mDownloadsPreference = null;
}
private boolean isEmptyState() {
@@ -237,13 +246,17 @@ public class DeletionHelperSettings extends PreferenceFragment
@Override
public void onFreeableChanged(int numItems, long bytesFreeable) {
if (numItems > 0 || bytesFreeable > 0 || allTypesEmpty()) {
- mLoadingController.onCategoryLoad();
+ if (mLoadingController != null) {
+ mLoadingController.onCategoryLoad();
+ }
}
// bytesFreeable is the number of bytes freed by a single deletion type. If it is non-zero,
// there is stuff to free and we can enable it. If it is zero, though, we still need to get
// getTotalFreeableSpace to check all deletion types.
- mFree.setEnabled(bytesFreeable != 0 || getTotalFreeableSpace(COUNT_CHECKED_ONLY) != 0);
+ if (mFree != null) {
+ mFree.setEnabled(bytesFreeable != 0 || getTotalFreeableSpace(COUNT_CHECKED_ONLY) != 0);
+ }
updateFreeButtonText();
// Transition to empty state if all types have reported there is nothing to delete. Skip
@@ -255,7 +268,7 @@ public class DeletionHelperSettings extends PreferenceFragment
private boolean allTypesEmpty() {
return mAppBackend.isEmpty()
- && mDownloadsDeletion.isEmpty()
+ && (mDownloadsDeletion == null || mDownloadsDeletion.isEmpty())
&& (mPhotoVideoDeletion == null || mPhotoVideoDeletion.isEmpty());
}
@@ -277,7 +290,9 @@ public class DeletionHelperSettings extends PreferenceFragment
if (mDownloadsPreference != null) {
mDownloadsDeletion.clearFreeableData(getActivity());
}
- mAppBackend.clearFreeableData(getActivity());
+ if (mAppBackend != null) {
+ mAppBackend.clearFreeableData(getActivity());
+ }
}
@Override
@@ -323,6 +338,11 @@ public class DeletionHelperSettings extends PreferenceFragment
return view;
}
+ @VisibleForTesting
+ void setDownloadsDeletionType(DownloadsDeletionType downloadsDeletion) {
+ mDownloadsDeletion = downloadsDeletion;
+ }
+
private void initializeButtons() {
ButtonBarProvider activity = (ButtonBarProvider) getActivity();
activity.getButtonBar().setVisibility(View.VISIBLE);
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-07 12:53:34 +0000