Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73a61a80 authored by Stanley Wang's avatar Stanley Wang
Browse files

Update the Bubbles page. 

- Update the MainSwitch title.
- Add the TopIntroPreference to show the description.
- Use the IllustrationPreference to display the Lottie
  illustration.

Fix: 187418760
Test: robotest and see the UI
Change-Id: Ie5ce6ba7fbded065677e7e0697f3c525d97ee2d8
parent 84084e47

res/raw/lottie_bubbles.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

res/values/strings.xml

+4 −3
Original line number Diff line number Diff line
@@ -8859,7 +8859,10 @@ 








    <!-- 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>

















    <!-- 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]-->









    <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] -->








@@ -13334,8 +13337,6 @@







    <string name="adaptive_brightness_main_switch_title">Use adaptive brightness</string>









    <!-- Title for wifi calling main switch preferences. [CHAR LIMIT=50] -->









    <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] -->









    <string name="screen_saver_main_switch_title">Use screen saver</string>

































res/xml/bubble_notification_settings.xml



+10
−8






























Original line number
Diff line number
Diff line







@@ -16,18 +16,20 @@

















<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"









                  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">



















        <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









            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"/>



















        <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>