aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 09:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-05 19:46:30 +00:00
committed by Android (Google) Code Review
parent c46b47853b 62ea1f1cb7
commit 2825d06382
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/AndroidManifest-common.xml
View File

@@ -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>

2
tests/res/xml/shortcuts.xml
View File

@@ -1,7 +1,7 @@
<?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"/>

4
tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java
View File

@@ -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 {