Merge Android 14 QPR2 to AOSP mainHEADmastermain

Bug: 319669529
Merged-In: Ife84097390baf384aa04c591e412e4fdf5014701
Change-Id: Iddd5b753595358f3b616f59756220ea705c1f53d

9 files changed, 33 insertions, 34 deletions

diff --git a/Android.bp b/Android.bp
index 3fa4ea5..e5b91f4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,10 +22,6 @@ android_app {
     platform_apis: true,
     certificate: "platform",
 
-    optimize: {
-        proguard_flags_files: ["proguard.cfg"],
-    },
-
     system_ext_specific: true,
     privileged: true,
     required: ["privapp_whitelist_com.android.storagemanager"],
@@ -37,6 +33,8 @@ android_app {
         "androidx.recyclerview_recyclerview",
     ],
 
+    libs: ["keepanno-annotations"],
+
     uses_libs: ["org.apache.http.legacy"],
 
     resource_dirs: ["res"],
@@ -44,11 +42,6 @@ android_app {
     srcs: ["src/**/*.java"],
 }
 
-filegroup {
-    name: "StorageManager_proguard_flags",
-    srcs: ["proguard.cfg"],
-}
-
 // The sources for StorageManager need to be exposed to StorageManagerGoogle.
 filegroup {
     name: "StorageManager_srcs",
diff --git a/proguard.cfg b/proguard.cfg
deleted file mode 100644
index 25f2c47..0000000
--- a/proguard.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
-
--keep class com.android.storagemanager.overlay.FeatureFactoryImpl
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 0a03557..254c1c6 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -26,7 +26,7 @@
     <string name="deletion_helper_app_summary_never_used" msgid="2695210890063792461">"Nije korišćeno u poslednjih godinu dana"</string>
     <string name="deletion_helper_app_summary_unknown_used" msgid="8576377054665785558">"Nije sigurno kada je poslednji put korišćena"</string>
     <string name="deletion_helper_free_button" msgid="1760529213407548661">"Oslobodite <xliff:g id="FREEABLE">%1$s</xliff:g>"</string>
-    <string name="deletion_helper_photos_title" msgid="2602723121486729972">"Rezervne kopije slika i video snimaka"</string>
+    <string name="deletion_helper_photos_title" msgid="2602723121486729972">"Rezervne kopije slika i videa"</string>
     <string name="deletion_helper_photos_age_summary" msgid="1820871709448371984">"Starije od 30 dana"</string>
     <!-- no translation found for deletion_helper_photos_summary (3194825464552700889) -->
     <skip />
@@ -51,10 +51,10 @@
     <string name="automatic_storage_manager_service_label" msgid="648592272375278978">"Usluga automatskog upravljanja memorijom"</string>
     <string name="automatic_storage_manager_notification_title" product="default" msgid="8480483265300964701">"Telefon ima malo memorijskog prostora"</string>
     <string name="automatic_storage_manager_notification_title" product="tablet" msgid="3150907918531844467">"Tablet ima malo memorijskog prostora"</string>
-    <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"Omogućite Menadžeru memorijskog prostora da oslobađa prostor automatskim uklanjanjem starih slika i video snimaka kada se memorijski prostor telefona značajno smanji."</string>
+    <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"Omogućite Menadžeru memorijskog prostora da oslobađa prostor automatskim uklanjanjem starih slika i videa kada se memorijski prostor telefona značajno smanji."</string>
     <string name="automatic_storage_manager_cancel_button" msgid="1826365037494962803">"Ne, hvala"</string>
     <string name="automatic_storage_manager_activate_button" msgid="6257070263061898041">"Uključi"</string>
-    <string name="deletion_helper_photos_loading_title" msgid="2768067991066779772">"Rezervne kopije slika i video snimaka"</string>
+    <string name="deletion_helper_photos_loading_title" msgid="2768067991066779772">"Rezervne kopije slika i videa"</string>
     <string name="deletion_helper_photos_loading_summary" msgid="8203033249458245854">"Pronalaze se stavke…"</string>
     <string name="deletion_helper_no_threshold" msgid="6943179204098250444">"Prikaži sve stavke"</string>
     <string name="deletion_helper_default_threshold" msgid="8410389370069021113">"Sakrij nedavne stavke"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 3f6be6a..efb8ebf 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -40,7 +40,7 @@
     <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_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) -->
@@ -52,7 +52,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-mk/strings.xml b/res/values-mk/strings.xml
index 90ff659..562e24f 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/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,9 +35,9 @@
     <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_cancel" msgid="7084167642850053889">"Не, фала"</string>
@@ -57,7 +57,7 @@
     <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_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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9d0ec6b..02c362e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -38,7 +38,7 @@
     <string name="deletion_helper_clear_dialog_title" msgid="9169670752655850967">"Libertar espaço"</string>
     <string name="deletion_helper_clear_dialog_message" msgid="5196490478187120700">"Será removido um total de <xliff:g id="CLEARABLE_BYTES">%1$s</xliff:g> de conteúdo do dispositivo."</string>
     <string name="deletion_helper_clear_dialog_remove" msgid="863575755467985516">"Libertar espaço"</string>
-    <string name="deletion_helper_upsell_title" msgid="8512037674466762017">"Pretende gerir o armazenamento automaticamente?"</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_activate" msgid="7157360257760895976">"Ativar"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e8f6134..014f198 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -26,7 +26,7 @@
     <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_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 />
@@ -51,10 +51,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_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>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 12c79c3..7466233 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -36,10 +36,10 @@
     <!-- 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>
+    <string name="deletion_helper_upsell_summary" msgid="2301597713694474407">"已釋放 <xliff:g id="USED">%1$s</xliff:g>。允許儲存空間管理員自動移除你裝置上的備份内容，以釋放儲存空間嗎？"</string>
     <string name="deletion_helper_upsell_cancel" msgid="7084167642850053889">"不用了，多謝"</string>
     <string name="deletion_helper_upsell_activate" msgid="7157360257760895976">"開啟"</string>
     <string name="deletion_helper_apps_group_title" msgid="2578309121350341258">"不常用的應用程式"</string>
@@ -51,15 +51,15 @@
     <string name="automatic_storage_manager_service_label" msgid="648592272375278978">"自動儲存空間管理服務"</string>
     <string name="automatic_storage_manager_notification_title" product="default" msgid="8480483265300964701">"手機的儲存空間不足"</string>
     <string name="automatic_storage_manager_notification_title" product="tablet" msgid="3150907918531844467">"平板電腦的儲存空間不足"</string>
-    <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"當您的手機儲存空間再次即將用盡時，允許儲存空間管理員自動移除備份相片和影片，以釋放儲存空間。"</string>
+    <string name="automatic_storage_manager_notification_summary" msgid="2267399886362245822">"當你的手機儲存空間再次即將用盡時，允許儲存空間管理員自動移除備份相片和影片，以釋放儲存空間。"</string>
     <string name="automatic_storage_manager_cancel_button" msgid="1826365037494962803">"不用了，多謝"</string>
     <string name="automatic_storage_manager_activate_button" msgid="6257070263061898041">"開啟"</string>
     <string name="deletion_helper_photos_loading_title" msgid="2768067991066779772">"已備份的相片和影片"</string>
     <string name="deletion_helper_photos_loading_summary" msgid="8203033249458245854">"正在尋找項目…"</string>
     <string name="deletion_helper_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="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>
diff --git a/src/com/android/storagemanager/overlay/FeatureFactory.java b/src/com/android/storagemanager/overlay/FeatureFactory.java
index 59eaa20..2f04be0 100644
--- a/src/com/android/storagemanager/overlay/FeatureFactory.java
+++ b/src/com/android/storagemanager/overlay/FeatureFactory.java
@@ -21,6 +21,9 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.storagemanager.R;
+import com.android.tools.r8.keepanno.annotations.KeepItemKind;
+import com.android.tools.r8.keepanno.annotations.KeepTarget;
+import com.android.tools.r8.keepanno.annotations.UsesReflection;
 
 /**
  * Abstract class for creating feature controllers. Allows OEM implementations to define their own
@@ -36,9 +39,17 @@ public abstract class FeatureFactory {
 
     /**
      * Returns a factory for creating feature controllers. Creates the factory if it does not
-     * already exist. Uses the value of {@link R.string#config_featureFactory} to instantiate
-     * a factory implementation.
+     * already exist. Uses the value of {@link R.string#config_featureFactory} to instantiate a
+     * factory implementation.
      */
+    @UsesReflection(
+            description = "This method instantiates subclasses of FeatureFactory via reflection.",
+            value = {
+                @KeepTarget(
+                        kind = KeepItemKind.CLASS_AND_MEMBERS,
+                        instanceOfClassConstantExclusive = FeatureFactory.class,
+                        methodName = "<init>")
+            })
     public static FeatureFactory getFactory(Context context) {
         if (sFactory != null) {
             return sFactory;