Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ef83c46 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Update print preview when option is changed and clear ranges when they 

layout changes

Before we updated the print preview when the paper size changed but not
when the page ranges changed. This is not consistent. We always change.

Also if there is a change to the options that changes the layout (i.e.
papersize, orientation, minMargins) then clear the selected ranges as
this does not make sense anymore.

This also fixes a bug that when having pages selected while we reduce
the number of pages in the preview we got a NPE.

Bonus: do not constantly re-update the options UI when range or copies
text is updated.

Bug: 27830850, 27741420
Change-Id: I7abe4a74b44ac5c5ee54d12cc0c1ca1540793f0e
parent 0997bc8a

core/java/android/print/PageRange.java

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ public final class PageRange implements Parcelable { 
     */

    public static final PageRange ALL_PAGES = new PageRange(0, Integer.MAX_VALUE);



    /** @hide */

    public static final PageRange[] ALL_PAGES_ARRAY = new PageRange[]{PageRange.ALL_PAGES};



    private final int mStart;

    private final int mEnd;

packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java

+21 −9
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ public final class PageAdapter extends Adapter<ViewHolder> { 
            int documentPageCount, MediaSize mediaSize, Margins minMargins) {

        boolean documentChanged = false;

        boolean updatePreviewAreaAndPageSize = false;

        boolean clearSelectedPages = false;



        // If the app does not tell how many pages are in the document we cannot

        // optimize and ask for all pages whose count we get from the renderer.
@@ -225,30 +226,41 @@ public final class PageAdapter extends Adapter<ViewHolder> { 
            }

        }



        if (!Arrays.equals(mSelectedPages, selectedPages)) {

            mSelectedPages = selectedPages;

            mSelectedPageCount = PageRangeUtils.getNormalizedPageCount(

                    mSelectedPages, documentPageCount);

            setConfirmedPages(mSelectedPages, documentPageCount);

            updatePreviewAreaAndPageSize = true;

            documentChanged = true;

        }



        if (mDocumentPageCount != documentPageCount) {

            mDocumentPageCount = documentPageCount;

            documentChanged = true;

            clearSelectedPages = true;

        }



        if (mMediaSize == null || !mMediaSize.equals(mediaSize)) {

            mMediaSize = mediaSize;

            updatePreviewAreaAndPageSize = true;

            documentChanged = true;



            clearSelectedPages = true;

        }



        if (mMinMargins == null || !mMinMargins.equals(minMargins)) {

            mMinMargins = minMargins;

            updatePreviewAreaAndPageSize = true;

            documentChanged = true;



            clearSelectedPages = true;

        }



        if (clearSelectedPages) {

            mSelectedPages = PageRange.ALL_PAGES_ARRAY;

            mSelectedPageCount = documentPageCount;

            setConfirmedPages(mSelectedPages, documentPageCount);

            updatePreviewAreaAndPageSize = true;

            documentChanged = true;

        } else if (!Arrays.equals(mSelectedPages, selectedPages)) {

            mSelectedPages = selectedPages;

            mSelectedPageCount = PageRangeUtils.getNormalizedPageCount(

                    mSelectedPages, documentPageCount);

            setConfirmedPages(mSelectedPages, documentPageCount);

            updatePreviewAreaAndPageSize = true;

            documentChanged = true;

        }



        // If *all pages* is selected we need to convert that to absolute

packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java

+123 −66
Original line number Diff line number Diff line
@@ -176,8 +176,6 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            "[\\s]*[0-9]+[\\-]?[\\s]*[0-9]*[\\s]*?(([,])"

                    + "[\\s]*[0-9]+[\\s]*[\\-]?[\\s]*[0-9]*[\\s]*|[\\s]*)+");



    public static final PageRange[] ALL_PAGES_ARRAY = new PageRange[]{PageRange.ALL_PAGES};



    private boolean mIsOptionsUiBound = false;



    private final PrinterAvailabilityDetector mPrinterAvailabilityDetector =
@@ -597,14 +595,6 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 


    @Override

    public void onOptionsClosed() {

        PageRange[] selectedPages = computeSelectedPages();

        if (!Arrays.equals(mSelectedPages, selectedPages)) {

            mSelectedPages = selectedPages;



            // Update preview.

            updatePrintPreviewController(false);

        }



        // Make sure the IME is not on the way of preview as

        // the user may have used it to type copies or range.

        InputMethodManager imm = getSystemService(InputMethodManager.class);
@@ -950,7 +940,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
        mSelectedPages = selectedPages;

        mPrintJob.setPages(selectedPages);



        if (Arrays.equals(selectedPages, ALL_PAGES_ARRAY)) {

        if (Arrays.equals(selectedPages, PageRange.ALL_PAGES_ARRAY)) {

            if (mRangeOptionsSpinner.getSelectedItemPosition() != 0) {

                mRangeOptionsSpinner.setSelection(0);

                mPageRangeEditText.setText("");
@@ -1049,7 +1039,22 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
        }

    }



    /**

     * Clear the selected page range and update the preview if needed.

     */

    private void clearPageRanges() {

        mRangeOptionsSpinner.setSelection(0);

        mPageRangeEditText.setError(null);

        mPageRangeEditText.setText("");

        mSelectedPages = PageRange.ALL_PAGES_ARRAY;



        if (!Arrays.equals(mSelectedPages, mPrintPreviewController.getSelectedPages())) {

            updatePrintPreviewController(false);

        }

    }



    private void updatePrintAttributesFromCapabilities(PrinterCapabilitiesInfo capabilities) {

        boolean clearRanges = false;

        PrintAttributes defaults = capabilities.getDefaults();



        // Sort the media sizes based on the current locale.
@@ -1061,6 +1066,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
        // Media size.

        MediaSize currMediaSize = attributes.getMediaSize();

        if (currMediaSize == null) {

            clearRanges = true;

            attributes.setMediaSize(defaults.getMediaSize());

        } else {

            MediaSize newMediaSize = null;
@@ -1079,6 +1085,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            }

            // If we did not find the current media size fall back to default.

            if (newMediaSize == null) {

                clearRanges = true;

                newMediaSize = defaults.getMediaSize();

            }
@@ -1110,7 +1117,14 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
        }



        // Margins.

        if (!Objects.equals(attributes.getMinMargins(), defaults.getMinMargins())) {

            clearRanges = true;

        }

        attributes.setMinMargins(defaults.getMinMargins());



        if (clearRanges) {

            clearPageRanges();

        }

    }



    private boolean updateDocument(boolean clearLastError) {
@@ -1262,6 +1276,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
        // Page range

        mPageRangeTitle = (TextView) findViewById(R.id.page_range_title);

        mPageRangeEditText = (EditText) findViewById(R.id.page_range_edittext);

        mPageRangeEditText.setVisibility(View.INVISIBLE);

        mPageRangeEditText.setOnFocusChangeListener(mSelectAllOnFocusListener);

        mPageRangeEditText.addTextChangedListener(new RangeTextWatcher());
@@ -1753,7 +1768,8 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
        // Range options

        PrintDocumentInfo info = mPrintedDocument.getDocumentInfo().info;

        final int pageCount = getAdjustedPageCount(info);

        if (info != null && pageCount > 0) {

        if (pageCount > 0) {

            if (info != null) {

                if (pageCount == 1) {

                    mRangeOptionsSpinner.setEnabled(false);

                } else {
@@ -1784,6 +1800,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
                mPageRangeEditText.setVisibility(View.INVISIBLE);

                mPageRangeTitle.setVisibility(View.INVISIBLE);

            }

        }



        final int newPageCount = getAdjustedPageCount(info);

        if (newPageCount != mCurrentPageCount) {
@@ -1933,7 +1950,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            return PageRangeUtils.normalize(pageRangesArray);

        }



        return ALL_PAGES_ARRAY;

        return PageRange.ALL_PAGES_ARRAY;

    }



    private int getAdjustedPageCount(PrintDocumentInfo info) {
@@ -2604,6 +2621,8 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
    private final class MyOnItemSelectedListener implements AdapterView.OnItemSelectedListener {

        @Override

        public void onItemSelected(AdapterView<?> spinner, View view, int position, long id) {

            boolean clearRanges = false;



            if (spinner == mDestinationSpinner) {

                if (position == AdapterView.INVALID_POSITION) {

                    return;
@@ -2650,10 +2669,17 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            } else if (spinner == mMediaSizeSpinner) {

                SpinnerItem<MediaSize> mediaItem = mMediaSizeSpinnerAdapter.getItem(position);

                PrintAttributes attributes = mPrintJob.getAttributes();



                MediaSize newMediaSize;

                if (mOrientationSpinner.getSelectedItemPosition() == 0) {

                    attributes.setMediaSize(mediaItem.value.asPortrait());

                    newMediaSize = mediaItem.value.asPortrait();

                } else {

                    attributes.setMediaSize(mediaItem.value.asLandscape());

                    newMediaSize = mediaItem.value.asLandscape();

                }



                if (newMediaSize != attributes.getMediaSize()) {

                    clearRanges = true;

                    attributes.setMediaSize(newMediaSize);

                }

            } else if (spinner == mColorModeSpinner) {

                SpinnerItem<Integer> colorModeItem = mColorModeSpinnerAdapter.getItem(position);
@@ -2665,25 +2691,35 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
                SpinnerItem<Integer> orientationItem = mOrientationSpinnerAdapter.getItem(position);

                PrintAttributes attributes = mPrintJob.getAttributes();

                if (mMediaSizeSpinner.getSelectedItem() != null) {

                    boolean isPortrait = attributes.isPortrait();



                    if (isPortrait != (orientationItem.value == ORIENTATION_PORTRAIT)) {

                        clearRanges = true;

                        if (orientationItem.value == ORIENTATION_PORTRAIT) {

                            attributes.copyFrom(attributes.asPortrait());

                        } else {

                            attributes.copyFrom(attributes.asLandscape());

                        }

                    }

                }

            } else if (spinner == mRangeOptionsSpinner) {

                if (mRangeOptionsSpinner.getSelectedItemPosition() == 0) {

                    clearRanges = true;

                    mPageRangeEditText.setText("");

                } else if (TextUtils.isEmpty(mPageRangeEditText.getText())) {

                    mPageRangeEditText.setError("");

                }

            }



            if (canUpdateDocument()) {

                updateDocument(false);

            if (clearRanges) {

                clearPageRanges();

            }



            updateOptionsUi();



            if (canUpdateDocument()) {

                updateDocument(false);

            }

        }



        @Override
@@ -2699,6 +2735,16 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            if (!TextUtils.isEmpty(editText.getText())) {

                editText.setSelection(editText.getText().length());

            }



            if (view == mPageRangeEditText && !hasFocus) {

                PageRange[] selectedPages = computeSelectedPages();

                if (selectedPages != null && !Arrays.equals(mSelectedPages, selectedPages)) {

                    mSelectedPages = selectedPages;



                    // Update preview.

                    updatePrintPreviewController(false);

                }

            }

        }

    }
@@ -2716,19 +2762,22 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
        @Override

        public void afterTextChanged(Editable editable) {

            final boolean hadErrors = hasErrors();



            String text = editable.toString();



            if (TextUtils.isEmpty(text)) {

                if (mPageRangeEditText.getError() == null) {

                    mPageRangeEditText.setError("");

                    updateOptionsUi();

                }

                return;

            }



            String escapedText = PATTERN_ESCAPE_SPECIAL_CHARS.matcher(text).replaceAll("////");

            if (!PATTERN_PAGE_RANGE.matcher(escapedText).matches()) {

                if (mPageRangeEditText.getError() == null) {

                    mPageRangeEditText.setError("");

                    updateOptionsUi();

                }

                return;

            }
@@ -2744,8 +2793,10 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
                }

                final int pageIndex = Integer.parseInt(numericString);

                if (pageIndex < 1 || pageIndex > pageCount) {

                    if (mPageRangeEditText.getError() == null) {

                        mPageRangeEditText.setError("");

                        updateOptionsUi();

                    }

                    return;

                }

            }
@@ -2754,12 +2805,13 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            // greater than the to page. When computing the requested pages

            // we just swap them if necessary.



            if (mPageRangeEditText.getError() != null) {

                mPageRangeEditText.setError(null);

            mPrintButton.setEnabled(true);

                updateOptionsUi();

            }



            if (hadErrors && !hasErrors()) {

                updateOptionsUi();

            if (hadErrors && canUpdateDocument()) {

                updateDocument(false);

            }

        }

    }
@@ -2780,8 +2832,10 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            final boolean hadErrors = hasErrors();



            if (editable.length() == 0) {

                if (mCopiesEditText.getError() == null) {

                    mCopiesEditText.setError("");

                    updateOptionsUi();

                }

                return;

            }
@@ -2793,16 +2847,19 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            }



            if (copies < MIN_COPIES) {

                if (mCopiesEditText.getError() == null) {

                    mCopiesEditText.setError("");

                    updateOptionsUi();

                }

                return;

            }



            mPrintJob.setCopies(copies);



            if (mCopiesEditText.getError() != null) {

                mCopiesEditText.setError(null);



                updateOptionsUi();

            }



            if (hadErrors && canUpdateDocument()) {

                updateDocument(false);