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

Merge changes Ic95d219b,I58d82cbc

Browse Source 
* changes:
  Don't add any trust agents if the controller is not available.
  Introduce boolean flags to show/hide items in Security & location.
This commit is contained in:
TreeHugger Robot
2018-01-18 19:54:09 +00:00
committed by Android (Google) Code Review
parent e1bb0c2f4c cf6d84109b
commit be090e9fe9
14 changed files with 193 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/values/bools.xml
View File

@@ -120,6 +120,24 @@
<!-- Whether vibrate_input_devices should be shown or not. -->
<bool name="config_show_vibrate_input_devices">true</bool>
<!-- Whether manage_device_admin should be shown or not. -->
<bool name="config_show_manage_device_admin">true</bool>
<!-- Whether unlock_set_or_change should be shown or not. -->
<bool name="config_show_unlock_set_or_change">true</bool>
<!-- Whether screen_pinning_settings should be shown or not. -->
<bool name="config_show_screen_pinning_settings">true</bool>
<!-- Whether manage_trust_agents should be shown or not. -->
<bool name="config_show_manage_trust_agents">true</bool>
<!-- Whether show_password should be shown or not. -->
<bool name="config_show_show_password">true</bool>
<!-- Whether trust_agent_click_intent should be shown or not. -->
<bool name="config_show_trust_agent_click_intent">true</bool>
<!-- Whether wallpaper attribution should be shown or not. -->
<bool name="config_show_wallpaper_attribution">true</bool>

2
src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
View File

@@ -45,7 +45,7 @@ public class ManageDeviceAdminPreferenceController extends AbstractPreferenceCon
@Override
public boolean isAvailable() {
return true;
return mContext.getResources().getBoolean(R.bool.config_show_manage_device_admin);
}
@Override

2
src/com/android/settings/security/ChangeScreenLockPreferenceController.java
View File

@@ -67,7 +67,7 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont
@Override
public boolean isAvailable() {
return true;
return mContext.getResources().getBoolean(R.bool.config_show_unlock_set_or_change);
}
@Override

3
src/com/android/settings/security/ScreenPinningPreferenceController.java
View File

@@ -33,7 +33,8 @@ public class ScreenPinningPreferenceController extends BasePreferenceController
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
return mContext.getResources().getBoolean(R.bool.config_show_screen_pinning_settings)
? AVAILABLE : DISABLED_UNSUPPORTED;
}
@Override

5
src/com/android/settings/security/ShowPasswordPreferenceController.java
View File

@@ -23,6 +23,7 @@ import android.provider.Settings;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.R;
public class ShowPasswordPreferenceController extends TogglePreferenceController {
@@ -53,7 +54,9 @@ public class ShowPasswordPreferenceController extends TogglePreferenceController
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
return mContext.getResources().getBoolean(R.bool.config_show_show_password)
? AVAILABLE : DISABLED_UNSUPPORTED;
}
}

3
src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
View File

@@ -47,7 +47,8 @@ public class ManageTrustAgentsPreferenceController extends BasePreferenceControl
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
return mContext.getResources().getBoolean(R.bool.config_show_manage_trust_agents)
? AVAILABLE : DISABLED_UNSUPPORTED;
}
@Override

6
src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
View File

@@ -79,7 +79,7 @@ public class TrustAgentListPreferenceController extends AbstractPreferenceContro
@Override
public boolean isAvailable() {
return true;
return mContext.getResources().getBoolean(R.bool.config_show_trust_agent_click_intent);
}
@Override
@@ -146,6 +146,10 @@ public class TrustAgentListPreferenceController extends AbstractPreferenceContro
mSecurityCategory.removePreference(oldAgent);
}
}
// If for some reason the preference is no longer available, don't proceed to add.
if (!isAvailable()) {
return;
}
// Then add new ones.
final boolean hasSecurity = mLockPatternUtils.isSecure(MY_USER_ID);
final List<TrustAgentManager.TrustAgentComponentInfo> agents =

6
tests/robotests/res/values-mcc999/config.xml
View File

@@ -36,6 +36,12 @@
<bool name="config_show_enabled_vr_listeners">false</bool>
<bool name="config_location_mode_available">false</bool>
<bool name="config_show_location_scanning">false</bool>
<bool name="config_show_manage_device_admin">false</bool>
<bool name="config_show_unlock_set_or_change">false</bool>
<bool name="config_show_screen_pinning_settings">false</bool>
<bool name="config_show_manage_trust_agents">false</bool>
<bool name="config_show_show_password">false</bool>
<bool name="config_show_trust_agent_click_intent">false</bool>
<bool name="config_show_wallpaper_attribution">false</bool>
<bool name="config_show_default_home">false</bool>
<bool name="config_show_accessibility_shortcut_preference">false</bool>

23
tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
View File

@@ -17,9 +17,12 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.res.Resources;
import android.support.v7.preference.Preference;
import com.android.settings.R;
@@ -33,6 +36,7 @@ import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
/**
@@ -42,15 +46,17 @@ import org.robolectric.annotation.Config;
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class ManageDeviceAdminPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@Mock
private Resources mResources;
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
private ManageDeviceAdminPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new ManageDeviceAdminPreferenceController(mContext);
}
@@ -61,24 +67,31 @@ public final class ManageDeviceAdminPreferenceControllerTest {
when(mFeatureFactory.enterprisePrivacyFeatureProvider
.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile()).thenReturn(0);
when(mContext.getResources().getString(R.string.number_of_device_admins_none))
when (mContext.getResources()).thenReturn(mResources);
when(mResources.getString(R.string.number_of_device_admins_none))
.thenReturn("no apps");
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("no apps");
when(mFeatureFactory.enterprisePrivacyFeatureProvider
.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile()).thenReturn(5);
when(mContext.getResources().getQuantityString(R.plurals.number_of_device_admins, 5, 5))
when(mResources.getQuantityString(R.plurals.number_of_device_admins, 5, 5))
.thenReturn("5 active apps");
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("5 active apps");
}
@Test
public void testIsAvailable() {
public void isAvailable_byDefault_isTrue() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_whenNotVisible_isFalse() {
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void testHandlePreferenceTreeClick() {
assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))

85
tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java Normal file
View File

@@ -0,0 +1,85 @@
/*
* Copyright (C) 2018 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.security;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.os.UserManager;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(
manifest = TestConfig.MANIFEST_PATH,
sdk = TestConfig.SDK_VERSION,
shadows = {
ShadowUtils.class
})
public class ChangeScreenLockPreferenceControllerTest {
@Mock
private LockPatternUtils mLockPatternUtils;
@Mock
private UserManager mUserManager;
@Mock
private DevicePolicyManager mDevicePolicyManager;
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
private ChangeScreenLockPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
mFeatureFactory = FakeFeatureFactory.setupForTest();
when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
.thenReturn(mLockPatternUtils);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
.thenReturn(mDevicePolicyManager);
mController = new ChangeScreenLockPreferenceController(mContext, null /* Host */ );
}
@Test
public void testDeviceAdministrators_byDefault_shouldBeShown() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
@Config(qualifiers = "mcc999")
public void testDeviceAdministrators_ifDisabled_shouldNotBeShown() {
assertThat(mController.isAvailable()).isFalse();
}
}

10
tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
View File

@@ -59,8 +59,14 @@ public class ScreenPinningPreferenceControllerTest {
}
@Test
public void isAlwaysAvailable() {
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
public void isAvailable_byDefault_isTrue() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_whenNotVisible_isFalse() {
assertThat(mController.isAvailable()).isFalse();
}
@Test

10
tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
View File

@@ -70,8 +70,14 @@ public class ShowPasswordPreferenceControllerTest {
}
@Test
public void isAlwaysAvailable() {
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
public void isAvailable_byDefault_isTrue() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_whenNotVisible_isFalse() {
assertThat(mController.isAvailable()).isFalse();
}
@Test

10
tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
View File

@@ -75,8 +75,14 @@ public class ManageTrustAgentsPreferenceControllerTest {
}
@Test
public void isAlwaysAvailable() {
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
public void isAvailable_byDefault_isTrue() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_whenNotVisible_isFalse() {
assertThat(mController.isAvailable()).isFalse();
}
@Test

27
tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
View File

@@ -25,6 +25,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -103,6 +104,12 @@ public class TrustAgentListPreferenceControllerTest {
assertThat(mController).isInstanceOf(PreferenceControllerMixin.class);
}
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_whenNotVisible_isFalse() {
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void onResume_shouldClearOldAgents() {
final Preference oldAgent = new Preference(mActivity);
@@ -135,4 +142,24 @@ public class TrustAgentListPreferenceControllerTest {
verify(mCategory, atLeastOnce()).addPreference(any(Preference.class));
}
@Test
@Config(qualifiers = "mcc999")
public void onResume_ifNotAvailable_shouldNotAddNewAgents() {
final List<TrustAgentManager.TrustAgentComponentInfo> agents = new ArrayList<>();
final TrustAgentManager.TrustAgentComponentInfo agent = mock(
TrustAgentManager.TrustAgentComponentInfo.class);
agent.title = "Test_title";
agent.summary = "test summary";
agent.componentName = new ComponentName("pkg", "agent");
agent.admin = null;
agents.add(agent);
when(mTrustAgentManager.getActiveTrustAgents(mActivity, mLockPatternUtils))
.thenReturn(agents);
mController.displayPreference(mScreen);
mController.onResume();
verify(mCategory, never()).addPreference(any(Preference.class));
}
}