Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de64baeb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Implement PreferenceControllerMixin in TrustAgentController"

parents 85cd77c9 568f01df

src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java

+3 −1
Original line number Diff line number Diff line
@@ -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

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

+2 −0
Original line number Diff line number Diff line
@@ -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