Toggle Security and Privacy entries depending on SafetyCenter status. (9ef7f723) · Commits · e / os / android_packages_apps_Settings

res/xml/top_level_settings.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -142,7 +142,8 @@
		android:order="-40"
		android:title="@string/privacy_dashboard_title"
		android:summary="@string/privacy_dashboard_summary"
		settings:highlightableMenuKey="@string/menu_key_privacy"/>
		settings:highlightableMenuKey="@string/menu_key_privacy"
		settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"/>

		<com.android.settings.widget.HomepagePreference
		android:fragment="com.android.settings.location.LocationSettings"

src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 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.privacy;

		import android.annotation.NonNull;
		import android.content.Context;

		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.safetycenter.SafetyCenterStatus;

		/** The preference controller for the top level privacy tile. */
		public class TopLevelPrivacyEntryPreferenceController extends BasePreferenceController {

		public TopLevelPrivacyEntryPreferenceController(@NonNull Context context, @NonNull String key) {
		super(context, key);
		}

		@Override
		public int getAvailabilityStatus() {
		if (!SafetyCenterStatus.isEnabled()) {
		return AVAILABLE;
		}
		return CONDITIONALLY_UNAVAILABLE;
		}
		}

src/com/android/settings/safetycenter/SafetyCenterStatus.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ public class SafetyCenterStatus {

		/** Whether SafetyCenter page is enabled. */
		@VisibleForTesting
		static final String SAFETY_CENTER_IS_ENABLED = "safety_center_is_enabled";
		public static final String SAFETY_CENTER_IS_ENABLED = "safety_center_is_enabled";

		/** Returns true is SafetyCenter page is enabled, false otherwise. */
		public static boolean isEnabled() {

src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import androidx.preference.Preference;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.core.SubSettingLauncher;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.safetycenter.SafetyCenterStatus;

		public class TopLevelSecurityEntryPreferenceController extends BasePreferenceController {

		@@ -37,8 +38,11 @@ public class TopLevelSecurityEntryPreferenceController extends BasePreferenceCon

		@Override
		public int getAvailabilityStatus() {
		if (!SafetyCenterStatus.isEnabled()) {
		return AVAILABLE;
		}
		return CONDITIONALLY_UNAVAILABLE;
		}

		@Override
		public boolean handlePreferenceTreeClick(Preference preference) {

tests/unit/src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceControllerTest.java

0 → 100644

+84 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 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.privacy;

		import static com.google.common.truth.Truth.assertThat;

		import android.content.Context;
		import android.provider.DeviceConfig;
		import android.provider.Settings;

		import androidx.test.ext.junit.runners.AndroidJUnit4;

		import com.android.settings.safetycenter.SafetyCenterStatus;
		import com.android.settings.security.TopLevelSecurityEntryPreferenceController;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;

		@RunWith(AndroidJUnit4.class)
		public class TopLevelPrivacyEntryPreferenceControllerTest {

		private static final String PREFERENCE_KEY = "top_level_privacy";

		private TopLevelPrivacyEntryPreferenceController mTopLevelPrivacyEntryPreferenceController;

		@Mock
		private Context mContext;

		@Before
		public void setUp() {
		DeviceConfig.resetToDefaults(Settings.RESET_MODE_PACKAGE_DEFAULTS,
		DeviceConfig.NAMESPACE_PRIVACY);

		mTopLevelPrivacyEntryPreferenceController =
		new TopLevelPrivacyEntryPreferenceController(mContext, PREFERENCE_KEY);
		}

		@After
		public void tearDown() {
		DeviceConfig.resetToDefaults(Settings.RESET_MODE_PACKAGE_DEFAULTS,
		DeviceConfig.NAMESPACE_PRIVACY);
		}

		@Test
		public void getAvailabilityStatus_whenSafetyCenterEnabled_returnsUnavailable() {
		DeviceConfig.setProperty(
		DeviceConfig.NAMESPACE_PRIVACY,
		SafetyCenterStatus.SAFETY_CENTER_IS_ENABLED,
		/* value = */ Boolean.toString(true),
		/* makeDefault = */ false);

		assertThat(mTopLevelPrivacyEntryPreferenceController.getAvailabilityStatus())
		.isEqualTo(TopLevelSecurityEntryPreferenceController.CONDITIONALLY_UNAVAILABLE);
		}

		@Test
		public void getAvailabilityStatus_whenSafetyCenterDisabled_returnsAvailable() {
		DeviceConfig.setProperty(
		DeviceConfig.NAMESPACE_PRIVACY,
		SafetyCenterStatus.SAFETY_CENTER_IS_ENABLED,
		/* value = */ Boolean.toString(false),
		/* makeDefault = */ false);

		assertThat(mTopLevelPrivacyEntryPreferenceController.getAvailabilityStatus())
		.isEqualTo(TopLevelSecurityEntryPreferenceController.AVAILABLE);
		}
		}