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

Commit 9fb7b07c authored by Svet Ganov's avatar Svet Ganov Committed by Svetoslav Ganov
Browse files

Dimming deselected preview pages 

For print preview we show the pages the user selected in the range
affordance but the user can optionally further prune pages to be
printed by deselecting them in the preview. The deselected pages
change elevation and now also are dimmed.

bug:15912256

Change-Id: I53357b8e8b592387bbc26b937eda786bb4660d85
parent 48fec5c9

packages/PrintSpooler/res/values/constants.xml

+3 −0
Original line number Diff line number Diff line
@@ -42,4 +42,7 @@ 


    <integer name="print_option_column_count">2</integer>



    <fraction name="page_selected_alpha">100%</fraction>

    <fraction name="page_unselected_alpha">50%</fraction>



</resources>

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

+14 −2
Original line number Diff line number Diff line
@@ -90,7 +90,10 @@ public final class PageAdapter extends Adapter { 
    private int mSelectedPageCount;



    private float mSelectedPageElevation;

    private float mSelectedPageAlpha;



    private float mUnselectedPageElevation;

    private float mUnselectedPageAlpha;



    private int mPreviewPageMargin;

    private int mPreviewListPadding;
@@ -127,8 +130,13 @@ public final class PageAdapter extends Adapter { 


        mSelectedPageElevation = mContext.getResources().getDimension(

                R.dimen.selected_page_elevation);

        mSelectedPageAlpha = mContext.getResources().getFraction(

                R.fraction.page_selected_alpha, 1, 1);



        mUnselectedPageElevation = mContext.getResources().getDimension(

                R.dimen.unselected_page_elevation);

        mUnselectedPageAlpha = mContext.getResources().getFraction(

                R.fraction.page_unselected_alpha, 1, 1);



        mPreviewPageMargin = mContext.getResources().getDimensionPixelSize(

                R.dimen.preview_page_margin);
@@ -339,9 +347,11 @@ public final class PageAdapter extends Adapter { 
        if (mConfirmedPagesInDocument.indexOfKey(pageInDocument) >= 0) {

            checkbox.setChecked(true);

            page.setTranslationZ(mSelectedPageElevation);

            page.setAlpha(mSelectedPageAlpha);

        } else {

            checkbox.setChecked(false);

            page.setTranslationZ(mUnselectedPageElevation);

            page.setAlpha(mUnselectedPageAlpha);

        }



        TextView pageNumberView = (TextView) page.findViewById(R.id.page_number);
@@ -760,11 +770,13 @@ public final class PageAdapter extends Adapter { 
            if (mConfirmedPagesInDocument.indexOfKey(pageInDocument) < 0) {

                mConfirmedPagesInDocument.put(pageInDocument, null);

                pageSelector.setChecked(true);

                page.animate().translationZ(mSelectedPageElevation);

                page.animate().translationZ(mSelectedPageElevation)

                        .alpha(mSelectedPageAlpha);

            } else {

                mConfirmedPagesInDocument.remove(pageInDocument);

                pageSelector.setChecked(false);

                page.animate().translationZ(mUnselectedPageElevation);

                page.animate().translationZ(mUnselectedPageElevation)

                        .alpha(mUnselectedPageAlpha);

            }

        }

    }