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

Commit cc2b210f authored by Svetoslav's avatar Svetoslav Committed by Android (Google) Code Review
Browse files

Merge "Update the promoted action background color per UX spec" into lmp-dev

parents 53b9e2a7 4bcc4a04

packages/PrintSpooler/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,6 @@ 


    <color name="print_preview_background_color">#F2F1F2</color>



    <color name="promoted_action_background_color">#FF00E5FF</color>

    <color name="promoted_action_background_color">#FF80CBC4</color>



</resources>

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

+8 −8
Original line number Diff line number Diff line
@@ -334,22 +334,22 @@ public final class PageAdapter extends Adapter { 
        content.init(provider, mMediaSize, mMinMargins);





        View selector = page.findViewById(R.id.page_selector);

        selector.setTag(myHolder);

        View pageSelector = page.findViewById(R.id.page_selector);

        pageSelector.setTag(myHolder);

        if (pageCount > 1) {

            selector.setOnClickListener(mPageClickListener);

            selector.setVisibility(View.VISIBLE);

            pageSelector.setOnClickListener(mPageClickListener);

            pageSelector.setVisibility(View.VISIBLE);

        } else {

            selector.setOnClickListener(null);

            selector.setVisibility(View.GONE);

            pageSelector.setOnClickListener(null);

            pageSelector.setVisibility(View.GONE);

        }



        if (mConfirmedPagesInDocument.indexOfKey(pageInDocument) >= 0) {

            selector.setSelected(true);

            pageSelector.setSelected(true);

            page.setTranslationZ(mSelectedPageElevation);

            page.setAlpha(mSelectedPageAlpha);

        } else {

            selector.setSelected(false);

            pageSelector.setSelected(false);

            page.setTranslationZ(mUnselectedPageElevation);

            page.setAlpha(mUnselectedPageAlpha);

        }