Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "update L photo size name with JPN_ prefix" am: 2a46c6491f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697309

Change-Id: I3314ae4b03de074884f15824905258d9ab7a6476
This commit is contained in:
Treehugger Robot
2021-05-05 20:54:42 +00:00
committed by Automerger Merge Worker
parent 9e9e1c4af5 2a46c6491f
commit 70100919d0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -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;

4
core/java/android/print/PrintAttributes.java
View File

@@ -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;