diff options
| author | 2021-05-05 20:36:53 +0000 | |
|---|---|---|
| committer | 2021-05-05 20:36:53 +0000 | |
| commit | 2a46c6491f9b027cda53cefc1cc487c86dc5252c (patch) | |
| tree | dca38722673b36530a263e8a0803c83106cd4165 | |
| parent | b9680bac79d94fb10252fde5aa527e34c6d6e17e (diff) | |
| parent | 11749564b16fc1e0cf4dd61dab0c0fea78906d83 (diff) | |
Merge "update L photo size name with JPN_ prefix"
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | 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 7fd3bca595ff..cd4e6f9a826c 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 c19884805507..f5081012fe4c 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; |