Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates main page for Do Not Disturb

Browse Source 
Settings > Sound > Do Not Disturb
- Update strings, more descriptive summary for DND Apps summary
- Move top-level ordering of preferences
- Remove old unused DND strings

Test: make RunSettingsRoboTests7
Test: make ROBOTEST_FILTER=ZenModeBypassingAppsPreferenceControllerTest RunSettingsRoboTests
Test: manual
Bug: 151845457
Merged-In: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
Change-Id: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
This commit is contained in:
Beverly
2020-03-18 14:14:38 -04:00
committed by Beverly Tai
parent 7430932305
commit 509273cc03
10 changed files with 511 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/notification/zen/ZenModePeoplePreferenceController.java
View File

@@ -16,25 +16,33 @@
package com.android.settings.notification.zen;
import static android.app.NotificationManager.Policy.CONVERSATION_SENDERS_ANYONE;
import static android.app.NotificationManager.Policy.CONVERSATION_SENDERS_NONE;
import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS;
import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_ANY;
import android.app.NotificationManager;
import android.content.Context;
import android.provider.Settings;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
/**
* Controls the summary for preference found at:
* Settings > Sound > Do Not Disturb > People
*/
public class ZenModePeoplePreferenceController extends
AbstractZenModePreferenceController implements PreferenceControllerMixin {
private final String KEY;
private final ZenModeSettings.SummaryBuilder mSummaryBuilder;
public ZenModePeoplePreferenceController(Context context, Lifecycle lifecycle, String key) {
super(context, key, lifecycle);
KEY = key;
mSummaryBuilder = new ZenModeSettings.SummaryBuilder(context);
}
@Override
@@ -60,8 +68,28 @@ public class ZenModePeoplePreferenceController extends
break;
default:
preference.setEnabled(true);
// TODO: How do all of the people options roll up into the summary?
//preference.setSummary(mSummaryBuilder.getMessagesSettingSummary(getPolicy()));
preference.setSummary(getPeopleSummary());
}
}
private String getPeopleSummary() {
final int callersAllowed = mBackend.getPriorityCallSenders();
final int messagesAllowed = mBackend.getPriorityMessageSenders();
final int conversationsAllowed = mBackend.getPriorityConversationSenders();
final boolean areRepeatCallersAllowed =
mBackend.isPriorityCategoryEnabled(PRIORITY_CATEGORY_REPEAT_CALLERS);
if (callersAllowed == PRIORITY_SENDERS_ANY
&& messagesAllowed == PRIORITY_SENDERS_ANY
&& conversationsAllowed == CONVERSATION_SENDERS_ANYONE) {
return mContext.getResources().getString(R.string.zen_mode_people_all);
} else if (callersAllowed == ZenModeBackend.SOURCE_NONE
&& messagesAllowed == ZenModeBackend.SOURCE_NONE
&& conversationsAllowed == CONVERSATION_SENDERS_NONE
&& !areRepeatCallersAllowed) {
return mContext.getResources().getString(R.string.zen_mode_people_none);
} else {
return mContext.getResources().getString(R.string.zen_mode_people_some);
}
}
}