summaryrefslogtreecommitdiffstats
path: root/packages/PrintSpooler
diff options
context:
space:
mode:
authorDave Langemak <dlangemak@google.com>2013-11-19 16:33:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-19 16:33:22 +0000
commitc04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1 (patch)
tree947d1d46cd4dcd15691c412317aec056243b3f39 /packages/PrintSpooler
parent096de3c3017bb9b9e5e1ed9ad790b7fedab95433 (diff)
parent1a85d9fb243aae3750001094aa1514d4303cb3e0 (diff)
downloadframeworks_base-c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1.zip
frameworks_base-c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1.tar.gz
frameworks_base-c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1.tar.bz2
Merge "Fix incorrent page range parsing when custom print options used." into klp-dev
Diffstat (limited to 'packages/PrintSpooler')
-rw-r--r--packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java10
1 files changed, 7 insertions, 3 deletions
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 @@ public class PrintJobConfigActivity extends Activity {
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());
}