Create a new link preference for priority modes entry
Test: ZenModesSummaryHelperTest Test: manual. Successfully search for both 'event' and 'priority' Flag: android.app.modes_ui Bug: 341726633 Change-Id: Ib7bd1a5c2f7b06b1728a66f7a9cef53cd45acc0b
This commit is contained in:
@@ -8118,6 +8118,14 @@
|
|||||||
<!-- Do not disturb: mode page section title [CHAR LIMIT=80] -->
|
<!-- Do not disturb: mode page section title [CHAR LIMIT=80] -->
|
||||||
<string name="mode_device_effects_title">Additional actions</string>
|
<string name="mode_device_effects_title">Additional actions</string>
|
||||||
|
|
||||||
|
<!-- Summary for the Sound Do not Disturb option when DND isn't currently on. [CHAR LIMIT=NONE]-->
|
||||||
|
<string name="modes_sound_summary_off">
|
||||||
|
{count, plural,
|
||||||
|
=0 {Off}
|
||||||
|
=1 {Off / 1 mode can turn on automatically}
|
||||||
|
other {Off / # modes can turn on automatically}
|
||||||
|
}
|
||||||
|
</string>
|
||||||
|
|
||||||
<!-- Do not disturb: display settings title [CHAR LIMIT=80] -->
|
<!-- Do not disturb: display settings title [CHAR LIMIT=80] -->
|
||||||
<string name="mode_display_settings_title">Display settings</string>
|
<string name="mode_display_settings_title">Display settings</string>
|
||||||
|
@@ -135,6 +135,15 @@
|
|||||||
settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
|
settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<com.android.settingslib.RestrictedPreference
|
||||||
|
android:key="modes_notifications"
|
||||||
|
android:order="18"
|
||||||
|
android:title="@string/zen_modes_list_title"
|
||||||
|
settings:useAdminDisabledSummary="true"
|
||||||
|
android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
|
||||||
|
settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"
|
||||||
|
/>
|
||||||
|
|
||||||
<SwitchPreferenceCompat
|
<SwitchPreferenceCompat
|
||||||
android:key="lock_screen_show_only_unseen_notifs"
|
android:key="lock_screen_show_only_unseen_notifs"
|
||||||
android:order="19"
|
android:order="19"
|
||||||
|
@@ -41,8 +41,11 @@ import static android.service.notification.ZenPolicy.VISUAL_EFFECT_STATUS_BAR;
|
|||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.icu.text.MessageFormat;
|
import android.icu.text.MessageFormat;
|
||||||
|
import android.provider.Settings;
|
||||||
import android.service.notification.ZenDeviceEffects;
|
import android.service.notification.ZenDeviceEffects;
|
||||||
|
import android.service.notification.ZenModeConfig;
|
||||||
import android.service.notification.ZenPolicy;
|
import android.service.notification.ZenPolicy;
|
||||||
|
import android.util.ArrayMap;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
@@ -448,4 +451,33 @@ class ZenModeSummaryHelper {
|
|||||||
}
|
}
|
||||||
return msgFormat.format(args);
|
return msgFormat.format(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String getSoundSummary(int zenMode, ZenModeConfig config) {
|
||||||
|
if (zenMode != Settings.Global.ZEN_MODE_OFF) {
|
||||||
|
String description = ZenModeConfig.getDescription(mContext, true, config, false);
|
||||||
|
|
||||||
|
if (description == null) {
|
||||||
|
return mContext.getString(R.string.zen_mode_sound_summary_on);
|
||||||
|
} else {
|
||||||
|
return mContext.getString(R.string.zen_mode_sound_summary_on_with_info,
|
||||||
|
description);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
int count = 0;
|
||||||
|
final ArrayMap<String, ZenModeConfig.ZenRule> ruleMap = config.automaticRules;
|
||||||
|
if (ruleMap != null) {
|
||||||
|
for (ZenModeConfig.ZenRule rule : ruleMap.values()) {
|
||||||
|
if (rule != null && rule.enabled) {
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
MessageFormat msgFormat = new MessageFormat(
|
||||||
|
mContext.getString(R.string.modes_sound_summary_off),
|
||||||
|
Locale.getDefault());
|
||||||
|
Map<String, Object> msgArgs = new HashMap<>();
|
||||||
|
msgArgs.put("count", count);
|
||||||
|
return msgFormat.format(msgArgs);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,120 @@
|
|||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
* 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.modes;
|
||||||
|
|
||||||
|
import android.app.Flags;
|
||||||
|
import android.app.NotificationManager;
|
||||||
|
import android.content.ContentResolver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.database.ContentObserver;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.UserHandle;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||||
|
import com.android.settingslib.core.lifecycle.events.OnPause;
|
||||||
|
import com.android.settingslib.core.lifecycle.events.OnResume;
|
||||||
|
|
||||||
|
public class ZenModesLinkPreferenceController extends BasePreferenceController
|
||||||
|
implements LifecycleObserver, OnResume, OnPause {
|
||||||
|
|
||||||
|
private SettingObserver mSettingObserver;
|
||||||
|
private ZenModeSummaryHelper mSummaryBuilder;
|
||||||
|
private NotificationManager mNm;
|
||||||
|
|
||||||
|
public ZenModesLinkPreferenceController(Context context, String key) {
|
||||||
|
super(context, key);
|
||||||
|
mSummaryBuilder = new ZenModeSummaryHelper(context, ZenHelperBackend.getInstance(context));
|
||||||
|
mNm = mContext.getSystemService(NotificationManager.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@AvailabilityStatus
|
||||||
|
public int getAvailabilityStatus() {
|
||||||
|
return Flags.modesUi() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
|
super.displayPreference(screen);
|
||||||
|
Preference preference = screen.findPreference(getPreferenceKey());
|
||||||
|
mSettingObserver = new SettingObserver(preference);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
if (mSettingObserver != null) {
|
||||||
|
mSettingObserver.register(mContext.getContentResolver());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPause() {
|
||||||
|
if (mSettingObserver != null) {
|
||||||
|
mSettingObserver.unregister(mContext.getContentResolver());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
preference.setSummary(mSummaryBuilder.getSoundSummary(
|
||||||
|
Settings.Global.getInt(mContext.getContentResolver(),
|
||||||
|
Settings.Global.ZEN_MODE,
|
||||||
|
Settings.Global.ZEN_MODE_OFF),
|
||||||
|
mNm.getZenModeConfig()));
|
||||||
|
}
|
||||||
|
|
||||||
|
class SettingObserver extends ContentObserver {
|
||||||
|
private final Uri ZEN_MODE_URI = Settings.Global.getUriFor(Settings.Global.ZEN_MODE);
|
||||||
|
private final Uri ZEN_MODE_CONFIG_ETAG_URI = Settings.Global.getUriFor(
|
||||||
|
Settings.Global.ZEN_MODE_CONFIG_ETAG);
|
||||||
|
|
||||||
|
private final Preference mPreference;
|
||||||
|
|
||||||
|
public SettingObserver(Preference preference) {
|
||||||
|
super(new Handler());
|
||||||
|
mPreference = preference;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void register(ContentResolver cr) {
|
||||||
|
cr.registerContentObserver(ZEN_MODE_URI, false, this, UserHandle.USER_ALL);
|
||||||
|
cr.registerContentObserver(ZEN_MODE_CONFIG_ETAG_URI, false, this, UserHandle.USER_ALL);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void unregister(ContentResolver cr) {
|
||||||
|
cr.unregisterContentObserver(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onChange(boolean selfChange, Uri uri) {
|
||||||
|
super.onChange(selfChange, uri);
|
||||||
|
if (ZEN_MODE_URI.equals(uri)) {
|
||||||
|
updateState(mPreference);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ZEN_MODE_CONFIG_ETAG_URI.equals(uri)) {
|
||||||
|
updateState(mPreference);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -28,9 +28,7 @@ import android.provider.Settings;
|
|||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
import androidx.preference.PreferenceScreen;
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
import com.android.settings.R;
|
|
||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
import com.android.settings.notification.modes.ZenModesListFragment;
|
|
||||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||||
import com.android.settingslib.core.lifecycle.events.OnPause;
|
import com.android.settingslib.core.lifecycle.events.OnPause;
|
||||||
import com.android.settingslib.core.lifecycle.events.OnResume;
|
import com.android.settingslib.core.lifecycle.events.OnResume;
|
||||||
@@ -51,7 +49,6 @@ public class ZenModePreferenceController extends BasePreferenceController
|
|||||||
super.displayPreference(screen);
|
super.displayPreference(screen);
|
||||||
Preference preference = screen.findPreference(getPreferenceKey());
|
Preference preference = screen.findPreference(getPreferenceKey());
|
||||||
mSettingObserver = new SettingObserver(preference);
|
mSettingObserver = new SettingObserver(preference);
|
||||||
maybeSetTitleAndDestination(preference);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -70,28 +67,17 @@ public class ZenModePreferenceController extends BasePreferenceController
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
return AVAILABLE_UNSEARCHABLE;
|
return Flags.modesUi() ? UNSUPPORTED_ON_DEVICE : AVAILABLE_UNSEARCHABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateState(Preference preference) {
|
public void updateState(Preference preference) {
|
||||||
super.updateState(preference);
|
super.updateState(preference);
|
||||||
maybeSetTitleAndDestination(preference);
|
|
||||||
if (preference.isEnabled()) {
|
if (preference.isEnabled()) {
|
||||||
preference.setSummary(mSummaryBuilder.getSoundSummary());
|
preference.setSummary(mSummaryBuilder.getSoundSummary());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only when modes_ui is active: change title & target fragment.
|
|
||||||
private void maybeSetTitleAndDestination(Preference preference) {
|
|
||||||
if (!Flags.modesUi()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
preference.setTitle(R.string.zen_modes_list_title);
|
|
||||||
preference.setFragment(ZenModesListFragment.class.getCanonicalName());
|
|
||||||
}
|
|
||||||
|
|
||||||
class SettingObserver extends ContentObserver {
|
class SettingObserver extends ContentObserver {
|
||||||
private final Uri ZEN_MODE_URI = Settings.Global.getUriFor(Settings.Global.ZEN_MODE);
|
private final Uri ZEN_MODE_URI = Settings.Global.getUriFor(Settings.Global.ZEN_MODE);
|
||||||
private final Uri ZEN_MODE_CONFIG_ETAG_URI = Settings.Global.getUriFor(
|
private final Uri ZEN_MODE_CONFIG_ETAG_URI = Settings.Global.getUriFor(
|
||||||
|
@@ -16,6 +16,10 @@
|
|||||||
|
|
||||||
package com.android.settings.notification.modes;
|
package com.android.settings.notification.modes;
|
||||||
|
|
||||||
|
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
|
||||||
|
import static android.provider.Settings.Global.ZEN_MODE_OFF;
|
||||||
|
import static android.service.notification.Condition.SOURCE_UNKNOWN;
|
||||||
|
import static android.service.notification.Condition.STATE_TRUE;
|
||||||
import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_ANYONE;
|
import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_ANYONE;
|
||||||
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_ANYONE;
|
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_ANYONE;
|
||||||
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_CONTACTS;
|
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_CONTACTS;
|
||||||
@@ -24,13 +28,21 @@ import static android.service.notification.ZenPolicy.VISUAL_EFFECT_LIGHTS;
|
|||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import android.app.Flags;
|
||||||
|
import android.content.ComponentName;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.platform.test.annotations.EnableFlags;
|
||||||
|
import android.platform.test.flag.junit.SetFlagsRule;
|
||||||
|
import android.service.notification.Condition;
|
||||||
import android.service.notification.ZenDeviceEffects;
|
import android.service.notification.ZenDeviceEffects;
|
||||||
|
import android.service.notification.ZenModeConfig;
|
||||||
import android.service.notification.ZenPolicy;
|
import android.service.notification.ZenPolicy;
|
||||||
|
|
||||||
import com.android.settingslib.notification.modes.ZenMode;
|
import com.android.settingslib.notification.modes.ZenMode;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mockito.MockitoAnnotations;
|
import org.mockito.MockitoAnnotations;
|
||||||
@@ -46,6 +58,10 @@ public class ZenModesSummaryHelperTest {
|
|||||||
|
|
||||||
private ZenModeSummaryHelper mSummaryHelper;
|
private ZenModeSummaryHelper mSummaryHelper;
|
||||||
|
|
||||||
|
@Rule
|
||||||
|
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(
|
||||||
|
SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT);
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setup() {
|
public void setup() {
|
||||||
MockitoAnnotations.initMocks(this);
|
MockitoAnnotations.initMocks(this);
|
||||||
@@ -351,4 +367,87 @@ public class ZenModesSummaryHelperTest {
|
|||||||
assertThat(mSummaryHelper.getAppsSummary(zenMode, apps)).isEqualTo("FifthApp, FourthApp, "
|
assertThat(mSummaryHelper.getAppsSummary(zenMode, apps)).isEqualTo("FifthApp, FourthApp, "
|
||||||
+ "and 4 more can interrupt");
|
+ "and 4 more can interrupt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@EnableFlags(Flags.FLAG_MODES_UI)
|
||||||
|
public void getSoundSummary_off_noRules() {
|
||||||
|
ZenModeConfig config = new ZenModeConfig();
|
||||||
|
|
||||||
|
assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_OFF, config)).isEqualTo("Off");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@EnableFlags(Flags.FLAG_MODES_UI)
|
||||||
|
public void getSoundSummary_off_oneRule() {
|
||||||
|
ZenModeConfig config = new ZenModeConfig();
|
||||||
|
ZenModeConfig.ZenRule rule = new ZenModeConfig.ZenRule();
|
||||||
|
rule.enabled = true;
|
||||||
|
config.automaticRules.put("key", rule);
|
||||||
|
|
||||||
|
assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_OFF, config))
|
||||||
|
.isEqualTo("Off / 1 mode can turn on automatically");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@EnableFlags(Flags.FLAG_MODES_UI)
|
||||||
|
public void getSoundSummary_off_twoRules() {
|
||||||
|
ZenModeConfig config = new ZenModeConfig();
|
||||||
|
ZenModeConfig.ZenRule rule = new ZenModeConfig.ZenRule();
|
||||||
|
rule.enabled = true;
|
||||||
|
ZenModeConfig.ZenRule rule2 = new ZenModeConfig.ZenRule();
|
||||||
|
rule2.enabled = true;
|
||||||
|
config.automaticRules.put("key", rule);
|
||||||
|
config.automaticRules.put("key2", rule2);
|
||||||
|
|
||||||
|
assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_OFF, config))
|
||||||
|
.isEqualTo("Off / 2 modes can turn on automatically");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@EnableFlags(Flags.FLAG_MODES_UI)
|
||||||
|
public void getSoundSummary_on_noDescription() {
|
||||||
|
ZenModeConfig config = new ZenModeConfig();
|
||||||
|
config.manualRule.conditionId = Uri.EMPTY;
|
||||||
|
config.manualRule.pkg = "android";
|
||||||
|
config.manualRule.zenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS;
|
||||||
|
config.manualRule.condition = new Condition(Uri.EMPTY, "", STATE_TRUE, SOURCE_UNKNOWN);
|
||||||
|
assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_IMPORTANT_INTERRUPTIONS, config))
|
||||||
|
.isEqualTo("On");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@EnableFlags(Flags.FLAG_MODES_UI)
|
||||||
|
public void getSoundSummary_on_manualDescription() {
|
||||||
|
ZenModeConfig config = new ZenModeConfig();
|
||||||
|
config.manualRule.conditionId = ZenModeConfig.toCountdownConditionId(
|
||||||
|
System.currentTimeMillis() + 10000, false);
|
||||||
|
config.manualRule.pkg = "android";
|
||||||
|
config.manualRule.zenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS;
|
||||||
|
config.manualRule.condition = new Condition(Uri.EMPTY, "", STATE_TRUE, SOURCE_UNKNOWN);
|
||||||
|
assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_IMPORTANT_INTERRUPTIONS, config))
|
||||||
|
.startsWith("On /");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@EnableFlags(Flags.FLAG_MODES_UI)
|
||||||
|
public void getSoundSummary_on_automatic() {
|
||||||
|
ZenModeConfig config = new ZenModeConfig();
|
||||||
|
ZenModeConfig.ZenRule rule = new ZenModeConfig.ZenRule();
|
||||||
|
rule.configurationActivity = new ComponentName("a", "a");
|
||||||
|
rule.component = new ComponentName("b", "b");
|
||||||
|
rule.conditionId = new Uri.Builder().scheme("hello").build();
|
||||||
|
rule.condition = new Condition(rule.conditionId, "", STATE_TRUE);
|
||||||
|
rule.enabled = true;
|
||||||
|
rule.creationTime = 123;
|
||||||
|
rule.id = "id";
|
||||||
|
rule.zenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS;
|
||||||
|
rule.modified = true;
|
||||||
|
rule.name = "name";
|
||||||
|
rule.snoozing = false;
|
||||||
|
rule.pkg = "b";
|
||||||
|
config.automaticRules.put("key", rule);
|
||||||
|
|
||||||
|
assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_IMPORTANT_INTERRUPTIONS, config))
|
||||||
|
.startsWith("On /");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user