commit 703e6aa092fade09e6b3f9cf7218eb747626f305
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 25 00:08:30 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 25 00:08:30 2019 +0000
tree d0eb77a1681b619e3d38191add2071277a9a770b
parent 30859ac83269c1f6590aeb818b4e0e1eeaee991f
parent b7c8800cdc73439096eb095ad0f7a50df8f526f7

Merge "Add bubbles animation" into qt-dev

res/raw/bubbles.mp4

diff --git a/res/raw/bubbles.mp4 b/res/raw/bubbles.mp4
new file mode 100644
index 0000000..c68ea57
--- /dev/null
+++ b/res/raw/bubbles.mp4
Binary files differ

res/xml/bubble_notification_settings.xml

diff --git a/res/xml/bubble_notification_settings.xml b/res/xml/bubble_notification_settings.xml
index 20783fa..7fba125 100644
--- a/res/xml/bubble_notification_settings.xml
+++ b/res/xml/bubble_notification_settings.xml
@@ -18,6 +18,14 @@
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:title="@string/bubbles_app_toggle_title"
                   android:key="bubble_notification_settings">
+
+        <com.android.settings.widget.VideoPreference
+            android:key="bubbles_illustration"
+            android:title="@string/summary_placeholder"
+            settings:animation="@raw/bubbles"
+            settings:controller="com.android.settings.widget.VideoPreferenceController"
+            android:persistent="false" />
+
         <!-- Notification bubbles -->
         <SwitchPreference
             android:key="global_notification_bubbles"