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

Commit 62bc98dd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "add large format media sizes"

parents 0da4dcce f622e665

core/api/current.txt

+11 −0
Original line number Diff line number Diff line
@@ -31423,6 +31423,10 @@ package android.print { 
    method @NonNull public String getLabel(@NonNull android.content.pm.PackageManager);

    method @IntRange(from=1) public int getWidthMils();

    method public boolean isPortrait();

    field @NonNull public static final android.print.PrintAttributes.MediaSize ANSI_C;

    field @NonNull public static final android.print.PrintAttributes.MediaSize ANSI_D;

    field @NonNull public static final android.print.PrintAttributes.MediaSize ANSI_E;

    field @NonNull public static final android.print.PrintAttributes.MediaSize ANSI_F;

    field public static final android.print.PrintAttributes.MediaSize ISO_A0;

    field public static final android.print.PrintAttributes.MediaSize ISO_A1;

    field public static final android.print.PrintAttributes.MediaSize ISO_A10;
@@ -31476,6 +31480,12 @@ package android.print { 
    field public static final android.print.PrintAttributes.MediaSize JPN_KAKU2;

    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;

    field @NonNull public static final android.print.PrintAttributes.MediaSize NA_ARCH_B;

    field @NonNull public static final android.print.PrintAttributes.MediaSize NA_ARCH_C;

    field @NonNull public static final android.print.PrintAttributes.MediaSize NA_ARCH_D;

    field @NonNull public static final android.print.PrintAttributes.MediaSize NA_ARCH_E;

    field @NonNull public static final android.print.PrintAttributes.MediaSize NA_ARCH_E1;

    field public static final android.print.PrintAttributes.MediaSize NA_FOOLSCAP;

    field public static final android.print.PrintAttributes.MediaSize NA_GOVT_LETTER;

    field public static final android.print.PrintAttributes.MediaSize NA_INDEX_3X5;
@@ -31487,6 +31497,7 @@ package android.print { 
    field public static final android.print.PrintAttributes.MediaSize NA_LETTER;

    field public static final android.print.PrintAttributes.MediaSize NA_MONARCH;

    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 public static final android.print.PrintAttributes.MediaSize OM_DAI_PA_KAI;

    field public static final android.print.PrintAttributes.MediaSize OM_JUURO_KU_KAI;

core/java/android/print/PrintAttributes.java

+44 −0
Original line number Diff line number Diff line
@@ -635,6 +635,50 @@ public final class PrintAttributes implements Parcelable { 
        public static final MediaSize NA_FOOLSCAP =

                new MediaSize("NA_FOOLSCAP", "android",

                        R.string.mediasize_na_foolscap, 8000, 13000);

        /** North America ANSI C media size: 17" x 22" (432mm x 559mm) */

        public static final @NonNull MediaSize ANSI_C =

                new MediaSize("ANSI_C", "android",

                        R.string.mediasize_na_ansi_c, 17000, 22000);

        /** North America ANSI D media size: 22" x 34" (559mm x 864mm) */

        public static final @NonNull MediaSize ANSI_D =

                new MediaSize("ANSI_D", "android",

                        R.string.mediasize_na_ansi_d, 22000, 34000);

        /** North America ANSI E media size: 34" x 44" (864mm x 1118mm) */

        public static final @NonNull MediaSize ANSI_E =

                new MediaSize("ANSI_E", "android",

                        R.string.mediasize_na_ansi_e, 34000, 44000);

        /** North America ANSI F media size: 28" x 40" (711mm x 1016mm) */

        public static final @NonNull MediaSize ANSI_F =

                new MediaSize("ANSI_F", "android",

                        R.string.mediasize_na_ansi_f, 28000, 40000);

        /** North America Arch A media size: 9" x 12" (229mm x 305mm) */

        public static final @NonNull MediaSize NA_ARCH_A =

                new MediaSize("NA_ARCH_A", "android",

                        R.string.mediasize_na_arch_a, 9000, 12000);

        /** North America Arch B media size: 12" x 18" (305mm x 457mm) */

        public static final @NonNull MediaSize NA_ARCH_B =

                new MediaSize("NA_ARCH_B", "android",

                        R.string.mediasize_na_arch_b, 12000, 18000);

        /** North America Arch C media size: 18" x 24" (457mm x 610mm) */

        public static final @NonNull MediaSize NA_ARCH_C =

                new MediaSize("NA_ARCH_C", "android",

                        R.string.mediasize_na_arch_c, 18000, 24000);

        /** North America Arch D media size: 24" x 36" (610mm x 914mm) */

        public static final @NonNull MediaSize NA_ARCH_D =

                new MediaSize("NA_ARCH_D", "android",

                        R.string.mediasize_na_arch_d, 24000, 36000);

        /** North America Arch E media size: 36" x 48" (914mm x 1219mm) */

        public static final @NonNull MediaSize NA_ARCH_E =

                new MediaSize("NA_ARCH_E", "android",

                        R.string.mediasize_na_arch_e, 36000, 48000);

        /** North America Arch E1 media size: 30" x 42" (762mm x 1067mm) */

        public static final @NonNull MediaSize NA_ARCH_E1 =

                new MediaSize("NA_ARCH_E1", "android",

                        R.string.mediasize_na_arch_e1, 30000, 42000);

        /** North America Super B media size: 13" x 19" (330mm x 483mm) */

        public static final @NonNull MediaSize NA_SUPER_B =

                new MediaSize("NA_SUPER_B", "android",

                        R.string.mediasize_na_super_b, 13000, 19000);



        // Chinese

core/res/res/values/strings.xml

+22 −0
Original line number Diff line number Diff line
@@ -4645,6 +4645,28 @@ 
    <string name="mediasize_na_quarto">Quarto</string>

    <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->

    <string name="mediasize_na_foolscap">Foolscap</string>

    <!-- North America ANSI C media (paper) size: 17" x 22" (432mm x 559mm) [CHAR LIMIT=none] -->

    <string name="mediasize_na_ansi_c">ANSI C</string>

    <!-- North America ANSI D media (paper) size: 22" x 34" (559mm x 864mm) [CHAR LIMIT=none] -->

    <string name="mediasize_na_ansi_d">ANSI D</string>

    <!-- North America ANSI E media (paper) size: 34" x 44" (864mm x 1118mm) [CHAR LIMIT=none] -->

    <string name="mediasize_na_ansi_e">ANSI E</string>

    <!-- North America ANSI F media (paper) size: 28" x 40" (711mm x 1016mm) [CHAR LIMIT=none] -->

    <string name="mediasize_na_ansi_f">ANSI F</string>

    <!-- North America Arch A media (paper) size: 9" x 12" (229mm x 305mm) [CHAR LIMIT=none] -->

    <string name="mediasize_na_arch_a">Arch A</string>

    <!-- North America Arch B media (paper) size: 12" x 18" (305mm x 457mm) [CHAR LIMIT=none] -->

    <string name="mediasize_na_arch_b">Arch B</string>

    <!-- North America Arch C media (paper) size: 18" x 24" (457mm x 610mm) [CHAR LIMIT=none] -->

    <string name="mediasize_na_arch_c">Arch C</string>

    <!-- North America Arch D media (paper) size: 24" x 36" (610mm x 914mm) [CHAR LIMIT=none] -->

    <string name="mediasize_na_arch_d">Arch D</string>

    <!-- North America Arch E media (paper) size: 36" x 48" (914mm x 1219mm) [CHAR LIMIT=none] -->

    <string name="mediasize_na_arch_e">Arch E</string>

    <!-- North America Arch E1 media (paper) size: 30" x 42" (762mm x 1067mm) [CHAR LIMIT=none] -->

    <string name="mediasize_na_arch_e1">Arch E1</string>

    <!-- North America Super B media (paper) size: 13" x 19" (330mm x 483mm) [CHAR LIMIT=none] -->

    <string name="mediasize_na_super_b">Super B</string>



    <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->

    <string name="mediasize_chinese_roc_8k">ROC 8K</string>

core/res/res/values/symbols.xml

+11 −0
Original line number Diff line number Diff line
@@ -1143,6 +1143,17 @@ 
  <java-symbol type="string" name="mediasize_na_monarch" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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