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

Commit ca559b9f authored by Adnan's avatar Adnan
Browse files

Settings: Add heads up blacklist options. (2/2) 

Change-Id: I13d849b49bee6f516b591625c2ea2e69dff12885
parent 7e2e0074

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -1777,6 +1777,8 @@ 


        <activity android:name=".quicksettings.QuickSettingsTiles" />



        <activity android:name=".headsup.HeadsUpSettings" />



        <activity android:name=".cyanogenmod.AutoBrightnessSetup"

                android:excludeFromRecents="true"

                android:theme="@*android:style/Theme.Holo.Dialog.Alert" />

res/menu/headsup.xml

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 The CyanogenMod 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.

-->



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

    <item

        android:id="@+id/heads_up_dnd_add"

        android:title="@string/add_heads_up_dnd_package"

        android:icon="@drawable/ic_menu_add"

        android:showAsAction="ifRoom|withText" />

</menu>

res/values/cm_strings.xml

+5 −1
Original line number Diff line number Diff line
@@ -314,9 +314,13 @@ 


    <!-- Heads Up -->

    <string name="category_heads_up">Heads up</string>

    <string name="summary_heads_up">Pop-up notifications</string>

    <string name="title_heads_up_enabled">Enable heads up</string>

    <string name="add_heads_up_dnd_package">Add app to \'Do not disturb\'</string>

    <string name="add_heads_up_package">Add app</string>

    <string name="add_heads_up_dnd_summary">Don\'t show heads up in these applications</string>

    <string name="add_heads_up_blacklist_summary">Don\'t show heads up from these applications</string>

    <string name="heads_up_dnd_title">Do not disturb</string>

    <string name="heads_up_blacklist_title">Blacklist</string>



    <string name="title_tile_airplane">Airplane mode</string>

    <string name="title_tile_battery">Battery stats</string>

res/xml/heads_up_settings.xml

+14 −9
Original line number Diff line number Diff line
@@ -16,18 +16,23 @@ 
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">



    <PreferenceCategory

            android:title="@string/category_heads_up">



        <com.android.settings.cyanogenmod.SystemSettingCheckBoxPreference

                android:key="heads_up_enabled"

                android:title="@string/title_heads_up_enabled"

                android:defaultValue="false" />



            android:title="@string/heads_up_dnd_title"

            android:key="dnd_applications_list">

        <Preference

            android:key="add_dnd_packages"

            android:icon="@drawable/ic_menu_add"

            android:title="@string/add_heads_up_package"

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

    </PreferenceCategory>



    <PreferenceCategory

            android:key="applications_list"

            android:title="@string/heads_up_dnd_title" >

            android:title="@string/heads_up_blacklist_title"

            android:key="blacklist_applications">

        <Preference

            android:key="add_blacklist_packages"

            android:icon="@drawable/ic_menu_add"

            android:title="@string/add_heads_up_package"

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

    </PreferenceCategory>



</PreferenceScreen>
 
 No newline at end of file

res/xml/notification_drawer.xml

+5 −4
Original line number Diff line number Diff line
@@ -31,10 +31,11 @@ 
            android:fragment="com.android.settings.quicksettings.QuickSettings"

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



    <PreferenceScreen

            android:key="heads_up"

            android:fragment="com.android.settings.headsup.HeadsUpDoNotDisturbSettings"

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

    <com.android.settings.cyanogenmod.SystemSettingSwitchPreference

            android:key="heads_up_enabled"

            android:fragment="com.android.settings.headsup.HeadsUpSettings"

            android:title="@string/category_heads_up"

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



    <PreferenceCategory

        android:title="@string/category_quick_access" >