Merge "Add signal strength icons to multi-SIM header" into qt-dev
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index bf22b88..04c8f8d 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.xml
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:theme="@style/SudThemeGlifV3.DayNight"
+ android:theme="@style/GlifV3Theme.Footer"
android:icon="@drawable/ic_delete_accent"
app:sucHeaderText="@string/master_clear_title">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 171fe42..2e505ab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7889,8 +7889,8 @@
<!-- Configure Notifications: section header for prioritizer settings [CHAR LIMIT=80] -->
<string name="smart_notifications_title">Adaptive notifications</string>
- <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
- <string name="asst_capability_prioritizer_title">Automatic Prioritization</string>
+ <!-- Configure Notifications: setting title [CHAR LIMIT=80 BACKUP_MESSAGE_ID=6691908606916292167] -->
+ <string name="asst_capability_prioritizer_title">Adaptive notification priority</string>
<!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->
<string name="asst_capability_prioritizer_summary">Automatically set lower priority notifications to Gentle</string>
@@ -10197,6 +10197,15 @@
<!-- Search keywords for System Navigation settings. [CHAR_LIMIT=NONE]-->
<string name="keywords_system_navigation">system navigation, 2 button navigation, 3 button navigation, gesture navigation</string>
+ <!-- Message for the alert dialog which says that the current default home app does not support gesture navigation. [CHAR LIMIT=NONE] -->
+ <string name="gesture_not_supported_dialog_message">Not supported by your default home app, <xliff:g id="default_home_app" example="Pixel Launcher">%s</xliff:g></string>
+
+ <!-- Positive button for the alert dialog when gesture nav not supported by launcher [CHAR LIMIT=40] -->
+ <string name="gesture_not_supported_positive_button">Switch default home app</string>
+
+ <!-- Content description for the Information icon [CHAR LIMIT=30] -->
+ <string name="information_label">Information</string>
+
<!-- Preference and settings suggestion title text for ambient display double tap (phone) [CHAR LIMIT=60]-->
<string name="ambient_display_title" product="default">Double-tap to check phone</string>
<!-- Preference and settings suggestion title text for ambient display double tap (tablet) [CHAR LIMIT=60]-->
@@ -11207,11 +11216,11 @@
<string name="forget_passpoint_dialog_message">You may lose access to any remaining time or data. Check with your provider before removing.</string>
<!-- Keywords for Content Capture feature [CHAR_LIMIT=none] -->
- <string name="keywords_content_capture">content capture, app content</string>
+ <string name="keywords_content_capture">content capture, app content, app data</string>
<!-- Title of the 'Content Capture' feature toggle in the Settings -> Privacy screen [CHAR LIMIT=none]-->
- <string name="content_capture">App content</string>
+ <string name="content_capture">Personalize using app data</string>
<!-- Description of the 'Content Capture' feature toggle in the Settings -> Privacy screen [CHAR LIMIT=NONE]-->
- <string name="content_capture_summary">Allow apps to send content to the Android system</string>
+ <string name="content_capture_summary">Allow apps to send content to the Android system. Tap to learn more.</string>
<!-- Title for the button to initiate a heap dump for the system server. [CHAR LIMIT=NONE] -->
<string name="capture_system_heap_dump_title">Capture system heap dump</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8316971..3eda345 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -126,6 +126,8 @@
<style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">
<item name="android:windowSoftInputMode">adjustResize</item>
+ <item name="android:clipToPadding">true</item>
+ <item name="android:clipChildren">true</item>
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Widget.ActionBar</item>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index add2fed..f7f1d16 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -112,6 +112,11 @@
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
</style>
+ <style name="GlifV3Theme.Footer" parent="@style/SudThemeGlifV3.DayNight">
+ <item name="android:clipChildren">true</item>
+ <item name="android:clipToPadding">true</item>
+ </style>
+
<style name="GlifV3Theme.Light" parent="SudThemeGlifV3.Light">
<!-- For all AndroidX Alert Dialogs -->
<item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog.Light</item>
@@ -209,4 +214,4 @@
<item name="colorAccent">@*android:color/accent_device_default_light</item>
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
</style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index c537f3f..a8a6075 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -522,6 +522,11 @@
android:title="@string/show_notification_channel_warnings"
android:summary="@string/show_notification_channel_warnings_summary" />
+ <SwitchPreference
+ android:key="asst_capability_prioritizer"
+ android:title="@string/asst_capability_prioritizer_title"
+ settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
+
<Preference
android:key="inactive_apps"
android:title="@string/inactive_apps_title"