commit c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1
author Dave Langemak <dlangemak@google.com> Tue Nov 19 16:33:22 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 19 16:33:22 2013 +0000
tree 947d1d46cd4dcd15691c412317aec056243b3f39
parent 096de3c3017bb9b9e5e1ed9ad790b7fedab95433
parent 1a85d9fb243aae3750001094aa1514d4303cb3e0

Merge "Fix incorrent page range parsing when custom print options used." into klp-dev

packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java

diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java
index 88403a3..c1c7a4e 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java
@@ -1529,9 +1529,13 @@
                                 builder.append(',');
                             }
                             PageRange pageRange = pageRanges[i];
-                            builder.append(pageRange.getStart());
-                            builder.append('-');
-                            builder.append(pageRange.getEnd());
+                            final int shownStartPage = pageRange.getStart() + 1;
+                            final int shownEndPage = pageRange.getEnd() + 1;
+                            builder.append(shownStartPage);
+                            if (shownStartPage != shownEndPage) {
+                                builder.append('-');
+                                builder.append(shownEndPage);
+                            }
                         }
                         mPageRangeEditText.setText(builder.toString());
                     }