PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c am: d19ad8e565

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882

Change-Id: I5b99eced55bc34b20fbe32d8bec158ea7e44a8bf
This commit is contained in:
Stanley Wang
2021-06-07 08:19:46 +00:00
committed by Automerger Merge Worker
parent 32f59d1243 d19ad8e565
commit ab629099ed
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/raw/lottie_bubbles.json Normal file
View File

File diff suppressed because one or more lines are too long

7
res/values/strings.xml
View File

@@ -8862,7 +8862,10 @@
<!-- Bubble feature settings: Description for toggle when bubbles are turned on in notification settings [CHAR LIMIT=100] --> <!-- Bubble feature settings: Description for toggle when bubbles are turned on in notification settings [CHAR LIMIT=100] -->
<string name="notifications_bubble_setting_on_summary">On / Conversations can appear as floating icons</string> <string name="notifications_bubble_setting_on_summary">On / Conversations can appear as floating icons</string>
<!-- Bubble feature settings: Title of the toggle to turn bubbles on and off [CHAR LIMIT=100] -->
<string name="notifications_bubble_setting_title">Allow apps to show bubbles</string>
<!-- Bubble feature settings: Description shown with the toggle to turn bubbles on and off [CHAR LIMIT=NONE]-->
<string name="notifications_bubble_setting_description">Some conversations will appear as floating icons on top of other apps</string>
<!-- Bubble app settings: option allowing all conversations from an app to bubble if the app sends bubbles [CHAR LIMIT=60]--> <!-- Bubble app settings: option allowing all conversations from an app to bubble if the app sends bubbles [CHAR LIMIT=60]-->
<string name="bubble_app_setting_all">All conversations can bubble</string> <string name="bubble_app_setting_all">All conversations can bubble</string>
<!-- Bubble app settings: option allowing only user selected conversations from an app to bubble if the app sends bubbles [CHAR LIMIT=60] --> <!-- Bubble app settings: option allowing only user selected conversations from an app to bubble if the app sends bubbles [CHAR LIMIT=60] -->
@@ -13351,8 +13354,6 @@
<string name="adaptive_brightness_main_switch_title">Use adaptive brightness</string> <string name="adaptive_brightness_main_switch_title">Use adaptive brightness</string>
<!-- Title for wifi calling main switch preferences. [CHAR LIMIT=50] --> <!-- Title for wifi calling main switch preferences. [CHAR LIMIT=50] -->
<string name="wifi_calling_main_switch_title">Use Wi‑Fi calling</string> <string name="wifi_calling_main_switch_title">Use Wi‑Fi calling</string>
<!-- Title for Bubbles main switch preferences. [CHAR LIMIT=50] -->
<string name="bubbles_main_switch_title">Use Bubbles</string>
<!-- Title for Screen saver main switch preferences. [CHAR LIMIT=50] --> <!-- Title for Screen saver main switch preferences. [CHAR LIMIT=50] -->
<string name="screen_saver_main_switch_title">Use screen saver</string> <string name="screen_saver_main_switch_title">Use screen saver</string>

18
res/xml/bubble_notification_settings.xml
View File

@@ -16,18 +16,20 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/bubbles_app_toggle_title"> android:title="@string/bubbles_app_toggle_title">
<com.android.settingslib.widget.TopIntroPreference
android:key="notification_bubbles_desc"
android:title="@string/notifications_bubble_setting_description"/>
<com.android.settingslib.widget.IllustrationPreference
android:key="bubbles_illustration"
app:lottie_rawRes="@raw/lottie_bubbles"/>
<com.android.settingslib.widget.MainSwitchPreference <com.android.settingslib.widget.MainSwitchPreference
android:key="global_notification_bubbles" android:key="global_notification_bubbles"
android:title="@string/bubbles_main_switch_title" android:title="@string/notifications_bubble_setting_title"
settings:controller="com.android.settings.notification.BubbleNotificationPreferenceController"/> settings:controller="com.android.settings.notification.BubbleNotificationPreferenceController"/>
<com.android.settings.widget.VideoPreference
android:key="bubbles_illustration"
android:title="@string/summary_placeholder"
settings:animation="@raw/bubble_notification_animation"
settings:controller="com.android.settings.widget.VideoPreferenceController"
android:persistent="false" />
</PreferenceScreen> </PreferenceScreen>