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

Make legacy DND pages not searchable

Browse Source 
Flag: EXEMPT unflaggable
Fixes: 341726633
Test: manual, searching in settings
Change-Id: I592a1775a890711086db1099fb333c1dc1a11e0b
This commit is contained in:
Julia Reynolds
2024-07-03 17:03:51 -04:00
committed by Matías Hernández
parent d12a36466d
commit 0c5eb711a9
10 changed files with 1 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/settings/notification/zen/ZenModeAutomationSettings.java
View File

@@ -30,18 +30,15 @@ import android.view.MenuItem;
import androidx.fragment.app.Fragment;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.utils.ManagedServiceSettings;
import com.android.settings.utils.ZenServiceListing;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@SearchIndexable
public class ZenModeAutomationSettings extends ZenModeSettingsBase {
public static final String DELETE = "DELETE_RULE";
protected final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig();
@@ -133,25 +130,4 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
return super.onOptionsItemSelected(item);
}
}
/**
* For Search.
*/
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_automation_settings) {
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context);
keys.add(ZenModeAddAutomaticRulePreferenceController.KEY);
keys.add(ZenModeAutomaticRulesPreferenceController.KEY);
return keys;
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null, null, null);
}
};
}

15
src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java
View File

@@ -29,16 +29,13 @@ import android.content.Context;
import android.os.Bundle;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable
public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implements Indexable {
@Override
@@ -88,16 +85,4 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement
public int getMetricsCategory() {
return SettingsEnums.ZEN_WHAT_TO_BLOCK;
}
/**
* For Search.
*/
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_block_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, null);
}
};
}

16
src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java
View File

@@ -25,15 +25,12 @@ import androidx.fragment.app.Fragment;
import com.android.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable
public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements
Indexable {
private final String TAG = "ZenBypassingApps";
@@ -74,17 +71,4 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements
public int getMetricsCategory() {
return SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APPS;
}
/**
* For Search.
*/
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_bypassing_apps) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null, null, null);
}
};
}

27
src/com/android/settings/notification/zen/ZenModeCallsSettings.java
View File

@@ -18,14 +18,11 @@ package com.android.settings.notification.zen;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@@ -33,7 +30,6 @@ import java.util.List;
/**
* DND Calls Settings page to determine which priority senders can bypass DND.
*/
@SearchIndexable
public class ZenModeCallsSettings extends ZenModeSettingsBase {
@Override
@@ -64,27 +60,4 @@ public class ZenModeCallsSettings extends ZenModeSettingsBase {
public int getMetricsCategory() {
return SettingsEnums.DND_CALLS;
}
/**
* For Search.
*/
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
final ArrayList<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.zen_mode_calls_settings;
result.add(sir);
return result;
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null);
}
};
}

27
src/com/android/settings/notification/zen/ZenModeMessagesSettings.java
View File

@@ -18,14 +18,11 @@ package com.android.settings.notification.zen;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +31,6 @@ import java.util.List;
* DND Messages Settings page to determine which priority senders can bypass DND.
* "Messages" include SMS, MMS, and messaging apps.
*/
@SearchIndexable
public class ZenModeMessagesSettings extends ZenModeSettingsBase {
@Override
@@ -62,27 +58,4 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase {
public int getMetricsCategory() {
return SettingsEnums.DND_MESSAGES;
}
/**
* For Search.
*/
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
final ArrayList<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.zen_mode_messages_settings;
result.add(sir);
return result;
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null);
}
};
}

17
src/com/android/settings/notification/zen/ZenModePeopleSettings.java
View File

@@ -26,16 +26,13 @@ import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable
public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexable {
@Override
@@ -74,18 +71,4 @@ public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexa
public int getMetricsCategory() {
return SettingsEnums.DND_PEOPLE;
}
/**
* For Search.
*/
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_people_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null, null, null,
null, null);
}
};
}

17
src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java
View File

@@ -21,17 +21,14 @@ import android.content.Context;
import android.os.Bundle;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.widget.FooterPreference;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase implements Indexable {
@Override
@@ -72,16 +69,4 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im
public int getMetricsCategory() {
return SettingsEnums.SETTINGS_ZEN_NOTIFICATIONS;
}
/**
* For Search.
*/
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_restrict_notifications_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, null);
}
};
}

24
src/com/android/settings/notification/zen/ZenModeSettings.java
View File

@@ -42,10 +42,8 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.HashMap;
@@ -55,7 +53,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.function.Predicate;
@SearchIndexable
public class ZenModeSettings extends ZenModeSettingsBase {
@Override
public void onResume() {
@@ -354,25 +351,4 @@ public class ZenModeSettings extends ZenModeSettingsBase {
return "";
}
}
/**
* For Search.
*/
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_settings) {
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
keys.add(ZenModeDurationPreferenceController.KEY);
return keys;
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context
context) {
return buildPreferenceControllers(context, null, null,
null, null);
}
};
}

21
src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java
View File

@@ -20,11 +20,9 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@@ -32,7 +30,6 @@ import java.util.List;
/**
* Settings > Sound > Do Not Disturb > Alarms & Other Interruptions
*/
@SearchIndexable
public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implements Indexable {
@Override
@@ -61,22 +58,4 @@ public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implement
public int getMetricsCategory() {
return SettingsEnums.NOTIFICATION_ZEN_MODE_PRIORITY;
}
/**
* For Search.
*/
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_sound_vibration_settings) {
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context);
return keys;
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, null);
}
};
}

9
tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java
View File

@@ -98,13 +98,4 @@ public class ZenModeSettingsTest {
assertThat(mBuilder.getCallsSettingSummary(policy))
.isEqualTo("Starred contacts and repeat callers");
}
@Test
public void searchProvider_shouldIndexDefaultXml() {
final List<SearchIndexableResource> sir = ZenModeSettings.SEARCH_INDEX_DATA_PROVIDER
.getXmlResourcesToIndex(mContext, true /* enabled */);
assertThat(sir).hasSize(1);
assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.zen_mode_settings);
}
}