From 0bdbcc479c9459386d08b099cfdef3cb1242b86c Mon Sep 17 00:00:00 2001
From: Kurtis Schlepp <mopriadevteam@gmail.com>
Date: Sun, 13 Dec 2020 17:05:58 -0800
Subject: Add Japanese Photo L size

L size media is very common in Japan, as listed at
https://en.wikipedia.org/wiki/Photo_print_sizes. DPS and other
print services must add their own definitions of this popular size.

Including it in PrintAttributes will allow other software to
leverage it instead of re-defining it, leading to a more consistent
experience in the future.

Test: L is present in API
Change-Id: I7022881846d1bf46bda80b4825c5cba01b794821
Signed-off-by: Glade Diviney <mopriadevteam@gmail.com>
---
 core/api/current.txt                         | 1 +
 core/java/android/print/PrintAttributes.java | 4 ++++
 core/res/res/values/strings.xml              | 2 ++
 core/res/res/values/symbols.xml              | 1 +
 4 files changed, 8 insertions(+)

diff --git a/core/api/current.txt b/core/api/current.txt
index 2a16084f348e..195f06cfad1e 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -31485,6 +31485,7 @@ package android.print {
     field public static final android.print.PrintAttributes.MediaSize NA_MONARCH;
     field public static final android.print.PrintAttributes.MediaSize NA_QUARTO;
     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 e607ced63393..62d5d78a7f1e 100644
--- a/core/java/android/print/PrintAttributes.java
+++ b/core/java/android/print/PrintAttributes.java
@@ -792,6 +792,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 */
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 4a06671d9f27..3e99ca58688f 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -4724,6 +4724,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>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 2901de5b57a2..f1c3b66b4efc 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1179,6 +1179,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" />
-- 
cgit v1.2.3-59-g8ed1b