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

Commit 4524c700 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Move bubble settings to their own page"

parents fe272952 4e48da99

AndroidManifest.xml

+12 −0
Original line number Diff line number Diff line
@@ -2454,6 +2454,18 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name="Settings$AppBubbleNotificationSettingsActivity"

            android:label="@string/bubbles_app_toggle_title"

            android:parentActivityName="Settings$NotificationAppListActivity">

            <intent-filter android:priority="1">

                <action android:name="android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.notification.AppBubbleNotificationSettings" />

        </activity>



        <activity

            android:name="Settings$SoundSettingsActivity"

            android:label="@string/sound_settings"

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -7791,9 +7791,9 @@ 
    <string name="notification_badging_title">Allow notification dots</string>









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









    <string name="notification_bubbles_title">Allow bubbles</string>









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









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









    <string name="notification_bubbles_summary">Allow apps to show some notifications as bubbles</string>









    <string name="notification_bubbles_summary">Quickly access app content from anywhere using floating shortcuts</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/app_bubble_notification_settings.xml
0 → 100644



+34
−0






























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









        <com.android.settingslib.widget.LayoutPreference









            android:key="pref_app_header"









            android:layout="@layout/settings_entity_header"/>



















        <com.android.settingslib.RestrictedSwitchPreference









            android:key="bubble_pref"









            android:title="@string/notification_bubbles_title"/>



















        <com.android.settingslib.widget.FooterPreference









            android:key="notification_bubbles_footer"









            android:title="@string/bubbles_feature_education"









            android:selectable="false" />



















</PreferenceScreen>
























res/xml/app_notification_settings.xml



+3
−4






























Original line number
Diff line number
Diff line







@@ -60,11 +60,10 @@







            settings:useAdditionalSummary="true"









            android:order="1001"









            settings:restrictedSwitchSummary="@string/enabled_by_admin" />









        <com.android.settingslib.RestrictedSwitchPreference









            android:key="bubble_pref"









        <Preference









            android:key="bubble_link_pref"









            android:title="@string/notification_bubbles_title"









            android:order="1002"









            settings:restrictedSwitchSummary="@string/enabled_by_admin" />









            android:order="1002" />









        <Preference









            android:key="app_link"









            android:order="1003"
































res/xml/bubble_notification_settings.xml
0 → 100644



+33
−0






























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









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