summaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorSantiago Etchebehere <santie@google.com>2021-06-17 17:36:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-17 17:36:31 +0000
commitd19098d34f2517b8f937c2037e44ef3587954718 (patch)
tree8ec495dc12ec9c8cc407efedd0ef8bb8281c384b /tests/src
parente876cc7c277a2ed3437e7c5caca0b6207d844a23 (diff)
parentde34ad568da81b85b493ebfd8ad8d093c6dd2368 (diff)
downloadplatform_packages_apps_WallpaperPicker2-d19098d34f2517b8f937c2037e44ef3587954718.tar.gz
platform_packages_apps_WallpaperPicker2-d19098d34f2517b8f937c2037e44ef3587954718.tar.bz2
platform_packages_apps_WallpaperPicker2-d19098d34f2517b8f937c2037e44ef3587954718.zip
Merge "Improve wallpaper preview loading transition" into sc-dev am: de34ad568d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/14970016 Change-Id: I30f1651f1469791d4bb6f662d28d599721418938
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/wallpaper/testing/TestWallpaperInfo.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/src/com/android/wallpaper/testing/TestWallpaperInfo.java b/tests/src/com/android/wallpaper/testing/TestWallpaperInfo.java
index c0ccee6..c4328c5 100644
--- a/tests/src/com/android/wallpaper/testing/TestWallpaperInfo.java
+++ b/tests/src/com/android/wallpaper/testing/TestWallpaperInfo.java
@@ -73,6 +73,7 @@ public class TestWallpaperInfo extends WallpaperInfo {
}
private TestWallpaperInfo(Parcel in) {
+ super(in);
mPixelColor = in.readInt();
mAttributions = in.createStringArrayList();
mActionUrl = in.readString();
@@ -200,6 +201,7 @@ public class TestWallpaperInfo extends WallpaperInfo {
@Override
public void writeToParcel(Parcel parcel, int i) {
+ super.writeToParcel(parcel, i);
parcel.writeInt(mPixelColor);
parcel.writeStringList(mAttributions);
parcel.writeString(mActionUrl);