diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1a0c3a1fd73..5a2e01a8163 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -742,12 +742,30 @@
android:exported="true"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 35b7c3d486a..34cac8a6272 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7325,6 +7325,16 @@
- %d rules can turn on automatically
+ Ok
+ Settings
+ You can further customize this in Settings.
+ Block when the screen is on
+ Block when the screen is off
+ Do Not Disturb can do more than block unwanted sounds - it can block visuals too. This may be helpful if you\'re trying to sleep, focus, or limit time spent on your phone.
+ Block sounds and visuals
+ Don\'t turn on the screen or show notifications in the ambient display
+ Don\'t show notifications at all, except for basic phone activity and status
+
Work profile sounds
diff --git a/src/com/android/settings/notification/ZenOnboardingActivity.java b/src/com/android/settings/notification/ZenOnboardingActivity.java
new file mode 100644
index 00000000000..b38bad67af3
--- /dev/null
+++ b/src/com/android/settings/notification/ZenOnboardingActivity.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2018 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;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Intent;
+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;
+import com.android.settings.R;
+
+public class ZenOnboardingActivity extends Activity {
+
+ private NotificationManager mNm;
+ private MetricsLogger mMetrics;
+ CheckBox mScreenOn;
+ CheckBox mScreenOff;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setNotificationManager(getSystemService(NotificationManager.class));
+ setMetricsLogger(new MetricsLogger());
+
+ setupUI();
+ }
+
+ @VisibleForTesting
+ protected void setupUI() {
+ setContentView(R.layout.zen_onboarding);
+ mScreenOn = findViewById(R.id.screen_on_option);
+ mScreenOff = findViewById(R.id.screen_off_option);
+ mScreenOn.setChecked(true);
+ mScreenOff.setChecked(true);
+
+ mMetrics.visible(MetricsEvent.SETTINGS_ZEN_ONBOARDING);
+ }
+
+ @VisibleForTesting
+ protected void setNotificationManager(NotificationManager nm) {
+ mNm = nm;
+ }
+
+ @VisibleForTesting
+ protected void setMetricsLogger(MetricsLogger ml) {
+ mMetrics = ml;
+ }
+
+ public void logClick(View view) {
+ CheckBox checkbox = (CheckBox) view;
+ switch (checkbox.getId()) {
+ case R.id.screen_on_option:
+ mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_ON, checkbox.isChecked());
+ break;
+ case R.id.screen_off_option:
+ mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_OFF,
+ checkbox.isChecked());
+ break;
+ }
+ }
+
+ public void launchSettings(View button) {
+ mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SETTINGS);
+ Intent settings = new Intent(Settings.ZEN_MODE_BLOCKED_EFFECTS_SETTINGS);
+ settings.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ startActivity(settings);
+ }
+
+ public void save(View button) {
+ mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
+ NotificationManager.Policy policy = mNm.getNotificationPolicy();
+ int currentEffects = policy.suppressedVisualEffects;
+
+ currentEffects = NotificationManager.Policy.toggleScreenOnEffectsSuppressed(
+ currentEffects, mScreenOn != null && mScreenOn.isChecked());
+ currentEffects = NotificationManager.Policy.toggleScreenOffEffectsSuppressed(
+ currentEffects, mScreenOff != null && mScreenOff.isChecked());
+
+ NotificationManager.Policy newPolicy = new NotificationManager.Policy(
+ policy.priorityCategories, policy.priorityCallSenders,
+ policy.priorityMessageSenders, currentEffects);
+ mNm.setNotificationPolicy(newPolicy);
+
+ finishAndRemoveTask();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
new file mode 100644
index 00000000000..3fd2239173b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2018 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;
+
+import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS;
+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;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.app.NotificationManager.Policy;
+import android.content.Context;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ZenOnboardingActivityTest {
+
+ @Mock
+ MetricsLogger mMetricsLogger;
+ @Mock
+ NotificationManager mNm;
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private Context mContext;
+
+ ZenOnboardingActivity mActivity;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mActivity = Robolectric.buildActivity(ZenOnboardingActivity.class)
+ .create()
+ .get();
+ mActivity.setNotificationManager(mNm);
+ mActivity.setMetricsLogger(mMetricsLogger);
+
+ mActivity.setupUI();
+ }
+
+ @Test
+ public void loadUiRecordsEvent() {
+ verify(mMetricsLogger).visible(MetricsEvent.SETTINGS_ZEN_ONBOARDING);
+ }
+
+ @Test
+ public void toggleCheckBoxRecordsEvents_screenOn() {
+ mActivity.findViewById(R.id.screen_on_option).performClick();
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_ON, false);
+
+ mActivity.findViewById(R.id.screen_on_option).performClick();
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_ON, true);
+ }
+
+ @Test
+ public void toggleCheckBoxRecordsEvents_screenOff() {
+ mActivity.findViewById(R.id.screen_off_option).performClick();
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_OFF, false);
+
+ mActivity.findViewById(R.id.screen_off_option).performClick();
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_OFF, true);
+ }
+
+ @Test
+ public void save_screenOn() {
+ Policy policy = new Policy(
+ PRIORITY_CATEGORY_ALARMS, 0, 0,
+ SUPPRESSED_EFFECT_SCREEN_ON
+ | SUPPRESSED_EFFECT_SCREEN_OFF
+ | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
+ | SUPPRESSED_EFFECT_LIGHTS
+ | SUPPRESSED_EFFECT_PEEK
+ | SUPPRESSED_EFFECT_STATUS_BAR
+ | SUPPRESSED_EFFECT_BADGE
+ | SUPPRESSED_EFFECT_AMBIENT
+ | SUPPRESSED_EFFECT_NOTIFICATION_LIST);
+ when(mNm.getNotificationPolicy()).thenReturn(policy);
+
+ mActivity.findViewById(R.id.screen_off_option).performClick();
+
+ mActivity.save(null);
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
+
+ ArgumentCaptor captor = ArgumentCaptor.forClass(Policy.class);
+ verify(mNm).setNotificationPolicy(captor.capture());
+
+ Policy actual = captor.getValue();
+ assertThat(actual.priorityCategories).isEqualTo(PRIORITY_CATEGORY_ALARMS);
+ assertThat(actual.suppressedVisualEffects).isEqualTo(
+ SUPPRESSED_EFFECT_SCREEN_ON | SUPPRESSED_EFFECT_NOTIFICATION_LIST
+ | SUPPRESSED_EFFECT_BADGE | SUPPRESSED_EFFECT_STATUS_BAR
+ | SUPPRESSED_EFFECT_PEEK);
+ }
+
+ @Test
+ public void save_screenOff() {
+ Policy policy = new Policy(
+ PRIORITY_CATEGORY_ALARMS, PRIORITY_SENDERS_ANY, 0,
+ SUPPRESSED_EFFECT_SCREEN_ON
+ | SUPPRESSED_EFFECT_SCREEN_OFF
+ | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
+ | SUPPRESSED_EFFECT_LIGHTS
+ | SUPPRESSED_EFFECT_PEEK
+ | SUPPRESSED_EFFECT_STATUS_BAR
+ | SUPPRESSED_EFFECT_BADGE
+ | SUPPRESSED_EFFECT_AMBIENT
+ | SUPPRESSED_EFFECT_NOTIFICATION_LIST);
+ when(mNm.getNotificationPolicy()).thenReturn(policy);
+
+ mActivity.findViewById(R.id.screen_on_option).performClick();
+
+ mActivity.save(null);
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
+
+ ArgumentCaptor captor = ArgumentCaptor.forClass(Policy.class);
+ verify(mNm).setNotificationPolicy(captor.capture());
+
+ Policy actual = captor.getValue();
+ assertThat(actual.priorityCallSenders).isEqualTo(PRIORITY_SENDERS_ANY);
+ assertThat(actual.suppressedVisualEffects).isEqualTo(
+ SUPPRESSED_EFFECT_SCREEN_OFF | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
+ | SUPPRESSED_EFFECT_LIGHTS | SUPPRESSED_EFFECT_AMBIENT);
+ }
+
+ @Test
+ public void save_none() {
+ Policy policy = new Policy(0, 0, 0,
+ SUPPRESSED_EFFECT_SCREEN_ON
+ | SUPPRESSED_EFFECT_SCREEN_OFF
+ | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
+ | SUPPRESSED_EFFECT_LIGHTS
+ | SUPPRESSED_EFFECT_PEEK
+ | SUPPRESSED_EFFECT_STATUS_BAR
+ | SUPPRESSED_EFFECT_BADGE
+ | SUPPRESSED_EFFECT_AMBIENT
+ | SUPPRESSED_EFFECT_NOTIFICATION_LIST);
+ when(mNm.getNotificationPolicy()).thenReturn(policy);
+
+ mActivity.findViewById(R.id.screen_on_option).performClick();
+ mActivity.findViewById(R.id.screen_off_option).performClick();
+
+ mActivity.save(null);
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
+
+ ArgumentCaptor captor = ArgumentCaptor.forClass(Policy.class);
+ verify(mNm).setNotificationPolicy(captor.capture());
+
+ Policy actual = captor.getValue();
+ assertThat(actual.suppressedVisualEffects).isEqualTo(0);
+ }
+
+ @Test
+ public void save_all() {
+ Policy policy = new Policy(0, 0, 0, 0);
+ when(mNm.getNotificationPolicy()).thenReturn(policy);
+
+ mActivity.save(null);
+
+ verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
+
+ ArgumentCaptor captor = ArgumentCaptor.forClass(Policy.class);
+ verify(mNm).setNotificationPolicy(captor.capture());
+
+ Policy actual = captor.getValue();
+ assertThat(actual.suppressedVisualEffects).isEqualTo(
+ SUPPRESSED_EFFECT_SCREEN_ON
+ | SUPPRESSED_EFFECT_SCREEN_OFF
+ | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
+ | SUPPRESSED_EFFECT_LIGHTS
+ | SUPPRESSED_EFFECT_PEEK
+ | SUPPRESSED_EFFECT_STATUS_BAR
+ | SUPPRESSED_EFFECT_BADGE
+ | SUPPRESSED_EFFECT_AMBIENT
+ | SUPPRESSED_EFFECT_NOTIFICATION_LIST);
+ }
+}