Merge "Fix WallpaperDescription Parcel/XML encoding error" into main (f6ec4760) · Commits · e / os / android_frameworks_base

core/java/android/app/wallpaper/WallpaperDescription.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -564,6 +564,7 @@ public final class WallpaperDescription implements Parcelable {

		private static List<Pair<Integer, String>> screenDimensionPairs() {
		return List.of(
		new Pair<>(WallpaperManager.ORIENTATION_UNKNOWN, "Unknown"),
		new Pair<>(WallpaperManager.ORIENTATION_PORTRAIT, "Portrait"),
		new Pair<>(WallpaperManager.ORIENTATION_LANDSCAPE, "Landscape"),
		new Pair<>(WallpaperManager.ORIENTATION_SQUARE_PORTRAIT, "SquarePortrait"),

core/tests/coretests/src/android/app/wallpaper/WallpaperDescriptionTest.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import static android.app.WallpaperManager.ORIENTATION_LANDSCAPE;
		import static android.app.WallpaperManager.ORIENTATION_PORTRAIT;
		import static android.app.WallpaperManager.ORIENTATION_SQUARE_LANDSCAPE;
		import static android.app.WallpaperManager.ORIENTATION_SQUARE_PORTRAIT;
		import static android.app.WallpaperManager.ORIENTATION_UNKNOWN;

		import static com.google.common.truth.Truth.assertThat;
		import static com.google.common.truth.Truth.assertWithMessage;
		@@ -52,6 +53,7 @@ public class WallpaperDescriptionTest {
		private static final Rect DEFAULT_CROP_LANDSCAPE = new Rect(5, 6, 7, 8);
		private static final Rect DEFAULT_CROP_SQUARE_PORTRAIT = new Rect(9, 10, 11, 12);
		private static final Rect DEFAULT_CROP_SQUARE_LANDSCAPE = new Rect(13, 14, 15, 16);
		private static final Rect DEFAULT_CROP_UNKNOWN = new Rect(17, 18, 19, 20);

		private final ComponentName mTestComponent = new ComponentName("fakePackage", "fakeClass");

		@@ -149,6 +151,8 @@ public class WallpaperDescriptionTest {
		DEFAULT_CROP_SQUARE_PORTRAIT);
		assertThat(destination.getCropHints().get(ORIENTATION_SQUARE_LANDSCAPE)).isEqualTo(
		DEFAULT_CROP_SQUARE_LANDSCAPE);
		assertThat(destination.getCropHints().get(ORIENTATION_UNKNOWN)).isEqualTo(
		DEFAULT_CROP_UNKNOWN);
		assertThat(destination.getSampleSize()).isEqualTo(sampleSize);
		}

		@@ -248,6 +252,8 @@ public class WallpaperDescriptionTest {
		DEFAULT_CROP_SQUARE_PORTRAIT);
		assertThat(destination.getCropHints().get(ORIENTATION_SQUARE_LANDSCAPE)).isEqualTo(
		DEFAULT_CROP_SQUARE_LANDSCAPE);
		assertThat(destination.getCropHints().get(ORIENTATION_UNKNOWN)).isEqualTo(
		DEFAULT_CROP_UNKNOWN);
		assertThat(destination.getSampleSize()).isEqualTo(sampleSize);
		}

		@@ -327,6 +333,8 @@ public class WallpaperDescriptionTest {
		DEFAULT_CROP_SQUARE_PORTRAIT);
		assertThat(destination.getCropHints().get(ORIENTATION_SQUARE_LANDSCAPE)).isEqualTo(
		DEFAULT_CROP_SQUARE_LANDSCAPE);
		assertThat(destination.getCropHints().get(ORIENTATION_UNKNOWN)).isEqualTo(
		DEFAULT_CROP_UNKNOWN);
		assertThat(destination.getSampleSize()).isEqualTo(sampleSize);
		}

		@@ -342,6 +350,7 @@ public class WallpaperDescriptionTest {
		cropHints.put(ORIENTATION_LANDSCAPE, DEFAULT_CROP_LANDSCAPE);
		cropHints.put(ORIENTATION_SQUARE_PORTRAIT, DEFAULT_CROP_SQUARE_PORTRAIT);
		cropHints.put(ORIENTATION_SQUARE_LANDSCAPE, DEFAULT_CROP_SQUARE_LANDSCAPE);
		cropHints.put(ORIENTATION_UNKNOWN, DEFAULT_CROP_UNKNOWN);
		return cropHints;
		}
		}