Merge "Re-enabling testShortcutIconWithTheme" into tm-qpr-dev

            </intent-filter>

        </activity-alias>

        <activity-alias android:name="Activity15" android:exported="true"

            android:label="ThemeIconTestActivity"

            android:label="IconThemedActivity"

            android:icon="@drawable/test_theme_icon"

            android:targetActivity="com.android.launcher3.testcomponent.OtherBaseTestingActivity">

            <intent-filter>

<?xml version="1.0" encoding="utf-8"?>

<shortcuts xmlns:android="http://schemas.android.com/apk/res/android" >

    <shortcut

        android:shortcutId="shortcut1"

        android:shortcutId="shortcut1_themed"

        android:icon="@drawable/test_theme_icon"

        android:shortcutShortLabel="@string/shortcut1">

        <intent android:action="com.android.launcher3.intent.action.test_shortcut"/>

import com.android.launcher3.util.Executors;

import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;

import org.junit.Ignore;

import org.junit.Test;

import java.util.ArrayDeque;

@LargeTest

public class ThemeIconsTest extends AbstractLauncherUiTest {

    private static final String APP_NAME = "ThemeIconTestActivity";

    private static final String APP_NAME = "IconThemedActivity";

    private static final String SHORTCUT_APP_NAME = "LauncherTestApp";

    private static final String SHORTCUT_NAME = "Shortcut 1";

        }

    }

    @Ignore

    @Test

    @ScreenRecord // b/260722220

    public void testShortcutIconWithTheme() throws Exception {