Merge "Fix SetupChooseLockPasswordTest" into tm-dev

import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

    @Test

    @Config(shadows = ShadowChooseLockGenericController.class)

    @Ignore

    public void createActivity_withShowOptionsButtonExtra_buttonNotVisibleIfNoVisibleLockTypes() {

        SetupChooseLockPassword activity = createSetupChooseLockPassword();

        Button optionsButton = activity.findViewById(R.id.screen_lock_options);

    @Implements(ChooseLockGenericController.class)

    public static class ShadowChooseLockGenericController {

        @Implementation

        protected List<ScreenLockType> getVisibleScreenLockTypes() {

        protected List<ScreenLockType> getVisibleAndEnabledScreenLockTypes() {

            return Collections.emptyList();

        }

    }