Added strings for PAS update.
Test: manual
Bug: 321806709
Fixes: 321806709
Change-Id: Ieb44267664f8730a8b5d5c8b30cc73855e21bcb8
diff --git a/adservices/apk/java/com/android/adservices/ui/OTAResourcesManager.java b/adservices/apk/java/com/android/adservices/ui/OTAResourcesManager.java
index d94a3ad..f81d38b 100644
--- a/adservices/apk/java/com/android/adservices/ui/OTAResourcesManager.java
+++ b/adservices/apk/java/com/android/adservices/ui/OTAResourcesManager.java
@@ -59,7 +59,7 @@
@RequiresApi(Build.VERSION_CODES.S)
public class OTAResourcesManager {
// this value needs to be updated if bundled resources are updated
- private static final long BUNDLED_RESOURCES_VERSION = 0;
+ private static final long BUNDLED_RESOURCES_VERSION = 2092;
private static final long NO_OTA_RESOURCES_VERSION = -1;
private static final String FILE_GROUP_NAME = "ui-ota-strings";
private static final String DOWNLOADED_OTA_FILE_ID = "resources.arsc";
diff --git a/adservices/apk/publicres/values/public.xml b/adservices/apk/publicres/values/public.xml
index be93746..084ea7a 100644
--- a/adservices/apk/publicres/values/public.xml
+++ b/adservices/apk/publicres/values/public.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2023 The Android Open Source Project
+<!-- Copyright (C) 2024 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.
@@ -748,4 +748,48 @@
<public type="string" name="settingsUI_dialog_acknowledge" id="0x7f017d25" />
<public type="string" name="permlab_adServicesAccessAdServicesCobaltUpload" id="0x7f017d23" />
<public type="string" name="permdesc_adServicesAccessAdServicesCobaltUpload" id="0x7f017d22" />
-</resources>
+ <public type="string" name="app_name" id="0x7f017d21" />
+ <public type="string" name="permlab_updateAdservicesAdId" id="0x7f017d20" />
+ <public type="string" name="permdesc_updateAdservicesAdId" id="0x7f017d1f" />
+ <public type="string" name="notificationUI_pas_notification_title" id="0x7f017d1e" />
+ <public type="string" name="notificationUI_pas_notification_content" id="0x7f017d1d" />
+ <public type="string" name="notificationUI_pas_re_notification_title" id="0x7f017d1c" />
+ <public type="string" name="notificationUI_pas_re_notification_content" id="0x7f017d1b" />
+ <public type="string" name="notificationUI_pas_header_title" id="0x7f017d1a" />
+ <public type="string" name="notificationUI_pas_body_main" id="0x7f017d19" />
+ <public type="string" name="notificationUI_pas_subtitle1" id="0x7f017d18" />
+ <public type="string" name="notificationUI_pas_body1" id="0x7f017d17" />
+ <public type="string" name="notificationUI_pas_expand_button_text1" id="0x7f017d16" />
+ <public type="string" name="notificationUI_pas_subtitle2" id="0x7f017d15" />
+ <public type="string" name="notificationUI_pas_body2" id="0x7f017d14" />
+ <public type="string" name="notificationUI_pas_expand_button_text2" id="0x7f017d13" />
+ <public type="string" name="notificationUI_pas_text3" id="0x7f017d12" />
+ <public type="string" name="notificationUI_pas_left_control_button_text" id="0x7f017d11" />
+ <public type="string" name="notificationUI_pas_right_control_button_text" id="0x7f017d10" />
+ <public type="string" name="notificationUI_pas_renotify_header_title" id="0x7f017d0f" />
+ <public type="string" name="notificationUI_pas_renotify_body_main" id="0x7f017d0e" />
+ <public type="string" name="notificationUI_pas_renotify_subtitle1" id="0x7f017d0d" />
+ <public type="string" name="notificationUI_pas_renotify_body1" id="0x7f017d0c" />
+ <public type="string" name="notificationUI_pas_renotify_expand_button_text1" id="0x7f017d0b" />
+ <public type="string" name="notificationUI_pas_renotify_subtitle2" id="0x7f017d0a" />
+ <public type="string" name="notificationUI_pas_renotify_body2" id="0x7f017d09" />
+ <public type="string" name="notificationUI_pas_renotify_expand_button_text2" id="0x7f017d08" />
+ <public type="string" name="notificationUI_pas_renotify_text3" id="0x7f017d07" />
+ <public type="string" name="notificationUI_pas_renotify_left_control_button_text" id="0x7f017d06" />
+ <public type="string" name="notificationUI_pas_renotify_right_control_button_text" id="0x7f017d05" />
+ <public type="string" name="notificationUI_pas_msmt_dropdown_subtitle1" id="0x7f017d04" />
+ <public type="string" name="notificationUI_pas_msmt_body1" id="0x7f017d03" />
+ <public type="string" name="notificationUI_pas_msmt_dropdown_subtitle2" id="0x7f017d02" />
+ <public type="string" name="notificationUI_pas_msmt_body2" id="0x7f017d01" />
+ <public type="string" name="notificationUI_pas_app_dropdown_subtitle1" id="0x7f017d00" />
+ <public type="string" name="notificationUI_pas_app_body1" id="0x7f017cff" />
+ <public type="string" name="notificationUI_pas_app_dropdown_subtitle2" id="0x7f017cfe" />
+ <public type="string" name="notificationUI_pas_app_body2" id="0x7f017cfd" />
+ <public type="string" name="notificationUI_pas_app_dropdown_subtitle3" id="0x7f017cfc" />
+ <public type="string" name="notificationUI_pas_app_body3" id="0x7f017cfb" />
+ <public type="string" name="notificationUI_pas_leanr_more_link" id="0x7f017cfa" />
+ <public type="string" name="settingsUI_pas_apps_view_body_text" id="0x7f017cf9" />
+ <public type="string" name="settingsUI_pas_apps_view_footer" id="0x7f017cf8" />
+ <public type="string" name="settingsUI_pas_msmt_view_footer" id="0x7f017cf7" />
+ <public type="string" name="settingsUI_pas_topics_view_footer" id="0x7f017cf6" />
+</resources>
\ No newline at end of file
diff --git a/adservices/apk/res/values/strings.xml b/adservices/apk/res/values/strings.xml
index ea21be1..b48d140 100644
--- a/adservices/apk/res/values/strings.xml
+++ b/adservices/apk/res/values/strings.xml
@@ -689,6 +689,104 @@
<string name="settingsUI_u18_main_view_measurement_info">Apps you use can ask Android for information to help them measure the performance of their ads. Android lets apps collect only limited types of data.</string>
<!--*****************************************************************************************-->
+ <!-- PAS Strings ****************************************************************************-->
+ <!--*****************************************************************************************-->
+
+ <!-- PAS Notification Card ******************************************************************-->
+ <!-- Text for the title of the PAS notification card in notification center. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_notification_title">New ad privacy features</string>
+ <!-- Text for the content of the PAS notification card in notification center. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_notification_content">Get more choice over the ads you see while helping to protect your identity</string>
+
+ <!-- PAS Re-Notification Card ***************************************************************-->
+ <!-- Text for the title of the PAS re-notification card in notification center. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_re_notification_title">Updates to your ad privacy features</string>
+ <!-- Text for the content of the PAS re-notification card in notification center. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_re_notification_content">Get more choice over the ads you see while helping to protect your identity</string>
+
+ <!-- PAS Notification Activity **************************************************************-->
+ <!-- Text for the title of the explainer for the PAS notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_header_title" translatable="false">@string/notificationUI_pas_notification_title</string>
+ <!-- Text for the body of the explainer for the PAS notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_body_main">Android is expanding ad privacy features to restrict what apps can learn about you when they show you personalized ads.</string>
+ <!-- Text for the subtitle of the explainer for subsection 1 of the PAS notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_subtitle1" translatable="false">@string/settingsUI_apps_ga_title</string>
+ <!-- Text for the body of the explainer for the PAS notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_body1">Apps and their advertising partners can use your activity across other apps on this device to personalize ads while still helping keep your identity private and secure.</string>
+ <!-- Text for the button that expands an explainer section for additional info on the current section. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_expand_button_text1">More about app-suggested ads</string>
+ <!-- Text for the subtitle of the explainer for subsection 2 of the PAS notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_subtitle2" translatable="false">@string/settingsUI_main_view_info_text8</string>
+ <!-- Text for the body of the explainer for the PAS notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_body2">Limited types of data are shared between apps to understand the performance of their ads, such as the time of day an ad was shown to you.</string>
+ <!-- Text for the button that expands an explainer section for additional info on the current section. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_expand_button_text2">More about ad measurement</string>
+ <!-- Text at the end of PAS notification activity explaining changes can be made in privacy settings. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_text3" translatable="false">@string/notificationUI_you_can_change_in_privacy_settings</string>
+ <!-- Text for button to open Privacy Sandbox Settings from confirmation activity. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_left_control_button_text" translatable="false">@string/notificationUI_confirmation_left_control_button_text</string>
+ <!-- Text for button to acknowledge and dismiss PAS notification activity. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_right_control_button_text" translatable="false">@string/notificationUI_right_control_button_text</string>
+
+ <!-- PAS Re-Notification Activity ***********************************************************-->
+ <!-- Text for the title of the explainer for the PAS re-notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_renotify_header_title" translatable="false">@string/notificationUI_pas_re_notification_title</string>
+ <!-- Text for the body of the explainer for the PAS re-notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_renotify_body_main" translatable="false">@string/notificationUI_pas_body_main</string>
+ <!-- Text for the subtitle of the explainer for subsection 1 of the PAS re-notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_renotify_subtitle1" translatable="false">@string/settingsUI_apps_ga_title</string>
+ <!-- Text for the body of the explainer for the PAS re-notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_renotify_body1" translatable="false">@string/notificationUI_pas_body1</string>
+ <!-- Text for the button that expands an explainer section for additional info on the current section. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_renotify_expand_button_text1" translatable="false">@string/notificationUI_pas_expand_button_text1</string>
+ <!-- Text for the subtitle of the explainer for subsection 2 of the PAS re-notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_renotify_subtitle2" translatable="false">@string/settingsUI_main_view_info_text8</string>
+ <!-- Text for the body of the explainer for the PAS re-notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_renotify_body2" translatable="false">@string/notificationUI_pas_body2</string>
+ <!-- Text for the button that expands an explainer section for additional info on the current section. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_renotify_expand_button_text2" translatable="false">@string/notificationUI_pas_expand_button_text2</string>
+ <!-- Text at the end of PAS re-notification activity explaining changes can be made in privacy settings. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_renotify_text3" translatable="false">@string/notificationUI_you_can_change_in_privacy_settings</string>
+ <!-- Text for button to open Privacy Sandbox Settings from confirmation activity. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_renotify_left_control_button_text" translatable="false">@string/notificationUI_confirmation_left_control_button_text</string>
+ <!-- Text for button to acknowledge and dismiss PAS re-notification activity. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_renotify_right_control_button_text" translatable="false">@string/notificationUI_right_control_button_text</string>
+
+ <!-- PAS Additional Info Dropdown Sections **************************************************-->
+ <!-- Text for the subtitle of the explainer for a subsection of the PAS notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_msmt_dropdown_subtitle1">What data is used?</string>
+ <!-- Text for the body of the current explainer section. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_msmt_body1">Apps you use can ask Android for information that helps them measure the performance of their ads. Android helps protect your privacy by limiting the information apps can share with one another.</string>
+ <!-- Text for the subtitle of the explainer for a subsection of the PAS notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_msmt_dropdown_subtitle2">How is my identity protected?</string>
+ <!-- Text for the body of the current explainer section. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_msmt_body2">Android uses multiple privacy measures such as aggregation and noising data to limit the information apps can share with one another and help protect your identity.\n\nAd measurement data is also deleted regularly from your device.</string>
+ <!-- Text for the subtitle of the explainer for a subsection of the PAS notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_app_dropdown_subtitle1" translatable="false">@string/notificationUI_pas_msmt_dropdown_subtitle1</string>
+ <!-- Text for the body of the current explainer section. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_app_body1">Your app activity can be used to suggest ads.</string>
+ <!-- Text for the subtitle of the explainer for a subsection of the PAS notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_app_dropdown_subtitle2">How do apps use this data?</string>
+ <!-- Text for the body of the current explainer section. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_app_body2">Apps can securely store this information so that it can only be used by their advertising partners to personalize ads on other apps. For example, if you regularly use cooking apps, you may see ads for grocery delivery services or related content in other apps.</string>
+ <!-- Text for the subtitle of the explainer for a subsection of the PAS notification landing page. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_app_dropdown_subtitle3">How can I manage this data?</string>
+ <!-- Text for the body of the current explainer section. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_app_body3">You can block specific apps from sharing your activity with advertising partners. You can reset or turn app-suggested ads off at any time in your privacy settings. Android also auto-deletes this data regularly.</string>
+ <!-- Link that takes user to additional info on ad privacy for Android. [CHAR LIMIT=NONE] -->
+ <string name="notificationUI_pas_leanr_more_link"><a href="https://support.google.com/android?p=ad_privacy">Learn more about how Android helps protect your privacy</a></string>
+
+ <!-- PAS Settings Activity ******************************************************************-->
+ <!-- Title for the PAS apps view. [CHAR LIMIT=NONE] -->
+ <string name="settingsUI_pas_apps_view_body_text">Apps and their advertising partners can use your activity across other apps on this device to personalize ads while still keeping information about you private and secure.\n\nFor example, if you regularly use cooking apps, you may see ads for grocery delivery services or related content in other apps.\n\nAndroid auto-deletes your activity regularly, but you can also block apps from sharing this information with their advertising partners.</string>
+ <!-- Text for the PAS footer explanation of apps/PAS API controls for ad privacy. [CHAR LIMIT=NONE] -->
+ <string name="settingsUI_pas_apps_view_footer">It’s common for apps and their advertising partners to remember things you’re interested in to personalize your experience. Apps can securely store this information so that it can only be used by their advertising partners to show ads on other apps.\n\nYou can block an app from sharing your activity data with advertising partners. Android also auto-deletes shared activity data regularly, so an app you use again might reappear on this list.\n\nWhether an ad you see is personalized can depend on many factors like this setting, the ad topics setting, your advertising ID settings, and whether the app you’re using personalized ads.\n\n<a href="https://support.google.com/android?p=ad_privacy">Learn more about app-suggested ads</a></string>
+ <!-- Text for the PAS footer explanation of measurement API controls for ad privacy. [CHAR LIMIT=NONE] -->
+ <string name="settingsUI_pas_msmt_view_footer">Android uses multiple privacy measures such as aggregation and noising data to limit the information apps can share with one another and help protect your identity.\n\nYour browser may have a similar setting. If ad measurement is on for both Android and your browser, a company may be able to measure the effectiveness of an ad between apps you use and sites you visit. Your browsing history is kept private on your device.\n\n<a href="https://support.google.com/android?p=ad_privacy">Learn more about ad measurement</a></string>
+ <!-- Text for the PAS footer explanation of measurement API controls for ad privacy. [CHAR LIMIT=NONE] -->
+ <string name="settingsUI_pas_topics_view_footer">Android notes topics of interest based on the apps you’ve used in the last few weeks.\n\nLater, an app you use can ask Android for your topics to personalize the ads you see. Android shares up to 3 topics while protecting your identity and information about your app usage.\n\nAndroid auto-deletes topics regularly. As you continue using apps, a topic might reappear on the list. Or you can block topics you don’t want Android to share with apps.\n\nWhether an ad you see is personalized can depend on many factors like this setting, the app-suggested ads setting, your advertising ID settings, and whether the app you’re using personalized ads.\n\n<a href="https://support.google.com/android?p=ad_privacy">Learn more about ad topics</a></string>
+
+ <!--*****************************************************************************************-->
<!-- Other Strings **************************************************************************-->
<!--*****************************************************************************************-->
