drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disallow range selection if the document has unknown page count." into klp-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2013-09-26 19:21:06 +00:00
committed by Android (Google) Code Review
parent c9cfd605a2 b0e68fdc9c
commit 3adc49c678
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java
View File

@ -1092,7 +1092,9 @@ public class PrintJobConfigActivity extends Activity {
} }
} }
//TODO: Catch the error if start is less grater than the end. // We intentionally do not catch the case of the from page being
// greater than the to page. When computing the requested pages
// we just swap them if necessary.
mPageRangeEditText.setError(null); mPageRangeEditText.setError(null);
mPrintButton.setEnabled(true); mPrintButton.setEnabled(true);
@ -1825,8 +1827,7 @@ public class PrintJobConfigActivity extends Activity {
// Range options // Range options
PrintDocumentInfo info = mDocument.info; PrintDocumentInfo info = mDocument.info;
if (info != null && (info.getPageCount() > 0 if (info != null && info.getPageCount() > 0) {
|| info.getPageCount() == PrintDocumentInfo.PAGE_COUNT_UNKNOWN)) {
if (info.getPageCount() == 1) { if (info.getPageCount() == 1) {
mRangeOptionsSpinner.setEnabled(false); mRangeOptionsSpinner.setEnabled(false);
} else { } else {