diff --git a/core/api/current.txt b/core/api/current.txt index 264c9d0134f43..7e9c1c4992ec0 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -32949,6 +32949,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 111623051ba9b..b2c1e7a908e75 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 05bae2b287f7e..0cb80f3109d7b 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4879,6 +4879,8 @@ Kaku2 You4 + + L Unknown portrait diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 1f197d244dc2d..402ea60cda354 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1197,6 +1197,7 @@ +