commit d220d8202e67a82075ee20351657509ca0885b67
author Dave Langemak <dlangemak@google.com> Tue Nov 19 08:34:57 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 19 08:34:57 2013 -0800
tree a536436512453e90c2daede359da4bd1e6215dda
parent be462affdbe9f962c495d6eeabdad645aa9baf03
parent c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1

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

* commit 'c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1':
  Fix incorrent page range parsing when custom print options used.

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());
                     }