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

Commit 34fa757c authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev 

am: 240b227e

Change-Id: I899722a6df929c4093a5a74447eb25a610c80308
parents 3a6d75d7 240b227e

res/raw/bubbles.mp4

deleted100644 → 0
−654 KiB

File deleted.

View file

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -7891,8 +7891,8 @@ 














    <!-- Configure Notifications: Title for the notification bubbles option. [CHAR LIMIT=60] -->















    <string name="notification_bubbles_title">Bubbles</string>













    <!-- Configure Notifications: Summary for the notification bubbles option. [CHAR LIMIT=NONE] -->













    <string name="notification_bubbles_summary">Quickly access app content from anywhere using floating shortcuts</string>













    <!-- Developer setting summary for bubbles [CHAR LIMIT=NONE] -->













    <string name="notification_bubbles_developer_setting_summary">Some notifications can appear as bubbles on the screen</string>















    <!-- Feature education for bubbles. [CHAR LIMIT=NONE] -->















    <string name="bubbles_feature_education">Some notifications and other content can appear as bubbles on the screen. To open a bubble, tap it. To dismiss it, drag it down the screen.</string>















    <!-- Title for the toggle shown on the app-level bubbles page  [CHAR LIMIT=60] -->

























res/xml/bubble_notification_settings.xml
deleted100644 → 0



+0
−41




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!-- Copyright (C) 2019 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.













     You may obtain a copy of the License at



























          http://www.apache.org/licenses/LICENSE-2.0



























     Unless required by applicable law or agreed to in writing, software













     distributed under the License is distributed on an "AS IS" BASIS,













     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













     See the License for the specific language governing permissions and













     limitations under the License.













-->



























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













                  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"













            android:title="@string/notification_bubbles_title"













            android:summary="@string/notification_bubbles_summary"













            settings:controller="com.android.settings.notification.BubbleNotificationPreferenceController"/>



























        <com.android.settingslib.widget.FooterPreference













            android:key="notification_bubbles_footer"













            android:title="@string/bubbles_feature_education"













            android:selectable="false" />



























</PreferenceScreen>
























res/xml/configure_notification_settings.xml



+0
−7




























Original line number
Diff line number
Diff line








@@ -74,13 +74,6 @@













            android:title="@string/notification_badging_title"















            settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>





























        <!-- Notification bubbles -->













        <Preference













            android:key="notification_bubbles"













            android:title="@string/notification_bubbles_title"













            settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"













            android:fragment="com.android.settings.notification.BubbleNotificationSettings"/>





























        <!-- Pulse notification light -->















        <SwitchPreference















            android:key="notification_pulse"

































res/xml/development_settings.xml



+6
−0




























Original line number
Diff line number
Diff line








@@ -560,6 +560,12 @@













            android:key="device_identifier_access_restrictions"















            android:title="@string/device_identifier_access_restrictions_title"















            android:summary="@string/device_identifier_access_restrictions_summary" />



























        <SwitchPreference













            android:key="notification_bubbles"













            android:title="@string/notification_bubbles_title"













            android:summary="@string/notification_bubbles_developer_setting_summary"/>





























    </PreferenceCategory>































    <com.android.settings.development.autofill.AutofillPreferenceCategory