diff --git a/res/drawable/zen_calls_any.xml b/res/drawable/zen_calls_any.xml new file mode 100644 index 00000000000..546fd93395a --- /dev/null +++ b/res/drawable/zen_calls_any.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/zen_calls_contacts.xml b/res/drawable/zen_calls_contacts.xml new file mode 100644 index 00000000000..a4c064a76e5 --- /dev/null +++ b/res/drawable/zen_calls_contacts.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/zen_calls_none.xml b/res/drawable/zen_calls_none.xml new file mode 100644 index 00000000000..e89da49d7b6 --- /dev/null +++ b/res/drawable/zen_calls_none.xml @@ -0,0 +1,39 @@ + + + + + + + + + diff --git a/res/drawable/zen_calls_starred.xml b/res/drawable/zen_calls_starred.xml new file mode 100644 index 00000000000..25e9a6193eb --- /dev/null +++ b/res/drawable/zen_calls_starred.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/zen_messages_any.xml b/res/drawable/zen_messages_any.xml new file mode 100644 index 00000000000..edeaea2726c --- /dev/null +++ b/res/drawable/zen_messages_any.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + diff --git a/res/drawable/zen_messages_contacts.xml b/res/drawable/zen_messages_contacts.xml new file mode 100644 index 00000000000..8da80b94a0b --- /dev/null +++ b/res/drawable/zen_messages_contacts.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/zen_messages_none.xml b/res/drawable/zen_messages_none.xml new file mode 100644 index 00000000000..c72cc4f133c --- /dev/null +++ b/res/drawable/zen_messages_none.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/res/drawable/zen_messages_starred.xml b/res/drawable/zen_messages_starred.xml new file mode 100644 index 00000000000..75feb80d711 --- /dev/null +++ b/res/drawable/zen_messages_starred.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + diff --git a/res/layout/zen_mode_senders_image.xml b/res/layout/zen_mode_senders_image.xml new file mode 100644 index 00000000000..bc7cdae2627 --- /dev/null +++ b/res/layout/zen_mode_senders_image.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/res/xml/zen_mode_calls_settings.xml b/res/xml/zen_mode_calls_settings.xml index cbadc7d7ce4..0b44875a3ec 100644 --- a/res/xml/zen_mode_calls_settings.xml +++ b/res/xml/zen_mode_calls_settings.xml @@ -25,6 +25,11 @@ android:key="zen_mode_settings_category_calls" android:title="@string/zen_mode_calls_header" settings:allowDividerBelow="true"> + + + diff --git a/res/xml/zen_mode_messages_settings.xml b/res/xml/zen_mode_messages_settings.xml index c302b02b72e..31cad2a5347 100644 --- a/res/xml/zen_mode_messages_settings.xml +++ b/res/xml/zen_mode_messages_settings.xml @@ -23,6 +23,11 @@ + + + diff --git a/src/com/android/settings/notification/zen/ZenModeCallsSettings.java b/src/com/android/settings/notification/zen/ZenModeCallsSettings.java index 1b5412e0ec8..82d5cf62765 100644 --- a/src/com/android/settings/notification/zen/ZenModeCallsSettings.java +++ b/src/com/android/settings/notification/zen/ZenModeCallsSettings.java @@ -45,6 +45,8 @@ public class ZenModeCallsSettings extends ZenModeSettingsBase { List controllers = new ArrayList<>(); controllers.add(new ZenModePrioritySendersPreferenceController(context, "zen_mode_settings_category_calls", lifecycle, false)); + controllers.add(new ZenModeSendersImagePreferenceController(context, + "zen_mode_calls_image", lifecycle, false)); controllers.add(new ZenModeRepeatCallersPreferenceController(context, lifecycle, context.getResources().getInteger(com.android.internal.R.integer .config_zen_repeat_callers_threshold))); diff --git a/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java b/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java index d15a4aa428b..f8e4548f53f 100644 --- a/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java +++ b/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java @@ -44,6 +44,8 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase { private static List buildPreferenceControllers(Context context, Lifecycle lifecycle) { List controllers = new ArrayList<>(); + controllers.add(new ZenModeSendersImagePreferenceController(context, + "zen_mode_messages_image", lifecycle, true)); controllers.add(new ZenModePrioritySendersPreferenceController(context, "zen_mode_settings_category_messages", lifecycle, true)); controllers.add(new ZenModeBehaviorFooterPreferenceController( diff --git a/src/com/android/settings/notification/zen/ZenModeSendersImagePreferenceController.java b/src/com/android/settings/notification/zen/ZenModeSendersImagePreferenceController.java new file mode 100644 index 00000000000..e8cd40db63a --- /dev/null +++ b/src/com/android/settings/notification/zen/ZenModeSendersImagePreferenceController.java @@ -0,0 +1,108 @@ +/* + * 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. + */ + +package com.android.settings.notification.zen; + +import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_ANY; +import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS; +import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_STARRED; + +import android.content.Context; +import android.widget.ImageView; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + +import com.android.settings.R; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.widget.LayoutPreference; + +/** + * Common preference controller functionality shared by + * ZenModeCallsSettings and ZenModeMessagesSettings. + * + * Changes the image resource based on the selected senders allowed to bypass DND option for + * calls or messages. + */ +public class ZenModeSendersImagePreferenceController + extends AbstractZenModePreferenceController { + + private final boolean mIsMessages; // if this is false, then this preference is for calls + + private ImageView mImageView; + + public ZenModeSendersImagePreferenceController(Context context, String key, + Lifecycle lifecycle, boolean isMessages) { + super(context, key, lifecycle); + mIsMessages = isMessages; + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + LayoutPreference pref = (LayoutPreference) screen.findPreference(KEY); + mImageView = (ImageView) pref.findViewById(R.id.zen_mode_settings_senders_image); + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public String getPreferenceKey() { + return KEY; + } + + @Override + public void updateState(Preference preference) { + final int currSetting = getPrioritySenders(); + int newImageRes; + CharSequence newContentDescription = ""; + if (PRIORITY_SENDERS_ANY == currSetting) { + newImageRes = mIsMessages + ? R.drawable.zen_messages_any + : R.drawable.zen_calls_any; + newContentDescription = mContext.getString(R.string.zen_mode_from_anyone); + } else if (PRIORITY_SENDERS_CONTACTS == currSetting) { + newImageRes = mIsMessages + ? R.drawable.zen_messages_contacts + : R.drawable.zen_calls_contacts; + newContentDescription = mContext.getString(R.string.zen_mode_from_contacts); + } else if (PRIORITY_SENDERS_STARRED == currSetting) { + newImageRes = mIsMessages + ? R.drawable.zen_messages_starred + : R.drawable.zen_calls_starred; + newContentDescription = mContext.getString(R.string.zen_mode_from_starred); + } else { + newImageRes = mIsMessages + ? R.drawable.zen_messages_none + : R.drawable.zen_calls_none; + newContentDescription = mContext.getString(R.string.zen_mode_from_none); + } + + mImageView.setImageResource(newImageRes); + mImageView.setContentDescription(newContentDescription); + } + + private int getPrioritySenders() { + if (mIsMessages) { + return mBackend.getPriorityMessageSenders(); + } else { + return mBackend.getPriorityCallSenders(); + } + } +}