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

Merge "Moved zenMode visual effects + automatic rule page"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-27 15:23:19 +00:00
committed by Android (Google) Code Review
parent a8dc2a8f75 4359d4b9c9
commit 295a6b42f4
18 changed files with 572 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java
View File

@@ -1,4 +1,4 @@
package com.android.settings.notification;
package com.android.settings;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
@@ -36,12 +36,29 @@ public class ZenModeSettingsIntegrationTest {
}
@Test
public void testAutomaticRulesAppear() {
public void testZenModeSettingsPreferences() {
launchZenSettings();
onView(withText("Automatic rules")).check(matches(isDisplayed()));
onView(withText("Behavior")).check(matches(isDisplayed()));
onView(withText("Turn on automatically")).check(matches(isDisplayed()));
}
@Test
public void testZenModeBehaviorPreferences() {
launchZenBehaviorSettings();
onView(withText("Alarms")).check(matches(isDisplayed()));
onView(withText("Media and system feedback")).check(matches(isDisplayed()));
onView(withText("Reminders")).check(matches(isDisplayed()));
onView(withText("Events")).check(matches(isDisplayed()));
onView(withText("Messages")).check(matches(isDisplayed()));
onView(withText("Calls")).check(matches(isDisplayed()));
onView(withText("Repeat callers")).check(matches(isDisplayed()));
}
@Test
public void testZenModeAutomationPreferences() {
launchZenAutomationSettings();
onView(withText("Weekend")).check(matches(isDisplayed()));
onView(withText("Add more")).check(matches(isDisplayed())).perform(click());
onView(withText("Choose rule type")).check(matches(isDisplayed()));
onView(withText("Add rule")).check(matches(isDisplayed()));
}
private void launchZenSettings() {
@@ -50,4 +67,18 @@ public class ZenModeSettingsIntegrationTest {
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mContext.startActivity(settingsIntent);
}
}
private void launchZenAutomationSettings() {
Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_AUTOMATION_SETTINGS)
.setPackage(mContext.getPackageName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mContext.startActivity(settingsIntent);
}
private void launchZenBehaviorSettings() {
Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_PRIORITY_SETTINGS)
.setPackage(mContext.getPackageName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mContext.startActivity(settingsIntent);
}
}