Merge "Clean up usages of flag allow_shortcut_chooser_on_lockscreen." into main

import android.view.Window;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.Flags;

import android.widget.AdapterView;

import com.android.internal.R;

        boolean allowEditing = isUserSetupCompleted(this);

        boolean showWhenLocked = false;

        if (Flags.allowShortcutChooserOnLockscreen()) {

        final KeyguardManager keyguardManager = getSystemService(KeyguardManager.class);

        if (keyguardManager != null && keyguardManager.isKeyguardLocked()) {

            allowEditing = false;

            showWhenLocked = true;

        }

        }

        if (allowEditing) {

            final String positiveButtonText =

                    getString(R.string.edit_accessibility_shortcut_menu_button);

import android.content.pm.ServiceInfo;

import android.os.Bundle;

import android.os.Handler;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.support.test.uiautomator.By;

import android.view.View;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.Flags;

import android.view.accessibility.IAccessibilityManager;

import android.widget.Button;

    }

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_SHORTCUT_CHOOSER_ON_LOCKSCREEN)

    public void createDialog_onLockscreen_hasExpectedContent() {

        when(mKeyguardManager.isKeyguardLocked()).thenReturn(true);

        launchActivity();