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

Remove obsolete zen-related entries from CustomSiteMapRegistry

Browse Source 
These pages no longer exist with MODES_UI.

Bug: 346789065
Test: atest CustomSiteMapRegistryTest
Flag: android.app.modes_ui
Change-Id: I254b4eb15a71bf7a6765c1ea7d0cb31c59fe2f0c
This commit is contained in:
Matías Hernández
2024-09-27 19:17:06 +02:00
parent aad13d8836
commit c238b3b1cf
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/search/CustomSiteMapRegistry.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.search; package com.android.settings.search;
import android.app.Flags;
import android.util.ArrayMap; import android.util.ArrayMap;
import com.android.settings.backup.UserBackupSettingsActivity; import com.android.settings.backup.UserBackupSettingsActivity;
@@ -55,8 +56,10 @@ public class CustomSiteMapRegistry {
ConnectedDeviceDashboardFragment.class.getName()); ConnectedDeviceDashboardFragment.class.getName());
CUSTOM_SITE_MAP.put(UserBackupSettingsActivity.class.getName(), CUSTOM_SITE_MAP.put(UserBackupSettingsActivity.class.getName(),
SystemDashboardFragment.class.getName()); SystemDashboardFragment.class.getName());
CUSTOM_SITE_MAP.put(ZenModeBlockedEffectsSettings.class.getName(), if (!Flags.modesUi()) {
ZenModeRestrictNotificationsSettings.class.getName()); CUSTOM_SITE_MAP.put(ZenModeBlockedEffectsSettings.class.getName(),
ZenModeRestrictNotificationsSettings.class.getName());
}
CUSTOM_SITE_MAP.put(GestureNavigationSettingsFragment.class.getName(), CUSTOM_SITE_MAP.put(GestureNavigationSettingsFragment.class.getName(),
SystemNavigationGestureSettings.class.getName()); SystemNavigationGestureSettings.class.getName());
} }

22
tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java
View File

@@ -18,6 +18,12 @@ package com.android.settings.search;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.app.Flags;
import android.platform.test.annotations.RequiresFlagsDisabled;
import android.platform.test.annotations.RequiresFlagsEnabled;
import android.platform.test.flag.junit.CheckFlagsRule;
import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.backup.UserBackupSettingsActivity; import com.android.settings.backup.UserBackupSettingsActivity;
@@ -35,12 +41,16 @@ import com.android.settings.security.SecuritySettings;
import com.android.settings.security.screenlock.ScreenLockSettings; import com.android.settings.security.screenlock.ScreenLockSettings;
import com.android.settings.system.SystemDashboardFragment; import com.android.settings.system.SystemDashboardFragment;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class CustomSiteMapRegistryTest { public class CustomSiteMapRegistryTest {
@Rule
public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
@Test @Test
public void shouldContainScreenLockSettingsPairs() { public void shouldContainScreenLockSettingsPairs() {
assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(ScreenLockSettings.class.getName())) assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(ScreenLockSettings.class.getName()))
@@ -75,12 +85,20 @@ public class CustomSiteMapRegistryTest {
} }
@Test @Test
@RequiresFlagsDisabled(Flags.FLAG_MODES_UI)
public void shouldContainZenModeBlockedEffectsSettingsPairs() { public void shouldContainZenModeBlockedEffectsSettingsPairs() {
assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get( assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP).containsEntry(
ZenModeBlockedEffectsSettings.class.getName())).isEqualTo( ZenModeBlockedEffectsSettings.class.getName(),
ZenModeRestrictNotificationsSettings.class.getName()); ZenModeRestrictNotificationsSettings.class.getName());
} }
@Test
@RequiresFlagsEnabled(Flags.FLAG_MODES_UI)
public void shouldNotContainZenModeBlockedEffectsSettingsPairs() {
assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP)
.doesNotContainKey(ZenModeBlockedEffectsSettings.class.getName());
}
@Test @Test
public void shouldContainGestureNavigationSettingsFragmentPairs() { public void shouldContainGestureNavigationSettingsFragmentPairs() {
assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get( assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(