Cleanup test wallpaper colors
To be more systematic:
- static test wallpapers are drawing red, green, blue bitmaps
- live test wallpapers are drawing cyan, majenta, yellow bitmaps
- robot.png is only for the test live wallpaper thumbnails
Bug: 253507223
Test: atest CtsWallpaperTestCases
Change-Id: Ifbc95ab399a261fe63b6b05d9c6087f26c90caf7
diff --git a/tests/app/WallpaperTest/res/xml/wallpaper.xml b/tests/app/WallpaperTest/res/xml/wallpaper.xml
index 3f53640..ccf3670 100644
--- a/tests/app/WallpaperTest/res/xml/wallpaper.xml
+++ b/tests/app/WallpaperTest/res/xml/wallpaper.xml
@@ -16,7 +16,7 @@
-->
<wallpaper
xmlns:android="http://schemas.android.com/apk/res/android"
- android:thumbnail="@drawable/icon_red"
+ android:thumbnail="@drawable/robot"
android:author="@string/wallpaper_collection"
android:description="@string/wallpaper_description"
android:showMetadataInPreview="true"
diff --git a/tests/app/WallpaperTest/res/xml/wallpaper_no_default_device_state_change_transition.xml b/tests/app/WallpaperTest/res/xml/wallpaper_no_default_device_state_change_transition.xml
index 130ba3e..7c59d9e 100644
--- a/tests/app/WallpaperTest/res/xml/wallpaper_no_default_device_state_change_transition.xml
+++ b/tests/app/WallpaperTest/res/xml/wallpaper_no_default_device_state_change_transition.xml
@@ -16,7 +16,7 @@
-->
<wallpaper
xmlns:android="http://schemas.android.com/apk/res/android"
- android:thumbnail="@drawable/icon_red"
+ android:thumbnail="@drawable/robot"
android:author="@string/wallpaper_collection"
android:description="@string/wallpaper_description"
android:shouldUseDefaultUnfoldTransition="false"
diff --git a/tests/app/WallpaperTest/res/xml/wallpaper_supporting_ambient_mode.xml b/tests/app/WallpaperTest/res/xml/wallpaper_supporting_ambient_mode.xml
index 55c64d5..fba0808 100644
--- a/tests/app/WallpaperTest/res/xml/wallpaper_supporting_ambient_mode.xml
+++ b/tests/app/WallpaperTest/res/xml/wallpaper_supporting_ambient_mode.xml
@@ -16,7 +16,7 @@
-->
<wallpaper
xmlns:android="http://schemas.android.com/apk/res/android"
- android:thumbnail="@drawable/icon_red"
+ android:thumbnail="@drawable/robot"
android:author="@string/wallpaper_collection"
android:description="@string/wallpaper_description"
android:supportsAmbientMode="true"
diff --git a/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaper.java b/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaper.java
index bd4c35b..3a96eac 100644
--- a/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaper.java
+++ b/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaper.java
@@ -16,4 +16,12 @@
package android.app.cts.wallpapers;
-public class TestLiveWallpaper extends TestWallpaperService { }
+import android.graphics.Color;
+
+public class TestLiveWallpaper extends TestWallpaperService {
+
+ @Override
+ protected int getColor() {
+ return Color.CYAN;
+ }
+}
diff --git a/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaperNoUnfoldTransition.java b/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaperNoUnfoldTransition.java
index 0d51e05..026dd1b 100644
--- a/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaperNoUnfoldTransition.java
+++ b/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaperNoUnfoldTransition.java
@@ -16,4 +16,12 @@
package android.app.cts.wallpapers;
-public class TestLiveWallpaperNoUnfoldTransition extends TestWallpaperService { }
+import android.graphics.Color;
+
+public class TestLiveWallpaperNoUnfoldTransition extends TestWallpaperService {
+
+ @Override
+ protected int getColor() {
+ return Color.MAGENTA;
+ }
+}
diff --git a/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaperSupportingAmbientMode.java b/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaperSupportingAmbientMode.java
index 84bbbbc..8abf5d4 100644
--- a/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaperSupportingAmbientMode.java
+++ b/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestLiveWallpaperSupportingAmbientMode.java
@@ -16,4 +16,12 @@
package android.app.cts.wallpapers;
-public class TestLiveWallpaperSupportingAmbientMode extends TestWallpaperService { }
+import android.graphics.Color;
+
+public class TestLiveWallpaperSupportingAmbientMode extends TestWallpaperService {
+
+ @Override
+ protected int getColor() {
+ return Color.YELLOW;
+ }
+}
diff --git a/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestWallpaperService.kt b/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestWallpaperService.kt
index 37e7a92..917e20c 100644
--- a/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestWallpaperService.kt
+++ b/tests/app/WallpaperTest/src/android/app/cts/wallpapers/TestWallpaperService.kt
@@ -16,7 +16,6 @@
package android.app.cts.wallpapers
import android.app.WallpaperColors
-import android.graphics.Color
import android.os.Bundle
import android.os.Looper
import android.service.wallpaper.WallpaperService
@@ -37,7 +36,7 @@
* For example, many methods should only be called after [WallpaperService.Engine.onSurfaceCreated],
* which itself should only be called after [WallpaperService.Engine.onCreate].
*/
-open class TestWallpaperService : WallpaperService() {
+abstract class TestWallpaperService : WallpaperService() {
private val mainThread: Thread = Looper.getMainLooper().thread
companion object {
@@ -85,7 +84,7 @@
private fun draw(holder: SurfaceHolder) {
val c = holder.lockCanvas()
- c.drawColor(Color.RED)
+ c.drawColor(getColor())
holder.unlockCanvasAndPost(c)
}
@@ -279,4 +278,9 @@
assertionError = assertionError ?: error
}
}
+
+ /**
+ * The color that this test wallpaper should draw, for debug purposes.
+ */
+ protected abstract fun getColor(): Int
}
diff --git a/tests/app/WallpaperTest/src/android/app/cts/wallpapers/WallpaperManagerTest.java b/tests/app/WallpaperTest/src/android/app/cts/wallpapers/WallpaperManagerTest.java
index e8c6925..7d8a6e4 100644
--- a/tests/app/WallpaperTest/src/android/app/cts/wallpapers/WallpaperManagerTest.java
+++ b/tests/app/WallpaperTest/src/android/app/cts/wallpapers/WallpaperManagerTest.java
@@ -84,6 +84,11 @@
/**
* Tests for {@link WallpaperManager} and related classes.
+ * <p>
+ * Note: the wallpapers {@link TestLiveWallpaper}, {@link TestLiveWallpaperNoUnfoldTransition},
+ * {@link TestLiveWallpaperSupportingAmbientMode} draw the screen in
+ * cyan, magenta, yellow, respectively.
+ * </p>
*/
@RunWith(AndroidJUnit4.class)
public class WallpaperManagerTest {
@@ -321,7 +326,7 @@
public void setResource_homeScreen_homeStatic_lockScreenUnset_setsLockToHomeAndUpdatesHome()
throws IOException {
int origHomeWallpaperId = mWallpaperManager.getWallpaperId(FLAG_SYSTEM);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
assertThat(mWallpaperManager.getWallpaperId(FLAG_SYSTEM)).isNotEqualTo(
origHomeWallpaperId);
assertThat(mWallpaperManager.getWallpaperId(FLAG_LOCK)).isEqualTo(origHomeWallpaperId);
@@ -343,7 +348,7 @@
});
int origHomeWallpaperId = mWallpaperManager.getWallpaperId(FLAG_SYSTEM);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
assertThat(mWallpaperManager.getWallpaperId(FLAG_SYSTEM)).isNotEqualTo(
origHomeWallpaperId);
@@ -355,7 +360,7 @@
mWallpaperManager.setResource(R.drawable.icon_red, FLAG_LOCK);
int origHomeWallpaperId = mWallpaperManager.getWallpaperId(FLAG_SYSTEM);
int origLockWallpaperId = mWallpaperManager.getWallpaperId(FLAG_LOCK);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ mWallpaperManager.setResource(R.drawable.icon_green, FLAG_SYSTEM);
assertThat(mWallpaperManager.getWallpaperId(FLAG_SYSTEM)).isNotEqualTo(
origHomeWallpaperId);
assertThat(mWallpaperManager.getWallpaperId(FLAG_LOCK)).isEqualTo(origLockWallpaperId);
@@ -364,7 +369,7 @@
@Test
public void setResource_lockScreen_lockScreenUnset_changesLockOnly() throws IOException {
int origHomeWallpaperId = mWallpaperManager.getWallpaperId(FLAG_SYSTEM);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_LOCK);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_LOCK);
assertThat(mWallpaperManager.getWallpaperId(FLAG_SYSTEM)).isEqualTo(
origHomeWallpaperId);
assertThat(mWallpaperManager.getWallpaperId(FLAG_LOCK)).isAtLeast(0);
@@ -375,7 +380,7 @@
mWallpaperManager.setResource(R.drawable.icon_red, FLAG_LOCK);
int origHomeWallpaperId = mWallpaperManager.getWallpaperId(FLAG_SYSTEM);
int origLockWallpaperId = mWallpaperManager.getWallpaperId(FLAG_LOCK);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_LOCK);
+ mWallpaperManager.setResource(R.drawable.icon_green, FLAG_LOCK);
assertThat(mWallpaperManager.getWallpaperId(FLAG_SYSTEM)).isEqualTo(
origHomeWallpaperId);
assertThat(mWallpaperManager.getWallpaperId(FLAG_LOCK)).isNotEqualTo(
@@ -385,7 +390,7 @@
@Test
public void setResource_both_lockScreenUnset_changesHome() throws IOException {
int origHomeWallpaperId = mWallpaperManager.getWallpaperId(FLAG_SYSTEM);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM | FLAG_LOCK);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM | FLAG_LOCK);
assertThat(mWallpaperManager.getWallpaperId(FLAG_SYSTEM)).isNotEqualTo(
origHomeWallpaperId);
assertThat(mWallpaperManager.getWallpaperId(FLAG_LOCK)).isLessThan(0);
@@ -395,7 +400,7 @@
public void setResource_both_lockScreenSet_changesHomeAndClearsLock() throws IOException {
mWallpaperManager.setResource(R.drawable.icon_red, FLAG_LOCK);
int origHomeWallpaperId = mWallpaperManager.getWallpaperId(FLAG_SYSTEM);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM | FLAG_LOCK);
+ mWallpaperManager.setResource(R.drawable.icon_green, FLAG_SYSTEM | FLAG_LOCK);
assertThat(mWallpaperManager.getWallpaperId(FLAG_SYSTEM)).isNotEqualTo(
origHomeWallpaperId);
assertThat(mWallpaperManager.getWallpaperId(FLAG_LOCK)).isLessThan(0);
@@ -405,7 +410,7 @@
@Test
public void setResource_default_lockScreenUnset_sameAsBoth() throws IOException {
int origHomeWallpaperId = mWallpaperManager.getWallpaperId(FLAG_SYSTEM);
- mWallpaperManager.setResource(R.drawable.robot);
+ mWallpaperManager.setResource(R.drawable.icon_red);
assertThat(mWallpaperManager.getWallpaperId(FLAG_SYSTEM)).isNotEqualTo(
origHomeWallpaperId);
assertThat(mWallpaperManager.getWallpaperId(FLAG_LOCK)).isLessThan(0);
@@ -597,8 +602,8 @@
assertThat(mWallpaperManager.getWallpaperInfo(FLAG_SYSTEM)).isNull();
assertThat(mWallpaperManager.getWallpaperInfo(FLAG_LOCK)).isNull();
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
- mWallpaperManager.setResource(R.drawable.icon_red, FLAG_LOCK);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
+ mWallpaperManager.setResource(R.drawable.icon_green, FLAG_LOCK);
assertThat(mWallpaperManager.getWallpaperInfo(FLAG_SYSTEM)).isNull();
assertThat(mWallpaperManager.getWallpaperInfo(FLAG_LOCK)).isNull();
@@ -738,7 +743,7 @@
// Verify that the listener is not called
mWallpaperManager.addOnColorsChangedListener(counter, mHandler);
try {
- mWallpaperManager.setResource(R.drawable.robot);
+ mWallpaperManager.setResource(R.drawable.icon_red);
if (!latch.await(5, TimeUnit.SECONDS)) {
throw new AssertionError("Registered listener not invoked");
}
@@ -962,7 +967,7 @@
@Test
public void peekWallpaperCaching_cachesWallpaper() throws IOException {
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
// Get the current bitmap, and check that the second call returns the cached bitmap
Bitmap bitmap1 = mWallpaperManager.getBitmapAsUser(mContext.getUserId(),
@@ -972,7 +977,7 @@
FLAG_SYSTEM)).isSameInstanceAs(bitmap1);
// Change the wallpaper to invalidate the cached bitmap
- mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
+ mWallpaperManager.setResource(R.drawable.icon_green, FLAG_SYSTEM);
// Get the new bitmap, and check that the second call returns the newly cached bitmap
Bitmap bitmap2 = mWallpaperManager.getBitmapAsUser(mContext.getUserId(),
@@ -984,8 +989,8 @@
@Test
public void peekWallpaperCaching_differentWhich_doesNotReturnCached() throws IOException {
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
- mWallpaperManager.setResource(R.drawable.icon_red, FLAG_LOCK);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
+ mWallpaperManager.setResource(R.drawable.icon_green, FLAG_LOCK);
Bitmap bitmapSystem = mWallpaperManager.getBitmapAsUser(mContext.getUserId(),
false /* hardware */, FLAG_SYSTEM);
@@ -997,7 +1002,7 @@
@Test
public void peekWallpaperCaching_bitmapRecycled_doesNotReturnCached() throws IOException {
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
Bitmap bitmap = mWallpaperManager.getBitmapAsUser(mContext.getUserId(),
false /* hardware */, FLAG_SYSTEM);
@@ -1010,7 +1015,7 @@
@Test
public void peekWallpaperCaching_differentUser_doesNotReturnCached() throws IOException {
final int bogusUserId = -1;
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
Bitmap bitmap = mWallpaperManager.getBitmapAsUser(mContext.getUserId(),
false /* hardware */, FLAG_SYSTEM);
@@ -1071,8 +1076,8 @@
@Test
public void getDrawable_homeScreen_succeeds() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
Drawable actual = mWallpaperManager.getDrawable(FLAG_SYSTEM);
@@ -1089,8 +1094,8 @@
@Test
public void getDrawable_lockScreenSet_succeeds() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_LOCK);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_LOCK);
Drawable actual = mWallpaperManager.getDrawable(FLAG_LOCK);
@@ -1100,8 +1105,8 @@
@Test
public void getDrawable_default_sameAsHome() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
Drawable actual = mWallpaperManager.getDrawable();
@@ -1111,8 +1116,8 @@
@Test
public void getFastDrawable_homeScreen_succeeds() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
Drawable actual = mWallpaperManager.getFastDrawable(FLAG_SYSTEM);
@@ -1129,8 +1134,8 @@
@Test
public void getFastDrawable_lockScreenSet_succeeds() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_LOCK);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_LOCK);
Drawable actual = mWallpaperManager.getFastDrawable(FLAG_LOCK);
@@ -1140,8 +1145,8 @@
@Test
public void getFastDrawable_default_sameAsHome() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
Drawable actual = mWallpaperManager.getFastDrawable();
@@ -1151,8 +1156,8 @@
@Test
public void peekDrawable_homeScreen_succeeds() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
Drawable actual = mWallpaperManager.peekDrawable(FLAG_SYSTEM);
@@ -1169,8 +1174,8 @@
@Test
public void peekDrawable_lockScreenSet_succeeds() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_LOCK);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_LOCK);
Drawable actual = mWallpaperManager.peekDrawable(FLAG_LOCK);
@@ -1180,8 +1185,8 @@
@Test
public void peekDrawable_default_sameAsHome() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
Drawable actual = mWallpaperManager.peekDrawable();
@@ -1191,8 +1196,8 @@
@Test
public void peekFastDrawable_homeScreen_succeeds() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
Drawable actual = mWallpaperManager.peekFastDrawable(FLAG_SYSTEM);
@@ -1209,8 +1214,8 @@
@Test
public void peekFastDrawable_lockScreenSet_succeeds() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_LOCK);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_LOCK);
Drawable actual = mWallpaperManager.peekFastDrawable(FLAG_LOCK);
@@ -1220,8 +1225,8 @@
@Test
public void peekFastDrawable_default_sameAsHome() throws IOException {
- Drawable expected = mContext.getDrawable(R.drawable.robot);
- mWallpaperManager.setResource(R.drawable.robot, FLAG_SYSTEM);
+ Drawable expected = mContext.getDrawable(R.drawable.icon_red);
+ mWallpaperManager.setResource(R.drawable.icon_red, FLAG_SYSTEM);
Drawable actual = mWallpaperManager.peekFastDrawable();
@@ -1356,7 +1361,7 @@
mWallpaperManager.addOnColorsChangedListener(counter, mHandler);
try {
- mWallpaperManager.setResource(R.drawable.robot, which);
+ mWallpaperManager.setResource(R.drawable.icon_red, which);
boolean eventsReceived = latch.await(5, TimeUnit.SECONDS);
assertWithMessage("Timed out waiting for color events. Expected: "
+ whichExpected + " received: " + received)
