PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Update onboarding" into pi-dev

Browse Source
This commit is contained in:
Julia Reynolds
2018-05-02 13:46:17 +00:00
committed by Android (Google) Code Review
parent a6d36c4e2e 16bafbbc74
commit d521588510
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -7365,9 +7365,9 @@
<!-- Do not disturb onboarding dialog, do not accept new settings [CHAR LIMIT=30]-->
<string name="zen_onboarding_no_update">Don\'t update</string>
<!-- Do not disturb onboarding dialog, description of new settings [CHAR LIMIT=NONE]-->
<string name="zen_onboarding_dnd_visual_disturbances_description">Your phone mutes sounds &amp; vibrations\n\nUpdate settings to also:\n\n- Hide notifications\n\n- Only show calls from starred contacts</string>
<string name="zen_onboarding_dnd_visual_disturbances_description">Your phone can do more to help you focus.\n\nUpdate settings to:\n\n- Hide notifications completely\n\n- Allow calls from starred contacts and repeat callers</string>
<!-- Do not disturb onboarding dialog, header prompt for settings [CHAR LIMIT=80]-->
<string name="zen_onboarding_dnd_visual_disturbances_header">Update your Do Not Disturb settings?</string>
<string name="zen_onboarding_dnd_visual_disturbances_header">Update Do Not Disturb?</string>
<!-- obsolete -->
<string name="zen_onboarding_settings">Settings</string>

13
src/com/android/settings/notification/ZenOnboardingActivity.java
View File

@@ -18,12 +18,10 @@ package com.android.settings.notification;
import android.app.Activity;
import android.app.NotificationManager;
import android.content.Intent;
import android.app.NotificationManager.Policy;
import android.os.Bundle;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.view.View;
import android.widget.CheckBox;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -67,12 +65,13 @@ public class ZenOnboardingActivity extends Activity {
public void save(View button) {
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
NotificationManager.Policy policy = mNm.getNotificationPolicy();
Policy policy = mNm.getNotificationPolicy();
NotificationManager.Policy newPolicy = new NotificationManager.Policy(
policy.priorityCategories, NotificationManager.Policy.PRIORITY_SENDERS_STARRED,
Policy newPolicy = new NotificationManager.Policy(
Policy.PRIORITY_CATEGORY_REPEAT_CALLERS | policy.priorityCategories,
Policy.PRIORITY_SENDERS_STARRED,
policy.priorityMessageSenders,
NotificationManager.Policy.getAllSuppressedVisualEffects());
Policy.getAllSuppressedVisualEffects());
mNm.setNotificationPolicy(newPolicy);
finishAndRemoveTask();

4
tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS;
import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS;
import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_ANY;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
@@ -94,7 +95,8 @@ public class ZenOnboardingActivityTest {
verify(mNm).setNotificationPolicy(captor.capture());
Policy actual = captor.getValue();
assertThat(actual.priorityCategories).isEqualTo(PRIORITY_CATEGORY_ALARMS);
assertThat(actual.priorityCategories).isEqualTo(PRIORITY_CATEGORY_ALARMS
| PRIORITY_CATEGORY_REPEAT_CALLERS);
assertThat(actual.priorityCallSenders).isEqualTo(Policy.PRIORITY_SENDERS_STARRED);
assertThat(actual.priorityMessageSenders).isEqualTo(Policy.PRIORITY_SENDERS_ANY);
assertThat(actual.suppressedVisualEffects).isEqualTo(