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

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

Merge "Add Japanese Photo L size" am: d8464708 am: edea4fa1 

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

Change-Id: Ic5ef7bc0a8f4317fb9d4fcfe2e0c62781b39d46f
parents 680b3217 edea4fa1

core/api/current.txt

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

core/java/android/print/PrintAttributes.java

+4 −0
Original line number Diff line number Diff line
@@ -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 */

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -4746,6 +4746,8 @@ 
    <string name="mediasize_japanese_kaku2">Kaku2</string>

    <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->

    <string name="mediasize_japanese_you4">You4</string>

    <!-- Japanese Photo L (paper) size: 89mm x 127mm (3.5 x 5") [CHAR LIMIT=20] -->

    <string name="mediasize_japanese_l">L</string>



    <!-- Media (paper) size for specifying any paper size in portrait.-->

    <string name="mediasize_unknown_portrait">Unknown portrait</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,7 @@ 
  <java-symbol type="string" name="mediasize_japanese_kahu" />

  <java-symbol type="string" name="mediasize_japanese_kaku2" />

  <java-symbol type="string" name="mediasize_japanese_you4" />

  <java-symbol type="string" name="mediasize_japanese_l" />

  <java-symbol type="string" name="network_partial_connectivity" />

  <java-symbol type="string" name="network_partial_connectivity_detailed" />

  <java-symbol type="string" name="reason_service_unavailable" />