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

Pick default notification setting for work profile

Browse Source 
Managed profiles cannot completely hide notifications, so
this setting should be treated as always "true" for them.

Change-Id: I9808c1e9736d83efccb0e947d9097379bda59ebb
Fixes: 78194020
Test: atest RedactionInterstitialTest
This commit is contained in:
Pavel Grafov
2018-04-20 12:52:28 +01:00
parent 27b8c6103f
commit c29b984a98
4 changed files with 226 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java Normal file
View File

@@ -0,0 +1,175 @@
package com.android.settings.notification;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
import static android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS;
import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;
import static com.google.common.truth.Truth.assertThat;
import static org.robolectric.Robolectric.buildActivity;
import android.content.ContentResolver;
import android.content.Intent;
import android.os.UserHandle;
import android.provider.Settings;
import android.view.View;
import android.widget.RadioButton;
import com.android.settings.R;
import com.android.settings.RestrictedRadioButton;
import com.android.settings.notification.RedactionInterstitial.RedactionInterstitialFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
SettingsShadowResources.class,
SettingsShadowResourcesImpl.class,
SettingsShadowResources.SettingsShadowTheme.class,
ShadowUtils.class,
ShadowRestrictedLockUtils.class,
ShadowUserManager.class,
})
public class RedactionInterstitialTest {
private RedactionInterstitial mActivity;
private RedactionInterstitialFragment mFragment;
@After
public void tearDown() {
ShadowUserManager.getShadow().reset();
ShadowRestrictedLockUtils.reset();
}
@Test
public void primaryUserDefaultStateTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */);
setupActivity();
assertHideAllVisible(true);
assertEnabledButtons(true /* all */, true /* redact */);
assertSelectedButton(R.id.show_all);
}
@Test
public void primaryUserRedactSensitiveTest() {
setupSettings(1 /* show */, 0 /* showUnredacted */);
setupActivity();
assertHideAllVisible(true);
assertEnabledButtons(true /* all */, true /* redact */);
assertSelectedButton(R.id.redact_sensitive);
}
@Test
public void primaryUserHideAllTest() {
setupSettings(0 /* show */, 0 /* showUnredacted */);
setupActivity();
assertHideAllVisible(true);
assertEnabledButtons(true /* all */, true /* redact */);
assertSelectedButton(R.id.hide_all);
}
@Test
public void primaryUserUnredactedRestrictionTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */);
ShadowRestrictedLockUtils.setKeyguardDisabledFeatures(
KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
setupActivity();
assertHideAllVisible(true);
assertEnabledButtons(false /* all */, true /* redact */);
assertSelectedButton(R.id.redact_sensitive);
}
@Test
public void primaryUserNotificationRestrictionTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */);
ShadowRestrictedLockUtils.setKeyguardDisabledFeatures(
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
setupActivity();
assertHideAllVisible(true);
assertEnabledButtons(false /* all */, false /* redact */);
assertSelectedButton(R.id.hide_all);
}
@Test
public void managedProfileNoRestrictionsTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */);
ShadowUserManager.getShadow().addManagedProfile(UserHandle.myUserId());
setupActivity();
assertHideAllVisible(false);
assertEnabledButtons(true /* all */, true /* redact */);
assertSelectedButton(R.id.show_all);
}
@Test
public void managedProfileUnredactedRestrictionTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */);
ShadowUserManager.getShadow().addManagedProfile(UserHandle.myUserId());
ShadowRestrictedLockUtils.setKeyguardDisabledFeatures(
KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
setupActivity();
assertHideAllVisible(false);
assertEnabledButtons(false /* all */, true /* redact */);
assertSelectedButton(R.id.redact_sensitive);
}
private void setupActivity() {
mActivity = buildActivity(RedactionInterstitial.class, new Intent()).setup().get();
mFragment = (RedactionInterstitialFragment)
mActivity.getFragmentManager().findFragmentById(R.id.main_content);
assertThat(mActivity).isNotNull();
assertThat(mFragment).isNotNull();
}
private void setupSettings(int show, int showUnredacted) {
final ContentResolver resolver = RuntimeEnvironment.application.getContentResolver();
Settings.Secure.putIntForUser(resolver,
LOCK_SCREEN_SHOW_NOTIFICATIONS, show, UserHandle.myUserId());
Settings.Secure.putIntForUser(resolver,
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, showUnredacted, UserHandle.myUserId());
}
private void assertHideAllVisible(boolean visible) {
Assert.assertEquals(visible, getButton(R.id.hide_all).getVisibility() != View.GONE);
}
private void assertEnabledButtons(boolean all, boolean redact) {
Assert.assertEquals(all, buttonEnabled(R.id.show_all));
Assert.assertEquals(redact, buttonEnabled(R.id.redact_sensitive));
}
private void assertSelectedButton(int resId) {
Assert.assertEquals(resId == R.id.show_all, buttonChecked(R.id.show_all));
Assert.assertEquals(resId == R.id.redact_sensitive, buttonChecked(R.id.redact_sensitive));
Assert.assertEquals(resId == R.id.hide_all, buttonChecked(R.id.hide_all));
}
private boolean buttonChecked(int resource) {
return getButton(resource).isChecked();
}
private boolean buttonEnabled(int resource) {
return !((RestrictedRadioButton) getButton(resource)).isDisabledByAdmin();
}
private RadioButton getButton(int resource) {
return (RadioButton) mFragment.getView().findViewById(resource);
}
}