From 11749564b16fc1e0cf4dd61dab0c0fea78906d83 Mon Sep 17 00:00:00 2001 From: Kurtis Schlepp Date: Wed, 5 May 2021 10:06:03 -0700 Subject: [PATCH] update L photo size name with JPN_ prefix Updates the Japanese Photo L media size name with JPN_ prefix Test: L is present in API with updated name Signed-off-by: Kurtis Schlepp Change-Id: Ib4e52b23571b166f6c000676fb81b4ac7c1f9a7a --- core/api/current.txt | 2 +- core/java/android/print/PrintAttributes.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 7fd3bca595ffe..cd4e6f9a826c6 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -31480,6 +31480,7 @@ package android.print { field public static final android.print.PrintAttributes.MediaSize JPN_HAGAKI; field public static final android.print.PrintAttributes.MediaSize JPN_KAHU; field public static final android.print.PrintAttributes.MediaSize JPN_KAKU2; + field @NonNull public static final android.print.PrintAttributes.MediaSize JPN_OE_PHOTO_L; field public static final android.print.PrintAttributes.MediaSize JPN_OUFUKU; field public static final android.print.PrintAttributes.MediaSize JPN_YOU4; field @NonNull public static final android.print.PrintAttributes.MediaSize NA_ARCH_A; @@ -31501,7 +31502,6 @@ package android.print { field public static final android.print.PrintAttributes.MediaSize NA_QUARTO; field @NonNull public static final android.print.PrintAttributes.MediaSize NA_SUPER_B; field public static final android.print.PrintAttributes.MediaSize NA_TABLOID; - field @NonNull public static final android.print.PrintAttributes.MediaSize OE_PHOTO_L; field public static final android.print.PrintAttributes.MediaSize OM_DAI_PA_KAI; field public static final android.print.PrintAttributes.MediaSize OM_JUURO_KU_KAI; field public static final android.print.PrintAttributes.MediaSize OM_PA_KAI; diff --git a/core/java/android/print/PrintAttributes.java b/core/java/android/print/PrintAttributes.java index c198848055074..f5081012fe4cc 100644 --- a/core/java/android/print/PrintAttributes.java +++ b/core/java/android/print/PrintAttributes.java @@ -837,8 +837,8 @@ public final class PrintAttributes implements Parcelable { new MediaSize("JPN_YOU4", "android", R.string.mediasize_japanese_you4, 4134, 9252); /** Japanese Photo L media size: 89mm x 127mm (3.5 x 5") */ - public static final @NonNull MediaSize OE_PHOTO_L = - new MediaSize("OE_PHOTO_L", "android", + public static final @NonNull MediaSize JPN_OE_PHOTO_L = + new MediaSize("JPN_OE_PHOTO_L", "android", R.string.mediasize_japanese_l, 3500, 5000); private final @NonNull String mId;