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

Merge "Implement PreferenceControllerMixin in TrustAgentController"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-17 00:34:39 +00:00
committed by Android (Google) Code Review
parent 85cd77c9f2 568f01dfc0
commit de64baeb0e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import android.text.TextUtils;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.security.SecurityFeatureProvider;
@@ -46,7 +47,8 @@ import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
import java.util.List;
public class TrustAgentListPreferenceController extends AbstractPreferenceController
implements LifecycleObserver, OnSaveInstanceState, OnCreate, OnResume {
implements PreferenceControllerMixin, LifecycleObserver, OnSaveInstanceState,
OnCreate, OnResume {
private static final String TRUST_AGENT_CLICK_INTENT = "trust_agent_click_intent";
@VisibleForTesting

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

@@ -38,6 +38,7 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.TestConfig;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.security.SecuritySettingsV2;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -99,6 +100,7 @@ public class TrustAgentListPreferenceControllerTest {
public void testConstants() {
assertThat(mController.isAvailable()).isTrue();
assertThat(mController.getPreferenceKey()).isEqualTo(PREF_KEY_TRUST_AGENT);
assertThat(mController).isInstanceOf(PreferenceControllerMixin.class);
}
@Test