Merge "Add strict_mode: false" into main
diff --git a/Android.bp b/Android.bp
index e5b91f4..5a2d23a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,37 +27,31 @@
required: ["privapp_whitelist_com.android.storagemanager"],
static_libs: [
- "androidx.legacy_legacy-preference-v14",
- "androidx.appcompat_appcompat",
- "androidx.preference_preference",
- "androidx.recyclerview_recyclerview",
+ "StorageManager-lib",
],
libs: ["keepanno-annotations"],
uses_libs: ["org.apache.http.legacy"],
- resource_dirs: ["res"],
-
- srcs: ["src/**/*.java"],
-}
-
-// The sources for StorageManager need to be exposed to StorageManagerGoogle.
-filegroup {
- name: "StorageManager_srcs",
- srcs: ["src/**/*.java"],
+ resource_dirs: [],
}
android_library {
- name: "StorageManager-res-lib",
+ name: "StorageManager-lib",
+ defaults: ["SettingsLibDefaults"],
+ platform_apis: true,
manifest: "AndroidManifest.xml",
static_libs: [
+ "androidx.legacy_legacy-preference-v14",
"androidx.appcompat_appcompat",
"androidx.preference_preference",
],
+ libs: ["keepanno-annotations"],
+
resource_dirs: [
"res",
],
@@ -65,4 +59,6 @@
aaptflags: [
"--auto-add-overlay",
],
+
+ srcs: ["src/**/*.java"],
}
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3867f59..769c2e1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/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">"Lagerstyring"</string>
+ <string name="app_name" msgid="963247385700831716">"Lageradministrator"</string>
<string name="cancel" msgid="7021218262867558825">"Annuller"</string>
<string name="storage_menu_free" msgid="1878247401436882778">"Frigør plads"</string>
<string name="deletion_helper_title" msgid="3526170325226275927">"Fjern elementer"</string>
@@ -39,7 +39,7 @@
<string name="deletion_helper_clear_dialog_message" msgid="5196490478187120700">"<xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g> indhold fjernes fra din enhed"</string>
<string name="deletion_helper_clear_dialog_remove" msgid="863575755467985516">"Frigør plads"</string>
<string name="deletion_helper_upsell_title" msgid="8512037674466762017">"Vil du administrere lagerplads automatisk?"</string>
- <string name="deletion_helper_upsell_summary" msgid="2301597713694474407">"Der er nu frigivet <xliff:g id="USED">%1$s</xliff:g>. Vil du automatisk lade Lagerstyring frigøre plads ved at fjerne sikkerhedskopieret indhold fra dine enheder?"</string>
+ <string name="deletion_helper_upsell_summary" msgid="2301597713694474407">"Der er nu frigivet <xliff:g id="USED">%1$s</xliff:g>. Vil du automatisk lade Lageradministrator frigøre plads ved at fjerne sikkerhedskopieret indhold fra dine enheder?"</string>
<string name="deletion_helper_upsell_cancel" msgid="7084167642850053889">"Nej tak"</string>
<string name="deletion_helper_upsell_activate" msgid="7157360257760895976">"Aktivér"</string>
<string name="deletion_helper_apps_group_title" msgid="2578309121350341258">"Sjældent brugte apps"</string>
@@ -51,7 +51,7 @@
<string name="automatic_storage_manager_service_label" msgid="648592272375278978">"Tjeneste til automatisk lagerstyring"</string>
<string name="automatic_storage_manager_notification_title" product="default" msgid="8480483265300964701">"Der er kun lidt plads på din telefon"</string>
<string name="automatic_storage_manager_notification_title" product="tablet" msgid="3150907918531844467">"Din tablet er ved at løbe tør for plads"</string>
- <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"Lad Lagerstyring frigøre plads ved automatisk at fjerne gamle billeder og videoer, når din telefon begynder at blive fuld igen."</string>
+ <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"Lad Lageradministrator frigøre plads ved automatisk at fjerne gamle billeder og videoer, når din telefon begynder at blive fuld igen."</string>
<string name="automatic_storage_manager_cancel_button" msgid="1826365037494962803">"Nej tak"</string>
<string name="automatic_storage_manager_activate_button" msgid="6257070263061898041">"Aktivér"</string>
<string name="deletion_helper_photos_loading_title" msgid="2768067991066779772">"Sikkerhedskopierede billeder og videoer"</string>
@@ -59,7 +59,7 @@
<string name="deletion_helper_no_threshold" msgid="6943179204098250444">"Vis alle elementer"</string>
<string name="deletion_helper_default_threshold" msgid="8410389370069021113">"Skjul seneste elementer"</string>
<string name="deletion_helper_clear_dialog_message_first_time" msgid="686530413183529901">"<xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g> indhold fjernes fra din enhed"</string>
- <string name="automatic_storage_manager_activation_warning" msgid="7657017408180001078">"Din lagerplads administreres nu af lageradministratoren"</string>
+ <string name="automatic_storage_manager_activation_warning" msgid="7657017408180001078">"Din lagerplads administreres nu af Lageradministrator"</string>
<string name="empty_state_title" msgid="4033285438176545309">"Ikke noget at fjerne"</string>
<string name="empty_state_review_items_link" msgid="8411186441239304545">"Gennemse seneste elementer"</string>
<string name="empty_state_summary" msgid="8439893007424243790">"Der er ikke nogen ældre filer at fjerne. Fjern nyere billeder, videoer og apps for at frigøre plads."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7a49c0e..fe34f22 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/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="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) -->
@@ -35,11 +35,11 @@
<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_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_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>
@@ -47,11 +47,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">"Απομένει λίγος χώρος στο tablet"</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-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 02c362e..9e8b037 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -40,7 +40,7 @@
<string name="deletion_helper_clear_dialog_remove" msgid="863575755467985516">"Libertar espaço"</string>
<string name="deletion_helper_upsell_title" msgid="8512037674466762017">"Quer gerir o armazenamento automaticamente?"</string>
<string name="deletion_helper_upsell_summary" msgid="2301597713694474407">"<xliff:g id="USED">%1$s</xliff:g> agora disponíveis. Permitir que o Gestor de armazenamento liberte espaço automaticamente ao remover conteúdos de cópias de segurança do dispositivo?"</string>
- <string name="deletion_helper_upsell_cancel" msgid="7084167642850053889">"Não, obrigado"</string>
+ <string name="deletion_helper_upsell_cancel" msgid="7084167642850053889">"Não"</string>
<string name="deletion_helper_upsell_activate" msgid="7157360257760895976">"Ativar"</string>
<string name="deletion_helper_apps_group_title" msgid="2578309121350341258">"Apps utilizadas raramente"</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">"O telemóvel tem pouco espaço livre"</string>
<string name="automatic_storage_manager_notification_title" product="tablet" msgid="3150907918531844467">"O seu tablet tem pouco espaço livre"</string>
<string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"Permitir que o Gestor de armazenamento liberte espaço automaticamente através da remoção de fotos e de vídeos antigos quando o telemóvel começar a ficar novamente cheio."</string>
- <string name="automatic_storage_manager_cancel_button" msgid="1826365037494962803">"Não, obrigado"</string>
+ <string name="automatic_storage_manager_cancel_button" msgid="1826365037494962803">"Não"</string>
<string name="automatic_storage_manager_activate_button" msgid="6257070263061898041">"Ativar"</string>
<string name="deletion_helper_photos_loading_title" msgid="2768067991066779772">"Fotos e vídeos com cópia de segurança"</string>
<string name="deletion_helper_photos_loading_summary" msgid="8203033249458245854">"A localizar itens…"</string>
diff --git a/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java b/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java
index c5de8c6..96598f1 100644
--- a/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java
+++ b/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroup.java
@@ -56,7 +56,7 @@
public CollapsibleCheckboxPreferenceGroup(Context context, AttributeSet attrs) {
super(context, attrs);
setLayoutResource(R.layout.deletion_preference);
- setWidgetLayoutResource(R.layout.preference_widget_checkbox);
+ setWidgetLayoutResource(androidx.preference.R.layout.preference_widget_checkbox);
}
@Override
diff --git a/src/com/android/storagemanager/deletionhelper/DeletionHelperActivity.java b/src/com/android/storagemanager/deletionhelper/DeletionHelperActivity.java
index 5255382..f56507e 100644
--- a/src/com/android/storagemanager/deletionhelper/DeletionHelperActivity.java
+++ b/src/com/android/storagemanager/deletionhelper/DeletionHelperActivity.java
@@ -149,15 +149,13 @@
public boolean onOptionsItemSelected(MenuItem item) {
FragmentManager manager = getFragmentManager();
int thresholdType;
- switch (item.getItemId()) {
- case R.id.no_threshold:
- thresholdType = AppStateUsageStatsBridge.NO_THRESHOLD;
- break;
- case R.id.default_threshold:
- thresholdType = AppStateUsageStatsBridge.NORMAL_THRESHOLD;
- break;
- default:
- return super.onOptionsItemSelected(item);
+ int itemId = item.getItemId();
+ if (itemId == R.id.no_threshold) {
+ thresholdType = AppStateUsageStatsBridge.NO_THRESHOLD;
+ } else if (itemId == R.id.default_threshold) {
+ thresholdType = AppStateUsageStatsBridge.NORMAL_THRESHOLD;
+ } else {
+ return super.onOptionsItemSelected(item);
}
mFragment = DeletionHelperSettings.newInstance(thresholdType);
@@ -208,4 +206,4 @@
return msg;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java b/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java
index 6f8fdd0..09353e3 100644
--- a/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java
+++ b/src/com/android/storagemanager/deletionhelper/NestedDeletionPreference.java
@@ -35,8 +35,8 @@
public NestedDeletionPreference(Context context) {
super(context);
- setLayoutResource(com.android.storagemanager.R.layout.preference_nested);
- setWidgetLayoutResource(com.android.storagemanager.R.layout.preference_widget_checkbox);
+ setLayoutResource(R.layout.preference_nested);
+ setWidgetLayoutResource(androidx.preference.R.layout.preference_widget_checkbox);
}
@Override
diff --git a/tests/unit/src/com/android/storagemanager/deletionhelper/PackageDeletionTaskTest.java b/tests/unit/src/com/android/storagemanager/deletionhelper/PackageDeletionTaskTest.java
index bd3938f..53cb7db 100644
--- a/tests/unit/src/com/android/storagemanager/deletionhelper/PackageDeletionTaskTest.java
+++ b/tests/unit/src/com/android/storagemanager/deletionhelper/PackageDeletionTaskTest.java
@@ -16,18 +16,18 @@
package com.android.storagemanager.deletionhelper;
-import android.test.AndroidTestCase;
import android.content.pm.IPackageDeleteObserver;
import android.content.pm.PackageManager;
import android.os.RemoteException;
+import android.test.AndroidTestCase;
import android.test.mock.MockPackageManager;
-import android.test.suitebuilder.annotation.SmallTest;
-import com.android.storagemanager.deletionhelper.PackageDeletionTask;
+import androidx.test.filters.SmallTest;
+
import com.android.storagemanager.deletionhelper.PackageDeletionTask.Callback;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
public class PackageDeletionTaskTest extends AndroidTestCase {
private FakePackageManager mPackageManager;
