Remove DynamicAvailabilityPreferenceController.
- This class is over complex to use, and get in the way of show/hide pref when availability change. - The function from DynamicAvailabilityPreferenceController can be done with PreferenceCategoryController. Bug: 68956750 Bug: 32953042 Test: robotests Change-Id: Ia7b7e214c072b8c77f5de3d959fdb1dc79217f76
This commit is contained in:
@@ -17,15 +17,12 @@
|
||||
package com.android.settings.enterprise;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v7.preference.Preference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.PreferenceAvailabilityObserver;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -43,8 +40,6 @@ public abstract class CaCertsPreferenceControllerTestBase {
|
||||
protected Context mContext;
|
||||
protected FakeFeatureFactory mFeatureFactory;
|
||||
protected CaCertsPreferenceControllerBase mController;
|
||||
@Mock
|
||||
private PreferenceAvailabilityObserver mObserver;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
@@ -52,12 +47,6 @@ public abstract class CaCertsPreferenceControllerTestBase {
|
||||
FakeFeatureFactory.setupForTest(mContext);
|
||||
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
|
||||
mController = createController();
|
||||
mController.setAvailabilityObserver(mObserver);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetAvailabilityObserver() {
|
||||
assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -75,11 +64,9 @@ public abstract class CaCertsPreferenceControllerTestBase {
|
||||
public void testIsAvailable() {
|
||||
mockGetNumberOfCaCerts(0);
|
||||
assertThat(mController.isAvailable()).isFalse();
|
||||
verify(mObserver).onPreferenceAvailabilityUpdated(getPreferenceKey(), false);
|
||||
|
||||
mockGetNumberOfCaCerts(10);
|
||||
assertThat(mController.isAvailable()).isTrue();
|
||||
verify(mObserver).onPreferenceAvailabilityUpdated(getPreferenceKey(), true);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user