Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5c04b6f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "update L photo size name with JPN_ prefix" am: 2a46c649 am: 70100919 am: 9e0ab4a3 

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

Change-Id: Id300ef712eda7bfab164044c95c807ebf4e9798f
parents 19943bde 9e0ab4a3

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32950,6 +32950,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;
@@ -32971,7 +32972,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;

core/java/android/print/PrintAttributes.java

+2 −2
Original line number Diff line number Diff line
@@ -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;