Migrate ManagedProfileSettings to DashboardFragment
- Move preference related logic to Controllers. - Add some test cases for controllers. Test: manual Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core atest SettingsGatewayTest UniquePreferenceTest Change-Id: If4fcd7bf572672c886d5c91b2d15013817d1aa67
This commit is contained in:
@@ -3,6 +3,7 @@ com.android.settings.bluetooth.DevicePickerFragment
|
||||
com.android.settings.bluetooth.BluetoothDeviceDetailsFragment
|
||||
com.android.settings.bluetooth.BluetoothPairingDetail
|
||||
com.android.settings.accounts.AccountDetailDashboardFragment
|
||||
com.android.settings.accounts.ManagedProfileSettings
|
||||
com.android.settings.fuelgauge.PowerUsageAnomalyDetails
|
||||
com.android.settings.fuelgauge.AdvancedPowerUsageDetail
|
||||
com.android.settings.development.featureflags.FeatureFlagsDashboard
|
||||
|
@@ -21,7 +21,6 @@ com.android.settings.applications.appinfo.WriteSettingsDetails
|
||||
com.android.settings.applications.ProcessStatsSummary
|
||||
com.android.settings.users.RestrictedProfileSettings
|
||||
com.android.settings.accounts.ChooseAccountActivity
|
||||
com.android.settings.accounts.ManagedProfileSettings
|
||||
com.android.settings.accessibility.ToggleAutoclickPreferenceFragment
|
||||
com.android.settings.applications.AppLaunchSettings
|
||||
com.android.settings.applications.ProcessStatsUi
|
||||
|
@@ -0,0 +1,104 @@
|
||||
/*
|
||||
* 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.accounts;
|
||||
|
||||
import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
import android.os.UserHandle;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settingslib.RestrictedSwitchPreference;
|
||||
|
||||
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;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
public class ContactSearchPreferenceControllerTest {
|
||||
|
||||
private static final String PREF_KEY = "contacts_search";
|
||||
|
||||
@Mock
|
||||
private UserHandle mManagedUser;
|
||||
|
||||
private Context mContext;
|
||||
private ContactSearchPreferenceController mController;
|
||||
private RestrictedSwitchPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mController = new ContactSearchPreferenceController(mContext, PREF_KEY);
|
||||
mController.setManagedUser(mManagedUser);
|
||||
mPreference = spy(new RestrictedSwitchPreference(mContext));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_noManagedUser_DISABLED() {
|
||||
mController.setManagedUser(null);
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isNotEqualTo(ContactSearchPreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_hasManagedUser_AVAILABLE() {
|
||||
mController.setManagedUser(mManagedUser);
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(ContactSearchPreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_shouldRefreshContent() {
|
||||
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||
MANAGED_PROFILE_CONTACT_REMOTE_SEARCH, 0, mManagedUser.getIdentifier());
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
|
||||
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||
MANAGED_PROFILE_CONTACT_REMOTE_SEARCH, 1, mManagedUser.getIdentifier());
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_preferenceShouldBeDisabled() {
|
||||
mController.updateState(mPreference);
|
||||
verify(mPreference).setDisabledByAdmin(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_shouldUpdateProviderValue() {
|
||||
mController.onPreferenceChange(mPreference, false);
|
||||
assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
|
||||
MANAGED_PROFILE_CONTACT_REMOTE_SEARCH, 1, mManagedUser.getIdentifier()))
|
||||
.isEqualTo(0);
|
||||
|
||||
mController.onPreferenceChange(mPreference, true);
|
||||
assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
|
||||
MANAGED_PROFILE_CONTACT_REMOTE_SEARCH, 0, mManagedUser.getIdentifier()))
|
||||
.isEqualTo(1);
|
||||
}
|
||||
}
|
@@ -0,0 +1,119 @@
|
||||
/*
|
||||
* 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.accounts;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.support.v14.preference.SwitchPreference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
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;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
public class WorkModePreferenceControllerTest {
|
||||
|
||||
private static final String PREF_KEY = "work_mode";
|
||||
|
||||
@Mock
|
||||
private UserManager mUserManager;
|
||||
@Mock
|
||||
private UserHandle mManagedUser;
|
||||
|
||||
private Context mContext;
|
||||
private WorkModePreferenceController mController;
|
||||
private SwitchPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
|
||||
|
||||
mController = new WorkModePreferenceController(mContext, PREF_KEY);
|
||||
mController.setManagedUser(mManagedUser);
|
||||
mPreference = new SwitchPreference(mContext);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_noManagedUser_DISABLED() {
|
||||
mController.setManagedUser(null);
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isNotEqualTo(WorkModePreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_hasManagedUser_AVAILABLE() {
|
||||
mController.setManagedUser(mManagedUser);
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(WorkModePreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_shouldRefreshContent() {
|
||||
when(mUserManager.isQuietModeEnabled(any(UserHandle.class)))
|
||||
.thenReturn(false);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
assertThat(mPreference.getSummary())
|
||||
.isEqualTo(mContext.getText(R.string.work_mode_on_summary));
|
||||
|
||||
when(mUserManager.isQuietModeEnabled(any(UserHandle.class)))
|
||||
.thenReturn(true);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
assertThat(mPreference.getSummary())
|
||||
.isEqualTo(mContext.getText(R.string.work_mode_off_summary));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_shouldRequestQuietModeEnabled() {
|
||||
mController.onPreferenceChange(mPreference, true);
|
||||
verify(mUserManager).requestQuietModeEnabled(false, mManagedUser);
|
||||
|
||||
mController.onPreferenceChange(mPreference, false);
|
||||
verify(mUserManager).requestQuietModeEnabled(true, mManagedUser);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onStart_shouldRegisterReceiver() {
|
||||
mController.onStart();
|
||||
verify(mContext).registerReceiver(eq(mController.mReceiver), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onStop_shouldUnregisterReceiver() {
|
||||
// register it first
|
||||
mContext.registerReceiver(mController.mReceiver, null);
|
||||
|
||||
mController.onStop();
|
||||
verify(mContext).unregisterReceiver(mController.mReceiver);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user