diff options
| author | 2021-04-22 00:41:03 +0000 | |
|---|---|---|
| committer | 2021-04-22 00:41:03 +0000 | |
| commit | edea4fa1736ce8a9580b991f2c77d60da2e034d0 (patch) | |
| tree | 8814b8607681ff6827e6e4f09cd02168fc8d46c0 | |
| parent | ca5c906ab58488995ebb59a4df1b3d0473643e35 (diff) | |
| parent | d8464708f6bb9c493a0a63d8dd5e48b622b36a46 (diff) | |
Merge "Add Japanese Photo L size" am: d8464708f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527008
Change-Id: I9028862d97d7e9363894f5d5fb83aa54d9ca0139
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/print/PrintAttributes.java | 4 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 92c352ec7350..1230c3afb0b4 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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; diff --git a/core/java/android/print/PrintAttributes.java b/core/java/android/print/PrintAttributes.java index 878984a7d154..c19884805507 100644 --- a/core/java/android/print/PrintAttributes.java +++ b/core/java/android/print/PrintAttributes.java @@ -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 */ diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index fc30bab70671..7876dd2f8788 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -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> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 03010c66e113..c06e7ded81f8 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -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" /> |