Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make sure to update the selected pages when needed in the right order." into nyc-dev

Browse Source
This commit is contained in:
Philip P. Moltmann
2016-04-01 16:46:19 +00:00
committed by Android (Google) Code Review
parent c84bbd576f c309d7155a
commit a97415b0b7
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
View File

@@ -1169,6 +1169,18 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
doFinish();
}
/**
* Update the selected pages from the text field.
*/
private void updateSelectedPagesFromTextField() {
PageRange[] selectedPages = computeSelectedPages();
if (!Arrays.equals(mSelectedPages, selectedPages)) {
mSelectedPages = selectedPages;
// Update preview.
updatePrintPreviewController(false);
}
}
private void confirmPrint() {
setState(STATE_PRINT_CONFIRMED);
@@ -1178,14 +1190,10 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
addCurrentPrinterToHistory();
setUserPrinted();
PageRange[] selectedPages = computeSelectedPages();
if (!Arrays.equals(mSelectedPages, selectedPages)) {
mSelectedPages = selectedPages;
// Update preview.
updatePrintPreviewController(false);
}
// updateSelectedPagesFromTextField migth update the preview, hence apply the preview first
updateSelectedPagesFromPreview();
updateSelectedPagesFromTextField();
mPrintPreviewController.closeOptions();
if (canUpdateDocument()) {
@@ -1485,6 +1493,10 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
cancelPrint();
}
} else if (view == mMoreOptionsButton) {
// The selected pages is only applied once the user leaves the text field. A click
// on this button, does not count as leaving.
updateSelectedPagesFromTextField();
if (mCurrentPrinter != null) {
startAdvancedPrintOptionsActivity(mCurrentPrinter);
}
@@ -2774,13 +2786,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
}
if (view == mPageRangeEditText && !hasFocus) {
PageRange[] selectedPages = computeSelectedPages();
if (selectedPages != null && !Arrays.equals(mSelectedPages, selectedPages)) {
mSelectedPages = selectedPages;
// Update preview.
updatePrintPreviewController(false);
}
updateSelectedPagesFromTextField();
}
}
}