diff --git a/core/api/current.txt b/core/api/current.txt index 92c352ec73503..1230c3afb0b46 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -31499,6 +31499,7 @@ 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 878984a7d1546..c198848055074 100644 --- a/core/java/android/print/PrintAttributes.java +++ b/core/java/android/print/PrintAttributes.java @@ -836,6 +836,10 @@ public final class PrintAttributes implements Parcelable { public static final MediaSize JPN_YOU4 = 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", + R.string.mediasize_japanese_l, 3500, 5000); private final @NonNull String mId; /**@hide */ diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index fc30bab70671f..7876dd2f8788f 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4746,6 +4746,8 @@ Kaku2 You4 + + L Unknown portrait diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 03010c66e1135..c06e7ded81f8e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1190,6 +1190,7 @@ +