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

Merge changes I081a35c8,I8a84f688,I60b64a0c into main

Browse Source 
* changes:
  Clean un-used code for notification cool down
  Add tests for updating Settings Page for Avalanche Suppression
  Update Settings Page for Avalanche Suppression
This commit is contained in:
Yining Liu
2024-05-28 15:55:14 +00:00
committed by Android (Google) Code Review
parent 0dca9f78c5 3d0640985b
commit 3e46f1f1c9
9 changed files with 213 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/values/arrays.xml
View File

@@ -1511,20 +1511,6 @@
<item>fr</item> <!-- French -->
</string-array>
<!-- Values for notification cooldown -->
<string-array name="notification_polite_options">
<item>@string/notification_polite_all_apps</item>
<item>@string/notification_polite_conversations</item>
<item>@string/notification_polite_disabled</item>
</string-array>
<!-- Values for notification cooldown -->
<string-array name="notification_polite_options_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<!-- Entries for private space auto lock option -->
<string-array name="private_space_auto_lock_options">
<item>@string/private_space_auto_lock_every_time</item>

14
res/values/strings.xml
View File

@@ -8704,17 +8704,11 @@
<string name="notif_listener_more_settings_desc">More settings are available inside this app</string>
<!-- Title for Polite Notifications setting [CHAR LIMIT=30]-->
<string name="notification_polite_title">Notification cooldown</string>
<string name="notification_polite_all_apps">Apply cooldown to all notifications</string>
<string name="notification_polite_all_apps_summary">Gradually lower the notification volume when you get many successive notifications from the same app</string>
<string name="notification_polite_conversations">Apply cooldown to conversations</string>
<string name="notification_polite_conversations_summary">Gradually lower the notification volume when you get many messages from the same chat within a short period of time</string>
<string name="notification_polite_disabled">Don\'t use notification cooldown</string>
<string name="notification_polite_disabled_summary">Never lower notification volume, regardless of the amount of successive notifications from the same app</string>
<string name="notification_polite_vibrate_unlocked">Vibrate when unlocked</string>
<string name="notification_polite_vibrate_unlocked_summary">Only vibrate when screen is unlocked</string>
<string name="notification_polite_title">Cooldown</string>
<string name="notification_polite_main_control_title">Use Cooldown</string>
<string name="notification_polite_description">When you get many notifications within a short time span, your device will minimize sound interruptions and pop-ups on the screen. Calls, alarms, and priority conversations will still alert as notmal, and all delivered notifications are easy to find in the Shade.</string>
<string name="notification_polite_work">Apply to work profiles</string>
<string name="notification_polite_work_summary">Apply the notification cooldown settings from your personal profile to your work profile</string>
<string name="notification_polite_work_summary">Apply to work profile apps</string>
<!-- Title for managing VR (virtual reality) helper services. [CHAR LIMIT=50] -->

29
res/xml/polite_notifications_settings.xml
View File

@@ -19,20 +19,23 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/notification_polite_title">
<com.android.settings.RestrictedListPreference
android:key="polite_notifications_pref_dlg"
android:persistent="false"
android:title="@string/notification_polite_title"
android:entries="@array/notification_polite_options"
android:entryValues="@array/notification_polite_options_values"
settings:controller="com.android.settings.notification.PoliteNotificationFilterController"/>
<com.android.settingslib.widget.TopIntroPreference
android:key="polite_notification_desc"
android:title="@string/notification_polite_description"/>
<SwitchPreferenceCompat
android:key="notification_polite_vibrate_unlocked"
android:persistent="false"
android:title="@string/notification_polite_vibrate_unlocked"
android:summary="@string/notification_polite_vibrate_unlocked_summary"
settings:controller="com.android.settings.notification.PoliteNotifVibrateUnlockedToggleController" />
<!-- TODO(b/330606963): add the illustration back when animation is ready-->
<!-- <com.android.settingslib.widget.IllustrationPreference-->
<!-- android:key="bubbles_illustration"-->
<!-- settings:searchable="false"-->
<!-- android:selectable="false"-->
<!-- app:lottie_rawRes="@raw/lottie_bubbles"-->
<!-- app:lottie_cacheComposition="false"-->
<!-- settings:dynamicColor="true" />-->
<com.android.settingslib.widget.MainSwitchPreference
android:key="polite_notification_global_pref"
android:title="@string/notification_polite_main_control_title"
settings:controller="com.android.settings.notification.PoliteNotificationGlobalPreferenceController" />
<SwitchPreferenceCompat
android:key="notification_polite_work_profile"

73
src/com/android/settings/notification/PoliteNotifWorkProfileToggleController.java
View File

@@ -16,29 +16,52 @@
package com.android.settings.notification;
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
import static com.android.settings.notification.PoliteNotificationGlobalPreferenceController.ON;
import static com.android.settings.notification.PoliteNotificationGlobalPreferenceController.OFF;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleEventObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.server.notification.Flags;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
* Controls the toggle that determines whether notification cooldown
* should apply to work profiles.
*/
public class PoliteNotifWorkProfileToggleController extends TogglePreferenceController {
public class PoliteNotifWorkProfileToggleController extends TogglePreferenceController implements
LifecycleEventObserver {
private final int mManagedProfileId;
private Preference mPreference;
private final ContentResolver mContentResolver;
public PoliteNotifWorkProfileToggleController(Context context, String preferenceKey) {
final ContentObserver mContentObserver = new ContentObserver(
new Handler(Looper.getMainLooper())) {
@Override
public void onChange(boolean selfChange, @Nullable Uri uri) {
updateState(mPreference);
}
};
public PoliteNotifWorkProfileToggleController(@NonNull Context context,
@NonNull String preferenceKey) {
this(context, preferenceKey, new AudioHelper(context));
}
@@ -47,6 +70,25 @@ public class PoliteNotifWorkProfileToggleController extends TogglePreferenceCont
AudioHelper helper) {
super(context, preferenceKey);
mManagedProfileId = helper.getManagedProfileId(UserManager.get(mContext));
mContentResolver = context.getContentResolver();
}
@Override
public void displayPreference(@NonNull PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey());
}
@Override
public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
@NonNull Lifecycle.Event event) {
if (event == Lifecycle.Event.ON_RESUME) {
mContentResolver.registerContentObserver(
Settings.System.getUriFor(Settings.System.NOTIFICATION_COOLDOWN_ENABLED),
/* notifyForDescendants= */ false, mContentObserver);
} else if (event == Lifecycle.Event.ON_PAUSE) {
mContentResolver.unregisterContentObserver(mContentObserver);
}
}
@Override
@@ -56,11 +98,18 @@ public class PoliteNotifWorkProfileToggleController extends TogglePreferenceCont
return CONDITIONALLY_UNAVAILABLE;
}
if (!isCoolDownEnabledForPrimary()) {
return CONDITIONALLY_UNAVAILABLE;
}
return (mManagedProfileId != UserHandle.USER_NULL) ? AVAILABLE : DISABLED_FOR_USER;
}
@Override
public boolean isChecked() {
if (!isCoolDownEnabledForPrimary()) {
return false;
}
return Settings.System.getIntForUser(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON, mManagedProfileId) != OFF;
}
@@ -74,6 +123,18 @@ public class PoliteNotifWorkProfileToggleController extends TogglePreferenceCont
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_accessibility;
// not needed since it's not sliceable
return NO_RES;
}
@Override
public void updateState(@Nullable Preference preference) {
if (preference == null) return;
preference.setVisible(isAvailable());
}
private boolean isCoolDownEnabledForPrimary() {
return Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON) == ON;
}
}

114
src/com/android/settings/notification/PoliteNotificationFilterController.java
View File

@@ -1,114 +0,0 @@
/*
* Copyright (C) 2023 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 com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
import android.content.Context;
import android.provider.Settings;
import android.util.Log;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.server.notification.Flags;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
/**
* Controls whether polite notifications are enabled and apply to all apps or just to conversations.
*/
public class PoliteNotificationFilterController extends BasePreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
static final String TAG = "PoliteNotificationFilterController";
private static final int POLITE_NOTIFICATIONS_ALL = 0;
private static final int POLITE_NOTIFICATIONS_CONVERSATIONS = 1;
private static final int POLITE_NOTIFICATIONS_DISABLED = 2;
public PoliteNotificationFilterController(Context context, String key) {
super(context, key);
}
@Override
public int getAvailabilityStatus() {
// TODO: b/291897570 - remove this when the feature flag is removed!
return Flags.politeNotifications() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
public void updateState(Preference preference) {
super.updateState(preference);
final ListPreference pref = (ListPreference) preference;
if (isPoliteNotifDisabled()) {
pref.setValue(Integer.toString(POLITE_NOTIFICATIONS_DISABLED));
} else if (shouldApplyForAllApps()) {
pref.setValue(Integer.toString(POLITE_NOTIFICATIONS_ALL));
} else {
pref.setValue(Integer.toString(POLITE_NOTIFICATIONS_CONVERSATIONS));
}
}
@Override
public CharSequence getSummary() {
if (isPoliteNotifDisabled()) {
return mContext.getString(R.string.notification_polite_disabled_summary);
}
if (shouldApplyForAllApps()) {
return mContext.getString(R.string.notification_polite_all_apps_summary);
} else {
return mContext.getString(R.string.notification_polite_conversations_summary);
}
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final int prefValue = Integer.parseInt((String) newValue);
if (prefValue == POLITE_NOTIFICATIONS_ALL) {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON);
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ALL, ON);
} else if (prefValue == POLITE_NOTIFICATIONS_CONVERSATIONS) {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON);
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ALL, OFF);
} else if (prefValue == POLITE_NOTIFICATIONS_DISABLED) {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF);
} else {
Log.e(TAG, "Unexpected preference value: " + prefValue);
}
refreshSummary(preference);
return true;
}
private boolean isPoliteNotifDisabled() {
return Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON) == OFF;
}
private boolean shouldApplyForAllApps() {
return Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ALL, ON) != OFF;
}
}

37
src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleController.java → src/com/android/settings/notification/PoliteNotificationGlobalPreferenceController.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -16,51 +16,48 @@
package com.android.settings.notification;
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
import android.content.Context;
import android.os.Vibrator;
import android.provider.Settings;
import androidx.annotation.NonNull;
import com.android.server.notification.Flags;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
/**
* Controls the toggle that determines whether notifications
* should only vibrate (no sound) when the device is unlocked.
*/
public class PoliteNotifVibrateUnlockedToggleController extends TogglePreferenceController {
public class PoliteNotificationGlobalPreferenceController extends
SettingsMainSwitchPreferenceController {
public PoliteNotifVibrateUnlockedToggleController(Context context, String preferenceKey) {
public static final int ON = 1;
public static final int OFF = 0;
public PoliteNotificationGlobalPreferenceController(@NonNull Context context,
@NonNull String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
// TODO: b/291897570 - remove this when the feature flag is removed!
if (!Flags.politeNotifications() || !Flags.vibrateWhileUnlocked()) {
return CONDITIONALLY_UNAVAILABLE;
if (Flags.politeNotifications()) {
return AVAILABLE;
}
return mContext.getSystemService(Vibrator.class).hasVibrator() ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
return CONDITIONALLY_UNAVAILABLE;
}
@Override
public boolean isChecked() {
return Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, OFF) != OFF;
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON) == ON;
}
@Override
public boolean setChecked(boolean isChecked) {
return Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, (isChecked ? ON : OFF));
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, (isChecked ? ON : OFF));
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_accessibility;
// not needed since it's not sliceable
return NO_RES;
}
}

75
tests/robotests/src/com/android/settings/notification/PoliteNotifWorkProfileToggleControllerTest.java
View File

@@ -18,7 +18,9 @@ package com.android.settings.notification;
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@@ -27,6 +29,8 @@ import android.os.UserHandle;
import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings;
import androidx.preference.Preference;
import com.android.server.notification.Flags;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.shadow.ShadowSystemSettings;
@@ -50,6 +54,7 @@ public class PoliteNotifWorkProfileToggleControllerTest {
private Context mContext;
PoliteNotifWorkProfileToggleController mController;
private Preference mPreference;
@Mock
private AudioHelper mAudioHelper;
@@ -58,12 +63,16 @@ public class PoliteNotifWorkProfileToggleControllerTest {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
when(mAudioHelper.getManagedProfileId(any())).thenReturn(UserHandle.MIN_SECONDARY_USER_ID);
setCoolDownEnabled(true);
assertThat(isCoolDownEnabled()).isTrue();
mController = new PoliteNotifWorkProfileToggleController(mContext, PREFERENCE_KEY,
mAudioHelper);
mPreference = new Preference(RuntimeEnvironment.application);
mPreference.setKey(mController.getPreferenceKey());
}
@Test
public void isAvailable_flagEnabled_workProfileExists_shouldReturnTrue() {
public void isAvailable_flagEnabled_coolDownEnabled_workProfileExists_shouldReturnTrue() {
// TODO: b/291907312 - remove feature flags
mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
assertThat(mController.isAvailable()).isTrue();
@@ -71,6 +80,17 @@ public class PoliteNotifWorkProfileToggleControllerTest {
BasePreferenceController.AVAILABLE);
}
@Test
public void isAvailable_flagEnabled_coolDownDisabled_workProfileExists_shouldReturnFalse() {
// TODO: b/291907312 - remove feature flags
mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
setCoolDownEnabled(false);
assertThat(isCoolDownEnabled()).isFalse();
assertThat(mController.isAvailable()).isFalse();
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
}
@Test
public void isAvailable_flagEnabled_workProfileMissing_shouldReturnFalse() {
// TODO: b/291907312 - remove feature flags
@@ -84,7 +104,7 @@ public class PoliteNotifWorkProfileToggleControllerTest {
}
@Test
public void isAvailable_flagDisabled_shouldReturnFalse() {
public void isAvailable_coolDownEnabled_flagDisabled_shouldReturnFalse() {
// TODO: b/291907312 - remove feature flags
mSetFlagsRule.disableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
assertThat(mController.isAvailable()).isFalse();
@@ -94,7 +114,7 @@ public class PoliteNotifWorkProfileToggleControllerTest {
@Test
@Config(shadows = ShadowSystemSettings.class)
public void isChecked_enabledForWorkProfile_shouldReturnTrue() {
public void isChecked_coolDownEnabled_enabledForWorkProfile_shouldReturnTrue() {
Settings.System.putIntForUser(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON,
UserHandle.MIN_SECONDARY_USER_ID);
@@ -103,7 +123,18 @@ public class PoliteNotifWorkProfileToggleControllerTest {
@Test
@Config(shadows = ShadowSystemSettings.class)
public void isChecked_disabledForWorkProfile_shouldReturnFalse() {
public void isChecked_coolDownDisabled_enabledForWorkProfile_shouldReturnFalse() {
setCoolDownEnabled(false);
assertThat(isCoolDownEnabled()).isFalse();
Settings.System.putIntForUser(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON,
UserHandle.MIN_SECONDARY_USER_ID);
assertThat(mController.isChecked()).isFalse();
}
@Test
@Config(shadows = ShadowSystemSettings.class)
public void isChecked_coolDownEnabled_disabledForWorkProfile_shouldReturnFalse() {
Settings.System.putIntForUser(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF,
UserHandle.MIN_SECONDARY_USER_ID);
@@ -112,7 +143,7 @@ public class PoliteNotifWorkProfileToggleControllerTest {
@Test
@Config(shadows = ShadowSystemSettings.class)
public void setChecked_setTrue_shouldEnablePoliteNotifForWorkProfile() {
public void setChecked_coolDownEnabled_setTrue_shouldEnablePoliteNotifForWorkProfile() {
Settings.System.putIntForUser(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF,
UserHandle.MIN_SECONDARY_USER_ID);
@@ -124,7 +155,7 @@ public class PoliteNotifWorkProfileToggleControllerTest {
@Test
@Config(shadows = ShadowSystemSettings.class)
public void setChecked_setFalse_shouldDisablePoliteNotifForWorkProfile() {
public void setChecked_coolDownEnabled_setFalse_shouldDisablePoliteNotifForWorkProfile() {
Settings.System.putIntForUser(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON,
UserHandle.MIN_SECONDARY_USER_ID);
@@ -133,4 +164,36 @@ public class PoliteNotifWorkProfileToggleControllerTest {
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON,
UserHandle.MIN_SECONDARY_USER_ID)).isEqualTo(OFF);
}
@Test
public void isVisible_coolDownSetToBeDisabled_shouldReturnFalse() {
assertThat(mPreference.isVisible()).isTrue();
setCoolDownEnabled(false);
assertThat(isCoolDownEnabled()).isFalse();
mController.updateState(mPreference);
assertThat(mPreference.isVisible()).isFalse();
}
@Test
public void isVisible_coolDownSetToBeEnabled_shouldReturnTrue() {
setCoolDownEnabled(false);
assertThat(isCoolDownEnabled()).isFalse();
mController.updateState(mPreference);
assertThat(mPreference.isVisible()).isFalse();
setCoolDownEnabled(true);
assertThat(isCoolDownEnabled()).isTrue();
mController.updateState(mPreference);
assertThat(mPreference.isVisible()).isTrue();
}
private void setCoolDownEnabled(boolean enabled) {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, (enabled ? ON : OFF));
}
private boolean isCoolDownEnabled() {
return Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON) == ON;
}
}

165
tests/robotests/src/com/android/settings/notification/PoliteNotificationFilterControllerTest.java
View File

@@ -1,165 +0,0 @@
/*
* Copyright (C) 2023 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 com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.server.notification.Flags;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class PoliteNotificationFilterControllerTest {
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private static final String PREFERENCE_KEY = "preference_key";
private static final int POLITE_NOTIFICATIONS_ALL = 0;
private static final int POLITE_NOTIFICATIONS_CONVERSATIONS = 1;
private static final int POLITE_NOTIFICATIONS_DISABLED = 2;
@Mock
private PreferenceScreen mScreen;
private PoliteNotificationFilterController mController;
private Preference mPreference;
private Context mContext;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mController = new PoliteNotificationFilterController(mContext, PREFERENCE_KEY);
mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@Test
public void isAvailable_flagEnabled_shouldReturnTrue() {
// TODO: b/291907312 - remove feature flags
mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
assertThat(mController.isAvailable()).isTrue();
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.AVAILABLE);
}
@Test
public void isAvailable_flagDisabled_shouldReturnFalse() {
// TODO: b/291907312 - remove feature flags
mSetFlagsRule.disableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
assertThat(mController.isAvailable()).isFalse();
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
}
@Test
public void updateState_politeNotificationDisabled() {
final ListPreference preference = mock(ListPreference.class);
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF);
mController.updateState(preference);
verify(preference).setValue(Integer.toString(POLITE_NOTIFICATIONS_DISABLED));
assertThat(mController.getSummary().toString()).isEqualTo(
mContext.getString(R.string.notification_polite_disabled_summary));
}
@Test
public void updateState_politeNotificationEnabled_applyAllApps() {
final ListPreference preference = mock(ListPreference.class);
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON);
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ALL, ON);
mController.updateState(preference);
verify(preference).setValue(Integer.toString(POLITE_NOTIFICATIONS_ALL));
assertThat(mController.getSummary().toString()).isEqualTo(
mContext.getString(R.string.notification_polite_all_apps_summary));
}
@Test
public void updateState_politeNotificationEnabled_applyOnlyConversations() {
final ListPreference preference = mock(ListPreference.class);
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON);
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ALL, OFF);
mController.updateState(preference);
verify(preference).setValue(Integer.toString(POLITE_NOTIFICATIONS_CONVERSATIONS));
assertThat(mController.getSummary().toString()).isEqualTo(
mContext.getString(R.string.notification_polite_conversations_summary));
}
@Test
public void onPreferenceChanged_firstItemSelected_shouldEnableForAll() {
mController.displayPreference(mScreen);
mController.onPreferenceChange(mPreference, "0");
assertThat(Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF)).isEqualTo(ON);
assertThat(Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ALL, OFF)).isEqualTo(ON);
}
@Test
public void onPreferenceChanged_secondItemSelected_shouldEnableForConversationsOnly() {
mController.displayPreference(mScreen);
mController.onPreferenceChange(mPreference, "1");
assertThat(Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF)).isEqualTo(ON);
assertThat(Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ALL, OFF)).isEqualTo(OFF);
}
@Test
public void onPreferenceChanged_thirdItemSelected_shouldDisable() {
mController.displayPreference(mScreen);
mController.onPreferenceChange(mPreference, "2");
assertThat(Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF)).isEqualTo(OFF);
}
}

86
tests/robotests/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleControllerTest.java → tests/robotests/src/com/android/settings/notification/PoliteNotificationGlobalPreferenceControllerTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -18,109 +18,103 @@ package com.android.settings.notification;
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.Vibrator;
import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings;
import com.android.server.notification.Flags;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.shadow.ShadowSystemSettings;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
public class PoliteNotifVibrateUnlockedToggleControllerTest {
public class PoliteNotificationGlobalPreferenceControllerTest {
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private static final String PREFERENCE_KEY = "preference_key";
private PoliteNotifVibrateUnlockedToggleController mController;
private Context mContext;
@Mock
private Vibrator mVibrator;
PoliteNotificationGlobalPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mController = new PoliteNotifVibrateUnlockedToggleController(mContext, PREFERENCE_KEY);
when(mContext.getSystemService(Vibrator.class)).thenReturn(mVibrator);
mContext = RuntimeEnvironment.application;
setCoolDownEnabled(true);
assertThat(isCoolDownEnabled()).isTrue();
// TODO: b/291907312 - remove feature flags
mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
mController = new PoliteNotificationGlobalPreferenceController(mContext, PREFERENCE_KEY);
}
@Test
public void isAvailable_flagEnabled_vibrationSupported_shouldReturnTrue() {
// TODO: b/291907312 - remove feature flags
mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
mSetFlagsRule.enableFlags(Flags.FLAG_VIBRATE_WHILE_UNLOCKED);
when(mVibrator.hasVibrator()).thenReturn(true);
public void isAvailable_flagEnabled_shouldReturnTrue() {
assertThat(mController.isAvailable()).isTrue();
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.AVAILABLE);
}
@Test
public void isAvailable_flagEnabled_vibrationNotSupported_shouldReturnFalse() {
// TODO: b/291907312 - remove feature flags
mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
mSetFlagsRule.enableFlags(Flags.FLAG_VIBRATE_WHILE_UNLOCKED);
when(mVibrator.hasVibrator()).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
@Test
public void isAvailable_flagDisabled_shouldReturnFalse() {
// TODO: b/291907312 - remove feature flags
mSetFlagsRule.disableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
mSetFlagsRule.enableFlags(Flags.FLAG_VIBRATE_WHILE_UNLOCKED);
assertThat(mController.isAvailable()).isFalse();
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
}
@Test
public void isChecked_vibrateEnabled_shouldReturnTrue() {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, ON);
@Config(shadows = ShadowSystemSettings.class)
public void isChecked_coolDownEnabled_shouldReturnTrue() {
assertThat(mController.isChecked()).isTrue();
}
@Test
public void isChecked_vibrateDisabled_shouldReturnFalse() {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, OFF);
@Config(shadows = ShadowSystemSettings.class)
public void isChecked_coolDownDisabled_shouldReturnFalse() {
setCoolDownEnabled(false);
assertThat(isCoolDownEnabled()).isFalse();
assertThat(mController.isChecked()).isFalse();
}
@Test
public void setChecked_setTrue_shouldEnableVibrateSetting() {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, OFF);
@Config(shadows = ShadowSystemSettings.class)
public void setChecked_setTrue_shouldEnableCoolDown() {
setCoolDownEnabled(false);
assertThat(isCoolDownEnabled()).isFalse();
mController.setChecked(true);
assertThat(Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, OFF)).isEqualTo(ON);
assertThat(isCoolDownEnabled()).isTrue();
}
@Test
public void setChecked_setFalse_shouldDisableVibrateSetting() {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, ON);
@Config(shadows = ShadowSystemSettings.class)
public void setChecked_setFalse_shouldDisableCoolDown() {
assertThat(isCoolDownEnabled()).isTrue();
mController.setChecked(false);
assertThat(Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, ON)).isEqualTo(OFF);
assertThat(isCoolDownEnabled()).isFalse();
}
private void setCoolDownEnabled(boolean enabled) {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, (enabled ? ON : OFF));
}
private boolean isCoolDownEnabled() {
return Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON) == ON;
}
}