diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 01:34:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 01:34:55 +0000 |
| commit | fc8683e28401712bf4cf9aa480a2e3eee3ed8653 (patch) | |
| tree | 5d9c2df800d6c7aa59536dbae08d1863f78090c5 /core/java | |
| parent | 9856c295018eccd3376fb1966cd9bbd7ecb924c6 (diff) | |
| parent | 6275761bbdadcac54c094d6aaa7cdf7cb891f98c (diff) | |
Merge "Add Japanese Photo L size" am: d8464708f6 am: edea4fa173 am: 6275761bbd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527008
Change-Id: I12470fa6debd0ffb49ba18fdf9e1e5cef49a363a
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/print/PrintAttributes.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/print/PrintAttributes.java b/core/java/android/print/PrintAttributes.java index 111623051ba9..b2c1e7a908e7 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 */ |