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

Commit 62ea1f1c authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Re-enabling testShortcutIconWithTheme 

> Updating shortcut id incache the icon cache was the culprit

Bug: 260722220
Test: Verified locally
Change-Id: I0e6bc9b06d1b99e33cb9b1a248647d54bf47dea4
parent 39688d2d

tests/AndroidManifest-common.xml

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

tests/res/xml/shortcuts.xml

+1 −1
Original line number Diff line number Diff line 
<?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"/>

tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java

+1 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.launcher3.ui.TaplTestsLauncher3; 
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;
@@ -52,7 +51,7 @@ import java.util.Queue; 
@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";
@@ -111,7 +110,6 @@ public class ThemeIconsTest extends AbstractLauncherUiTest { 
        }

    }



    @Ignore

    @Test

    @ScreenRecord // b/260722220

    public void testShortcutIconWithTheme() throws Exception {