Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev

import com.android.settings.testutils.shadow.ShadowUtils;

import com.android.setupwizardlib.GlifLayout;

import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.Robolectric;

        })

public class ChooseLockPasswordTest {

    @Before

    public void setUp() throws Exception {

        SettingsShadowResources.overrideResource(

                com.android.internal.R.string.config_headlineFontFamily, "");

    }

    @After

    public void tearDown() {

        SettingsShadowResources.reset();

    }

    @Test

    public void intentBuilder_setPassword_shouldAddExtras() {

        Intent intent = new IntentBuilder(application)