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

Commit 2cabe878 authored by Matías Hernández's avatar Matías Hernández Committed by Android (Google) Code Review
Browse files

Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev

parents 40cf9a21 0882b04e

res/layout/zen_mode_senders_overlay_image.xml

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

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

-->

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

                android:layout_width="match_parent"

                android:layout_height="wrap_content">

    <RelativeLayout android:id="@+id/zen_mode_settings_senders_overlay_view"

                    android:layout_centerInParent="true"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="@dimen/zen_conversations_image_margin_vertical"

                    android:layout_marginBottom="@dimen/zen_conversations_image_margin_vertical">

    </RelativeLayout>

</RelativeLayout>

res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ 
    <dimen name="conversation_icon_size">32dp</dimen>



    <dimen name="zen_mode_settings_button_margin_vertical">24dp</dimen>

    <dimen name="zen_conversations_image_margin_vertical">24dp</dimen>

    <dimen name="zen_conversations_icon_offset">32dp</dimen>

    <dimen name="zen_conversations_icon_size">50dp</dimen>

    <dimen name="zen_schedule_rule_checkbox_padding">7dp</dimen>

    <dimen name="zen_schedule_day_margin">17dp</dimen>

res/values/strings.xml

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








    <!-- [CHAR LIMIT=120] Zen mode settings: Title for conversations settings page -->









    <string name="zen_mode_conversations_title">Conversations</string>









    <!-- [CHAR LIMIT=120] Zen mode settings: Header for conversations settings page -->









    <string name="zen_mode_conversations_section_title">Conversations that can interrupt</string>









    <string name="zen_mode_from_all_conversations">All conversations</string>









    <string name="zen_mode_from_important_conversations">Priority conversations</string>









    <!-- [CHAR LIMIT=40] Version of the above for "priority conversations" when it is a non-first member of a list -->

























res/xml/zen_mode_conversations_settings.xml
deleted100644 → 0



+0
−31






























Original line number
Diff line number
Diff line









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









<!-- Copyright (C) 2020 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"









    android:key="zen_mode_conversations_settings"









    android:title="@string/zen_mode_conversations_title">









    <!-- Conversations -->









    <PreferenceCategory









        android:key="zen_mode_conversations_radio_buttons"









        android:title="@string/zen_mode_conversations_section_title">



















        <!-- Senders image -->









        <com.android.settingslib.widget.LayoutPreference









            android:key="zen_mode_conversations_image"









            android:layout="@layout/zen_mode_senders_overlay_image"









            android:selectable="false"/>









    </PreferenceCategory>









</PreferenceScreen>








 No newline at end of file
























src/com/android/settings/notification/zen/ZenModeBackend.java



+0
−15






























Original line number
Diff line number
Diff line







@@ -312,21 +312,6 @@ public class ZenModeBackend {







        return R.string.zen_mode_from_no_conversations;









    }



















    protected int getConversationSummary() {









        int conversationType = getPriorityConversationSenders();



















        switch (conversationType) {









            case NotificationManager.Policy.CONVERSATION_SENDERS_ANYONE:









                return R.string.zen_mode_from_all_conversations;









            case NotificationManager.Policy.CONVERSATION_SENDERS_IMPORTANT:









                return R.string.zen_mode_from_important_conversations;









            case NotificationManager.Policy.CONVERSATION_SENDERS_NONE:









                return R.string.zen_mode_from_no_conversations;









            default:









                return R.string.zen_mode_from_no_conversations;









        }









    }



















    protected int getContactsCallsSummary(ZenPolicy policy) {









        int peopleType = policy.getPriorityCallSenders();









        switch (peopleType) {