Toggle Security and Privacy entries depending on SafetyCenter status.
Test: atest SettingsUnitTests Bug: 206798563 Change-Id: I4c813a35754fa7ed5db630fa4c41ef14b469878c
This commit is contained in:
@@ -142,7 +142,8 @@
|
|||||||
android:order="-40"
|
android:order="-40"
|
||||||
android:title="@string/privacy_dashboard_title"
|
android:title="@string/privacy_dashboard_title"
|
||||||
android:summary="@string/privacy_dashboard_summary"
|
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
|
<com.android.settings.widget.HomepagePreference
|
||||||
android:fragment="com.android.settings.location.LocationSettings"
|
android:fragment="com.android.settings.location.LocationSettings"
|
||||||
|
@@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* 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;
|
||||||
|
}
|
||||||
|
}
|
@@ -25,7 +25,7 @@ public class SafetyCenterStatus {
|
|||||||
|
|
||||||
/** Whether SafetyCenter page is enabled. */
|
/** Whether SafetyCenter page is enabled. */
|
||||||
@VisibleForTesting
|
@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. */
|
/** Returns true is SafetyCenter page is enabled, false otherwise. */
|
||||||
public static boolean isEnabled() {
|
public static boolean isEnabled() {
|
||||||
|
@@ -24,6 +24,7 @@ import androidx.preference.Preference;
|
|||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
import com.android.settings.core.SubSettingLauncher;
|
import com.android.settings.core.SubSettingLauncher;
|
||||||
import com.android.settings.overlay.FeatureFactory;
|
import com.android.settings.overlay.FeatureFactory;
|
||||||
|
import com.android.settings.safetycenter.SafetyCenterStatus;
|
||||||
|
|
||||||
public class TopLevelSecurityEntryPreferenceController extends BasePreferenceController {
|
public class TopLevelSecurityEntryPreferenceController extends BasePreferenceController {
|
||||||
|
|
||||||
@@ -37,7 +38,10 @@ public class TopLevelSecurityEntryPreferenceController extends BasePreferenceCon
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
return AVAILABLE;
|
if (!SafetyCenterStatus.isEnabled()) {
|
||||||
|
return AVAILABLE;
|
||||||
|
}
|
||||||
|
return CONDITIONALLY_UNAVAILABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -0,0 +1,84 @@
|
|||||||
|
/*
|
||||||
|
* 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);
|
||||||
|
}
|
||||||
|
}
|
@@ -25,14 +25,18 @@ import static org.mockito.Mockito.when;
|
|||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
import android.provider.DeviceConfig;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
import androidx.test.core.app.ApplicationProvider;
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
import com.android.settings.SettingsActivity;
|
import com.android.settings.SettingsActivity;
|
||||||
|
import com.android.settings.safetycenter.SafetyCenterStatus;
|
||||||
import com.android.settings.testutils.FakeFeatureFactory;
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
|
|
||||||
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
@@ -60,6 +64,9 @@ public class TopLevelSecurityEntryPreferenceControllerTest {
|
|||||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||||
mSecuritySettingsFeatureProvider = mFeatureFactory.getSecuritySettingsFeatureProvider();
|
mSecuritySettingsFeatureProvider = mFeatureFactory.getSecuritySettingsFeatureProvider();
|
||||||
|
|
||||||
|
DeviceConfig.resetToDefaults(Settings.RESET_MODE_PACKAGE_DEFAULTS,
|
||||||
|
DeviceConfig.NAMESPACE_PRIVACY);
|
||||||
|
|
||||||
mPreference = new Preference(ApplicationProvider.getApplicationContext());
|
mPreference = new Preference(ApplicationProvider.getApplicationContext());
|
||||||
mPreference.setKey(PREFERENCE_KEY);
|
mPreference.setKey(PREFERENCE_KEY);
|
||||||
|
|
||||||
@@ -68,6 +75,12 @@ public class TopLevelSecurityEntryPreferenceControllerTest {
|
|||||||
new TopLevelSecurityEntryPreferenceController(mContext, PREFERENCE_KEY);
|
new TopLevelSecurityEntryPreferenceController(mContext, PREFERENCE_KEY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void tearDown() {
|
||||||
|
DeviceConfig.resetToDefaults(Settings.RESET_MODE_PACKAGE_DEFAULTS,
|
||||||
|
DeviceConfig.NAMESPACE_PRIVACY);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void handlePreferenceTreeClick_forDifferentPreferenceKey_isNotHandled() {
|
public void handlePreferenceTreeClick_forDifferentPreferenceKey_isNotHandled() {
|
||||||
Preference preference = new Preference(ApplicationProvider.getApplicationContext());
|
Preference preference = new Preference(ApplicationProvider.getApplicationContext());
|
||||||
@@ -121,4 +134,28 @@ public class TopLevelSecurityEntryPreferenceControllerTest {
|
|||||||
|
|
||||||
assertThat(preferenceHandled).isFalse();
|
assertThat(preferenceHandled).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_whenSafetyCenterEnabled_returnsUnavailable() {
|
||||||
|
DeviceConfig.setProperty(
|
||||||
|
DeviceConfig.NAMESPACE_PRIVACY,
|
||||||
|
SafetyCenterStatus.SAFETY_CENTER_IS_ENABLED,
|
||||||
|
/* value = */ Boolean.toString(true),
|
||||||
|
/* makeDefault = */ false);
|
||||||
|
|
||||||
|
assertThat(mTopLevelSecurityEntryPreferenceController.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(mTopLevelSecurityEntryPreferenceController.getAvailabilityStatus())
|
||||||
|
.isEqualTo(TopLevelSecurityEntryPreferenceController.AVAILABLE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user